* [PATCH] drm/i915: Re-enable FBC WM if the watermark is good on gen6+
@ 2013-04-24 17:54 ville.syrjala
2013-04-24 18:09 ` [PATCH v2] " ville.syrjala
0 siblings, 1 reply; 4+ messages in thread
From: ville.syrjala @ 2013-04-24 17:54 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
If the calculated FBC watermark is no good, we simply disable FBC
watermarks. But we fail to re-enable them later if the calculated
watermark becomes good again. Fix that, but remember to leave FBC
watermarks disabled on ILK since that's required by some workarounds.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 3534a71..d996c78 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1633,6 +1633,10 @@ static bool ironlake_check_srwm(struct drm_device *dev, int level,
I915_WRITE(DISP_ARB_CTL,
I915_READ(DISP_ARB_CTL) | DISP_FBC_WM_DIS);
return false;
+ } if (INTEL_INFO(dev)->gen >= 6) {
+ /* enable FBC WM (except on ILK, where it must remain off) */
+ I915_WRITE(DISP_ARB_CTL,
+ I915_READ(DISP_ARB_CTL) & ~DISP_FBC_WM_DIS);
}
if (display_wm > display->max_wm) {
--
1.8.1.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] drm/i915: Re-enable FBC WM if the watermark is good on gen6+
2013-04-24 17:54 [PATCH] drm/i915: Re-enable FBC WM if the watermark is good on gen6+ ville.syrjala
@ 2013-04-24 18:09 ` ville.syrjala
2013-05-09 20:51 ` Paulo Zanoni
0 siblings, 1 reply; 4+ messages in thread
From: ville.syrjala @ 2013-04-24 18:09 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
If the calculated FBC watermark is no good, we simply disable FBC
watermarks. But we fail to re-enable them later if the calculated
watermark becomes good again. Fix that, but remember to leave FBC
watermarks disabled on ILK since that's required by some workarounds.
v2: Fix checkpatch complaint
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 3534a71..da8f307 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1633,6 +1633,10 @@ static bool ironlake_check_srwm(struct drm_device *dev, int level,
I915_WRITE(DISP_ARB_CTL,
I915_READ(DISP_ARB_CTL) | DISP_FBC_WM_DIS);
return false;
+ } else if (INTEL_INFO(dev)->gen >= 6) {
+ /* enable FBC WM (except on ILK, where it must remain off) */
+ I915_WRITE(DISP_ARB_CTL,
+ I915_READ(DISP_ARB_CTL) & ~DISP_FBC_WM_DIS);
}
if (display_wm > display->max_wm) {
--
1.8.1.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] drm/i915: Re-enable FBC WM if the watermark is good on gen6+
2013-04-24 18:09 ` [PATCH v2] " ville.syrjala
@ 2013-05-09 20:51 ` Paulo Zanoni
2013-05-10 7:15 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Paulo Zanoni @ 2013-05-09 20:51 UTC (permalink / raw)
To: ville.syrjala; +Cc: intel-gfx
2013/4/24 <ville.syrjala@linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> If the calculated FBC watermark is no good, we simply disable FBC
> watermarks. But we fail to re-enable them later if the calculated
> watermark becomes good again. Fix that, but remember to leave FBC
> watermarks disabled on ILK since that's required by some workarounds.
>
> v2: Fix checkpatch complaint
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Looks correct...
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 3534a71..da8f307 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1633,6 +1633,10 @@ static bool ironlake_check_srwm(struct drm_device *dev, int level,
> I915_WRITE(DISP_ARB_CTL,
> I915_READ(DISP_ARB_CTL) | DISP_FBC_WM_DIS);
> return false;
> + } else if (INTEL_INFO(dev)->gen >= 6) {
> + /* enable FBC WM (except on ILK, where it must remain off) */
> + I915_WRITE(DISP_ARB_CTL,
> + I915_READ(DISP_ARB_CTL) & ~DISP_FBC_WM_DIS);
> }
>
> if (display_wm > display->max_wm) {
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Paulo Zanoni
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] drm/i915: Re-enable FBC WM if the watermark is good on gen6+
2013-05-09 20:51 ` Paulo Zanoni
@ 2013-05-10 7:15 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2013-05-10 7:15 UTC (permalink / raw)
To: Paulo Zanoni; +Cc: intel-gfx
On Thu, May 09, 2013 at 05:51:13PM -0300, Paulo Zanoni wrote:
> 2013/4/24 <ville.syrjala@linux.intel.com>:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > If the calculated FBC watermark is no good, we simply disable FBC
> > watermarks. But we fail to re-enable them later if the calculated
> > watermark becomes good again. Fix that, but remember to leave FBC
> > watermarks disabled on ILK since that's required by some workarounds.
> >
> > v2: Fix checkpatch complaint
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Looks correct...
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-10 7:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-24 17:54 [PATCH] drm/i915: Re-enable FBC WM if the watermark is good on gen6+ ville.syrjala
2013-04-24 18:09 ` [PATCH v2] " ville.syrjala
2013-05-09 20:51 ` Paulo Zanoni
2013-05-10 7:15 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.