Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/dp_helper: Perform throw-away read before actual read in drm_dp_dpcd_read()

This is part of a patch series to migrate all of the workarounds for
commonly seen behavior from bad sinks in intel_dp_dpcd_read_wake() to drm's
DP helper.

Some sinks will just return garbage for the first aux tranaction they
receive when coming out of sleep mode, so we need to perform an additional
read before the actual read to workaround this.

Changes since v5
- If the throwaway read in drm_dp_dpcd_read() fails, return the error
from that instead of continuing. This follows the same logic we do in
drm_dp_dpcd_access() (e.g. the error from the first transaction may
differ from the errors that proceeding attempts might return).

Signed-off-by: Lyude <cpaul@redhat.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1460730335-5012-1-git-send-email-cpaul@redhat.com

authored by

Lyude and committed by
Daniel Vetter
f808f633 82922da3

+19
+19
drivers/gpu/drm/drm_dp_helper.c
··· 248 248 ssize_t drm_dp_dpcd_read(struct drm_dp_aux *aux, unsigned int offset, 249 249 void *buffer, size_t size) 250 250 { 251 + int ret; 252 + 253 + /* 254 + * HP ZR24w corrupts the first DPCD access after entering power save 255 + * mode. Eg. on a read, the entire buffer will be filled with the same 256 + * byte. Do a throw away read to avoid corrupting anything we care 257 + * about. Afterwards things will work correctly until the monitor 258 + * gets woken up and subsequently re-enters power save mode. 259 + * 260 + * The user pressing any button on the monitor is enough to wake it 261 + * up, so there is no particularly good place to do the workaround. 262 + * We just have to do it before any DPCD access and hope that the 263 + * monitor doesn't power down exactly after the throw away read. 264 + */ 265 + ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, DP_DPCD_REV, buffer, 266 + 1); 267 + if (ret != 1) 268 + return ret; 269 + 251 270 return drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, offset, buffer, 252 271 size); 253 272 }