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

Commit 026b96e2 authored by Rafael Barbalho's avatar Rafael Barbalho Committed by Daniel Vetter
Browse files

drm/i915: Fix read back of plane stride register 



According to the specifications bit 6 is actually valid in the stride register.

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarRafael Barbalho <rafael.barbalho@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2ce147f3

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -6211,7 +6211,7 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc, 
	crtc->base.primary->fb->height = ((val >> 0) & 0xfff) + 1;



	val = I915_READ(DSPSTRIDE(pipe));

	crtc->base.primary->fb->pitches[0] = val & 0xffffff80;

	crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;



	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,

					    plane_config->tiled);
@@ -7247,7 +7247,7 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc, 
	crtc->base.primary->fb->height = ((val >> 0) & 0xfff) + 1;



	val = I915_READ(DSPSTRIDE(pipe));

	crtc->base.primary->fb->pitches[0] = val & 0xffffff80;

	crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;



	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,

					    plane_config->tiled);