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

Commit 37c6c9b0 authored by Jesse Barnes's avatar Jesse Barnes
Browse files

drm/i915: add panel reset workaround 



Ironlake requires that we clear the reset panel bit during power
sequences and restore it afterwards.  Uncondtionally add code to do that
since it should be harmless on SNB+.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ce171780

drivers/gpu/drm/i915/intel_dp.c

+16 −1
Original line number Original line Diff line number Diff line
@@ -765,6 +765,12 @@ static void ironlake_edp_panel_on (struct drm_device *dev) 
		return;

		return;





	pp = I915_READ(PCH_PP_CONTROL);

	pp = I915_READ(PCH_PP_CONTROL);



	/* ILK workaround: disable reset around power sequence */

	pp &= ~PANEL_POWER_RESET;

	I915_WRITE(PCH_PP_CONTROL, pp);

	POSTING_READ(PCH_PP_CONTROL);



	pp |= PANEL_UNLOCK_REGS | POWER_TARGET_ON;

	pp |= PANEL_UNLOCK_REGS | POWER_TARGET_ON;

	I915_WRITE(PCH_PP_CONTROL, pp);

	I915_WRITE(PCH_PP_CONTROL, pp);
@@ -773,7 +779,9 @@ static void ironlake_edp_panel_on (struct drm_device *dev) 
			  I915_READ(PCH_PP_STATUS));

			  I915_READ(PCH_PP_STATUS));





	pp &= ~(PANEL_UNLOCK_REGS | EDP_FORCE_VDD);

	pp &= ~(PANEL_UNLOCK_REGS | EDP_FORCE_VDD);

	pp |= PANEL_POWER_RESET; /* restore panel reset bit */

	I915_WRITE(PCH_PP_CONTROL, pp);

	I915_WRITE(PCH_PP_CONTROL, pp);

	POSTING_READ(PCH_PP_CONTROL);

}

}





static void ironlake_edp_panel_off (struct drm_device *dev)

static void ironlake_edp_panel_off (struct drm_device *dev)
@@ -782,6 +790,12 @@ static void ironlake_edp_panel_off (struct drm_device *dev) 
	u32 pp;

	u32 pp;





	pp = I915_READ(PCH_PP_CONTROL);

	pp = I915_READ(PCH_PP_CONTROL);



	/* ILK workaround: disable reset around power sequence */

	pp &= ~PANEL_POWER_RESET;

	I915_WRITE(PCH_PP_CONTROL, pp);

	POSTING_READ(PCH_PP_CONTROL);



	pp &= ~POWER_TARGET_ON;

	pp &= ~POWER_TARGET_ON;

	I915_WRITE(PCH_PP_CONTROL, pp);

	I915_WRITE(PCH_PP_CONTROL, pp);
@@ -790,8 +804,9 @@ static void ironlake_edp_panel_off (struct drm_device *dev) 
			  I915_READ(PCH_PP_STATUS));

			  I915_READ(PCH_PP_STATUS));





	/* Make sure VDD is enabled so DP AUX will work */

	/* Make sure VDD is enabled so DP AUX will work */

	pp |= EDP_FORCE_VDD;

	pp |= EDP_FORCE_VDD | PANEL_POWER_RESET; /* restore panel reset bit */

	I915_WRITE(PCH_PP_CONTROL, pp);

	I915_WRITE(PCH_PP_CONTROL, pp);

	POSTING_READ(PCH_PP_CONTROL);

}

}





static void ironlake_edp_backlight_on (struct drm_device *dev)

static void ironlake_edp_backlight_on (struct drm_device *dev)