drm/i915: PSR: Don't Skip aux handshake on DP_PSR_NO_TRAIN_ON_EXIT.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 11 Nov 2015 19:37:09 +0000 (11:37 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 18 Nov 2015 15:01:39 +0000 (16:01 +0100)
Since the beginning there is a confusion on the meaning of this bit.

A previous patch had identified this already and fixed it partially:
'commit 3301d409 ("drm/i915: PSR: Fix DP_PSR_NO_TRAIN_ON_EXIT logic")

DP_PSR_NO_TRAIN_ON_EXIT means the source doesn't need to do the
training, but it doesn't tell to avoid TP patterns or to skip
aux handshake.

This patch fixes the hard freeze reported.

Reference: https://bugs.freedesktop.org/show_bug.cgi?id=91436
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=91437

Cc: Ivan Mitev <ivan.mitev@gmail.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Durgadoss R <durgadoss.r@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_psr.c

index 715a48b95dc5629b4d984906c9c08d243e6f3f75..c4a63712c68ef52a7dff34a7dd77c787add75079 100644 (file)
@@ -287,7 +287,6 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)
                   send the minimal TP1 possible and skip TP2. */
                val |= EDP_PSR_TP1_TIME_100us;
                val |= EDP_PSR_TP2_TP3_TIME_0us;
-               val |= EDP_PSR_SKIP_AUX_EXIT;
                /* Sink should be able to train with the 5 or 6 idle patterns */
                idle_frames += 4;
        }