[PATCH] drm/i915: Fix gen3 self-refresh watermarks

[PATCH] drm/i915: Fix gen3 self-refresh watermarks

[Daniel Vetter]

This regression has been introduced in

commit 4fe8590a921d0b2e36e542dbfa89a8c5993f5a3f
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Sep 4 18:25:22 2013 +0300

    drm/i915: Use adjusted_mode appropriately when computing watermarks

I guess we should renable the enabled local variable into something a
notch more descriptive, but that's something for -next.

The effect on my i945gme netbook is pretty severe amounts of underruns
- usually the very first pixel gets used for the entire screeen.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 172efa0bfb86..3cc757ff60ee 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1625,7 +1625,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)
 			&to_intel_crtc(enabled)->config.adjusted_mode;
 		int clock = adjusted_mode->crtc_clock;
 		int htotal = adjusted_mode->htotal;
-		int hdisplay = to_intel_crtc(crtc)->config.pipe_src_w;
+		int hdisplay = to_intel_crtc(enabled)->config.pipe_src_w;
 		int pixel_size = enabled->fb->bits_per_pixel / 8;
 		unsigned long line_time_us;
 		int entries;
-- 
1.8.1.4

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

Re: [PATCH] drm/i915: Fix gen3 self-refresh watermarks

[Ville Syrjälä]

On Wed, Nov 20, 2013 at 03:02:10PM +0100, Daniel Vetter wrote:
> This regression has been introduced in
> 
> commit 4fe8590a921d0b2e36e542dbfa89a8c5993f5a3f
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Date:   Wed Sep 4 18:25:22 2013 +0300
> 
>     drm/i915: Use adjusted_mode appropriately when computing watermarks
> 
> I guess we should renable the enabled local variable into something a
> notch more descriptive, but that's something for -next.
> 
> The effect on my i945gme netbook is pretty severe amounts of underruns
> - usually the very first pixel gets used for the entire screeen.
> 
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Damien Lespiau <damien.lespiau@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Dang. Copy paste fail on my part :( The fix looks good.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 172efa0bfb86..3cc757ff60ee 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1625,7 +1625,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)
>  			&to_intel_crtc(enabled)->config.adjusted_mode;
>  		int clock = adjusted_mode->crtc_clock;
>  		int htotal = adjusted_mode->htotal;
> -		int hdisplay = to_intel_crtc(crtc)->config.pipe_src_w;
> +		int hdisplay = to_intel_crtc(enabled)->config.pipe_src_w;
>  		int pixel_size = enabled->fb->bits_per_pixel / 8;
>  		unsigned long line_time_us;
>  		int entries;
> -- 
> 1.8.1.4

-- 
Ville Syrjälä
Intel OTC

Re: [PATCH] drm/i915: Fix gen3 self-refresh watermarks

[Daniel Vetter]

On Wed, Nov 20, 2013 at 04:47:14PM +0200, Ville Syrjälä wrote:
> On Wed, Nov 20, 2013 at 03:02:10PM +0100, Daniel Vetter wrote:
> > This regression has been introduced in
> > 
> > commit 4fe8590a921d0b2e36e542dbfa89a8c5993f5a3f
> > Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Date:   Wed Sep 4 18:25:22 2013 +0300
> > 
> >     drm/i915: Use adjusted_mode appropriately when computing watermarks
> > 
> > I guess we should renable the enabled local variable into something a
> > notch more descriptive, but that's something for -next.
> > 
> > The effect on my i945gme netbook is pretty severe amounts of underruns
> > - usually the very first pixel gets used for the entire screeen.
> > 
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Damien Lespiau <damien.lespiau@intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> Dang. Copy paste fail on my part :( The fix looks good.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the review.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch