diff mbox

[28/28] Revert "drm/i915: set conservative clock gating values on VLV v2"

Message ID 1390419184-4450-29-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä Jan. 22, 2014, 7:33 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

We're disabling a boatload of clock gating features on VLV. Maybe these
days we don't need to do that. At least I'm not aware of any workarounds
with this level of paranoia.

This reverts commit 4e8c84a5b14bbb5b88c63941f1d939560f4abd0b.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Comments

Rodrigo Vivi Jan. 29, 2014, 1:11 p.m. UTC | #1
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>

On Wed, Jan 22, 2014 at 5:33 PM,  <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> We're disabling a boatload of clock gating features on VLV. Maybe these
> days we don't need to do that. At least I'm not aware of any workarounds
> with this level of paranoia.
>
> This reverts commit 4e8c84a5b14bbb5b88c63941f1d939560f4abd0b.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index ca87ea9..1518a9b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4950,16 +4950,7 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
>          * Disable clock gating on th GCFG unit to prevent a delay
>          * in the reporting of vblank events.
>          */
> -       I915_WRITE(VLV_GUNIT_CLOCK_GATE, 0xffffffff);
> -
> -       /* Conservative clock gating settings for now */
> -       I915_WRITE(0x9400, 0xffffffff);
> -       I915_WRITE(0x9404, 0xffffffff);
> -       I915_WRITE(0x9408, 0xffffffff);
> -       I915_WRITE(0x940c, 0xffffffff);
> -       I915_WRITE(0x9410, 0xffffffff);
> -       I915_WRITE(0x9414, 0xffffffff);
> -       I915_WRITE(0x9418, 0xffffffff);
> +       I915_WRITE(VLV_GUNIT_CLOCK_GATE, GCFG_DIS);
>  }
>
>  static void g4x_init_clock_gating(struct drm_device *dev)
> --
> 1.8.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter Jan. 29, 2014, 7:17 p.m. UTC | #2
On Wed, Jan 29, 2014 at 11:11:57AM -0200, Rodrigo Vivi wrote:
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>

Ok, I've pulled in the last batch of reviewed patches into dinq. But I'm
not sure whether I haven't missed anything or whether there's still an
earlier patch that needs review or rework. So please yell ;-)

Thanks, Daniel
> 
> On Wed, Jan 22, 2014 at 5:33 PM,  <ville.syrjala@linux.intel.com> wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > We're disabling a boatload of clock gating features on VLV. Maybe these
> > days we don't need to do that. At least I'm not aware of any workarounds
> > with this level of paranoia.
> >
> > This reverts commit 4e8c84a5b14bbb5b88c63941f1d939560f4abd0b.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 11 +----------
> >  1 file changed, 1 insertion(+), 10 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index ca87ea9..1518a9b 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -4950,16 +4950,7 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
> >          * Disable clock gating on th GCFG unit to prevent a delay
> >          * in the reporting of vblank events.
> >          */
> > -       I915_WRITE(VLV_GUNIT_CLOCK_GATE, 0xffffffff);
> > -
> > -       /* Conservative clock gating settings for now */
> > -       I915_WRITE(0x9400, 0xffffffff);
> > -       I915_WRITE(0x9404, 0xffffffff);
> > -       I915_WRITE(0x9408, 0xffffffff);
> > -       I915_WRITE(0x940c, 0xffffffff);
> > -       I915_WRITE(0x9410, 0xffffffff);
> > -       I915_WRITE(0x9414, 0xffffffff);
> > -       I915_WRITE(0x9418, 0xffffffff);
> > +       I915_WRITE(VLV_GUNIT_CLOCK_GATE, GCFG_DIS);
> >  }
> >
> >  static void g4x_init_clock_gating(struct drm_device *dev)
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> 
> 
> -- 
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index ca87ea9..1518a9b 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4950,16 +4950,7 @@  static void valleyview_init_clock_gating(struct drm_device *dev)
 	 * Disable clock gating on th GCFG unit to prevent a delay
 	 * in the reporting of vblank events.
 	 */
-	I915_WRITE(VLV_GUNIT_CLOCK_GATE, 0xffffffff);
-
-	/* Conservative clock gating settings for now */
-	I915_WRITE(0x9400, 0xffffffff);
-	I915_WRITE(0x9404, 0xffffffff);
-	I915_WRITE(0x9408, 0xffffffff);
-	I915_WRITE(0x940c, 0xffffffff);
-	I915_WRITE(0x9410, 0xffffffff);
-	I915_WRITE(0x9414, 0xffffffff);
-	I915_WRITE(0x9418, 0xffffffff);
+	I915_WRITE(VLV_GUNIT_CLOCK_GATE, GCFG_DIS);
 }
 
 static void g4x_init_clock_gating(struct drm_device *dev)