Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94113cec authored by Chris Wilson's avatar Chris Wilson Committed by Eric Anholt
Browse files

drm/i915: Do not clobber the contents of TRANS_DP_CTL when enabling. 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 3e33d94d

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -2928,6 +2928,7 @@ 
#define  TRANS_DP_VSYNC_ACTIVE_LOW	0

#define  TRANS_DP_HSYNC_ACTIVE_HIGH	(1<<3)

#define  TRANS_DP_HSYNC_ACTIVE_LOW	0

#define  TRANS_DP_SYNC_MASK	(3<<3)



/* SNB eDP training params */

/* SNB A-stepping */

drivers/gpu/drm/i915/intel_display.c

+4 −3
Original line number Diff line number Diff line
@@ -2097,9 +2097,10 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode) 
				int reg;



				reg = I915_READ(trans_dp_ctl);

				reg &= ~TRANS_DP_PORT_SEL_MASK;

				reg = TRANS_DP_OUTPUT_ENABLE |

				      TRANS_DP_ENH_FRAMING;

				reg &= ~(TRANS_DP_PORT_SEL_MASK |

					 TRANS_DP_SYNC_MASK);

				reg |= (TRANS_DP_OUTPUT_ENABLE |

					TRANS_DP_ENH_FRAMING);



				if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC)

				      reg |= TRANS_DP_HSYNC_ACTIVE_HIGH;