Re: [Intel-gfx] [PATCH] drm/i915: Fix read back of plane stride register

2014-07-29 Thread Ville Syrjälä
On Mon, Jul 28, 2014 at 07:56:27PM +0100, rafael.barba...@intel.com wrote:
 From: Rafael Barbalho rafael.barba...@intel.com
 
 According to the specifications bit 6 is actually valid in the stride 
 register.
 
 Cc: Jesse Barnes jbar...@virtuousgeek.org
 Cc: Ville Syrjälä ville.syrj...@linux.intel.com
 Signed-off-by: Rafael Barbalho rafael.barba...@intel.com

Indeed, min stride alignment is 64 bytes so we want bit 6 as well.

Reviewed-by: Ville Syrjälä ville.syrj...@linux.intel.com

 ---
  drivers/gpu/drm/i915/intel_display.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/intel_display.c 
 b/drivers/gpu/drm/i915/intel_display.c
 index 99eb7ca..52dab31 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -6221,7 +6221,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  0xff80;
 + crtc-base.primary-fb-pitches[0] = val  0xffc0;
  
   aligned_height = intel_align_height(dev, crtc-base.primary-fb-height,
   plane_config-tiled);
 @@ -7241,7 +7241,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  0xff80;
 + crtc-base.primary-fb-pitches[0] = val  0xffc0;
  
   aligned_height = intel_align_height(dev, crtc-base.primary-fb-height,
   plane_config-tiled);
 -- 
 2.0.3

-- 
Ville Syrjälä
Intel OTC
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH] drm/i915: Fix read back of plane stride register

2014-07-28 Thread rafael . barbalho
From: Rafael Barbalho rafael.barba...@intel.com

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

Cc: Jesse Barnes jbar...@virtuousgeek.org
Cc: Ville Syrjälä ville.syrj...@linux.intel.com
Signed-off-by: Rafael Barbalho rafael.barba...@intel.com
---
 drivers/gpu/drm/i915/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 99eb7ca..52dab31 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6221,7 +6221,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  0xff80;
+   crtc-base.primary-fb-pitches[0] = val  0xffc0;
 
aligned_height = intel_align_height(dev, crtc-base.primary-fb-height,
plane_config-tiled);
@@ -7241,7 +7241,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  0xff80;
+   crtc-base.primary-fb-pitches[0] = val  0xffc0;
 
aligned_height = intel_align_height(dev, crtc-base.primary-fb-height,
plane_config-tiled);
-- 
2.0.3

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx