diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-03-26 12:59:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-03-26 13:04:17 +1000 |
| commit | 09d78dde88ef95a27b54a6e450ee700ccabdf39d (patch) | |
| tree | 0d584d49ff17b6be4498a8256f43db9d3f630975 /drivers/gpu/drm/msm/dp | |
| parent | 4e8d123fca536d1b55f5f9927ad9ee5a444ac41b (diff) | |
| parent | 627dc55c273dab308303a5217bd3e767d7083ddb (diff) | |
| download | lwn-09d78dde88ef95a27b54a6e450ee700ccabdf39d.tar.gz lwn-09d78dde88ef95a27b54a6e450ee700ccabdf39d.zip | |
Merge tag 'drm-msm-fixes-2021-02-25' of https://gitlab.freedesktop.org/drm/msm into drm-fixes
- pll fixes
- shutdown hook fix
- runtime resume fix
- clear_oob fix
- kms locking fix
- display aux retry fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvmiMKRms_NVavD=NA_jbuexZUcqqL35ke7umqpp-TxMw@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/dp')
| -rw-r--r-- | drivers/gpu/drm/msm/dp/dp_aux.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c index 1c6e1d2b947c..7c22bfe0fc7d 100644 --- a/drivers/gpu/drm/msm/dp/dp_aux.c +++ b/drivers/gpu/drm/msm/dp/dp_aux.c @@ -32,6 +32,8 @@ struct dp_aux_private { struct drm_dp_aux dp_aux; }; +#define MAX_AUX_RETRIES 5 + static const char *dp_aux_get_error(u32 aux_error) { switch (aux_error) { @@ -377,6 +379,11 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux, ret = dp_aux_cmd_fifo_tx(aux, msg); if (ret < 0) { + if (aux->native) { + aux->retry_cnt++; + if (!(aux->retry_cnt % MAX_AUX_RETRIES)) + dp_catalog_aux_update_cfg(aux->catalog); + } usleep_range(400, 500); /* at least 400us to next try */ goto unlock_exit; } |