* [PATCH 0/2] A couple of follow up W/A patches
@ 2015-02-26 18:20 Damien Lespiau
2015-02-26 18:20 ` [PATCH 1/2] drm/i915/skl: Fix stepping check for a couple of W/As Damien Lespiau
2015-02-26 18:20 ` [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating Damien Lespiau
0 siblings, 2 replies; 7+ messages in thread
From: Damien Lespiau @ 2015-02-26 18:20 UTC (permalink / raw)
To: intel-gfx
While reviewing the initial 18 patches series Nick noticed one stepping check
didn't look correct, so here a couple of patches to fix that.
--
Damien
Damien Lespiau (2):
drm/i915/skl: Fix stepping check for a couple of W/As
drm/i915/skl: Implement WaDisableVFUnitClockGating
drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/i915/intel_pm.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
--
1.8.3.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] drm/i915/skl: Fix stepping check for a couple of W/As
2015-02-26 18:20 [PATCH 0/2] A couple of follow up W/A patches Damien Lespiau
@ 2015-02-26 18:20 ` Damien Lespiau
2015-04-07 22:45 ` Rodrigo Vivi
2015-02-26 18:20 ` [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating Damien Lespiau
1 sibling, 1 reply; 7+ messages in thread
From: Damien Lespiau @ 2015-02-26 18:20 UTC (permalink / raw)
To: intel-gfx
Both WaDisableSDEUnitClockGating and WaSetGAPSunitClckGateDisable are
needed on B0 as well.
Signed-off-by: Damien Lespiau <damien.lespiau@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 7dcb5b6..f11e487 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -67,7 +67,7 @@ static void skl_init_clock_gating(struct drm_device *dev)
gen9_init_clock_gating(dev);
- if (INTEL_REVID(dev) == SKL_REVID_A0) {
+ if (INTEL_REVID(dev) <= SKL_REVID_B0) {
/*
* WaDisableSDEUnitClockGating:skl
* WaSetGAPSunitClckGateDisable:skl
--
1.8.3.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] drm/i915/skl: Fix stepping check for a couple of W/As
2015-02-26 18:20 ` [PATCH 1/2] drm/i915/skl: Fix stepping check for a couple of W/As Damien Lespiau
@ 2015-04-07 22:45 ` Rodrigo Vivi
2015-04-08 8:15 ` Daniel Vetter
0 siblings, 1 reply; 7+ messages in thread
From: Rodrigo Vivi @ 2015-04-07 22:45 UTC (permalink / raw)
To: Damien Lespiau; +Cc: intel-gfx
(ops, had forgotten to cc mailing list)
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
On Thu, Feb 26, 2015 at 10:20 AM, Damien Lespiau
<damien.lespiau@intel.com> wrote:
> Both WaDisableSDEUnitClockGating and WaSetGAPSunitClckGateDisable are
> needed on B0 as well.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@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 7dcb5b6..f11e487 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -67,7 +67,7 @@ static void skl_init_clock_gating(struct drm_device *dev)
>
> gen9_init_clock_gating(dev);
>
> - if (INTEL_REVID(dev) == SKL_REVID_A0) {
> + if (INTEL_REVID(dev) <= SKL_REVID_B0) {
> /*
> * WaDisableSDEUnitClockGating:skl
> * WaSetGAPSunitClckGateDisable:skl
> --
> 1.8.3.1
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] drm/i915/skl: Fix stepping check for a couple of W/As
2015-04-07 22:45 ` Rodrigo Vivi
@ 2015-04-08 8:15 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2015-04-08 8:15 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Tue, Apr 07, 2015 at 03:45:22PM -0700, Rodrigo Vivi wrote:
> (ops, had forgotten to cc mailing list)
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Both patches merged, thanks.
-Daniel
>
> On Thu, Feb 26, 2015 at 10:20 AM, Damien Lespiau
> <damien.lespiau@intel.com> wrote:
> > Both WaDisableSDEUnitClockGating and WaSetGAPSunitClckGateDisable are
> > needed on B0 as well.
> >
> > Signed-off-by: Damien Lespiau <damien.lespiau@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 7dcb5b6..f11e487 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -67,7 +67,7 @@ static void skl_init_clock_gating(struct drm_device *dev)
> >
> > gen9_init_clock_gating(dev);
> >
> > - if (INTEL_REVID(dev) == SKL_REVID_A0) {
> > + if (INTEL_REVID(dev) <= SKL_REVID_B0) {
> > /*
> > * WaDisableSDEUnitClockGating:skl
> > * WaSetGAPSunitClckGateDisable:skl
> > --
> > 1.8.3.1
> >
> > _______________________________________________
> > 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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating
2015-02-26 18:20 [PATCH 0/2] A couple of follow up W/A patches Damien Lespiau
2015-02-26 18:20 ` [PATCH 1/2] drm/i915/skl: Fix stepping check for a couple of W/As Damien Lespiau
@ 2015-02-26 18:20 ` Damien Lespiau
2015-03-01 1:04 ` shuang.he
2015-04-07 22:44 ` Rodrigo Vivi
1 sibling, 2 replies; 7+ messages in thread
From: Damien Lespiau @ 2015-02-26 18:20 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/i915/intel_pm.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 55143cb..6849b74 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6056,6 +6056,7 @@ enum skl_disp_power_wells {
# define GEN6_CSUNIT_CLOCK_GATE_DISABLE (1 << 7)
#define GEN6_UCGCTL2 0x9404
+# define GEN6_VFUNIT_CLOCK_GATE_DISABLE (1 << 31)
# define GEN7_VDSUNIT_CLOCK_GATE_DISABLE (1 << 30)
# define GEN7_TDLUNIT_CLOCK_GATE_DISABLE (1 << 22)
# define GEN6_RCZUNIT_CLOCK_GATE_DISABLE (1 << 13)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index f11e487..601f43c 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -75,6 +75,10 @@ static void skl_init_clock_gating(struct drm_device *dev)
I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
GEN8_GAPSUNIT_CLOCK_GATE_DISABLE |
GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
+
+ /* WaDisableVFUnitClockGating:skl */
+ I915_WRITE(GEN6_UCGCTL2, I915_READ(GEN6_UCGCTL2) |
+ GEN6_VFUNIT_CLOCK_GATE_DISABLE);
}
if (INTEL_REVID(dev) <= SKL_REVID_D0) {
--
1.8.3.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating
2015-02-26 18:20 ` [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating Damien Lespiau
@ 2015-03-01 1:04 ` shuang.he
2015-04-07 22:44 ` Rodrigo Vivi
1 sibling, 0 replies; 7+ messages in thread
From: shuang.he @ 2015-03-01 1:04 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, damien.lespiau
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5844
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 282/282 282/282
ILK 308/308 308/308
SNB 326/326 326/326
IVB 379/379 379/379
BYT 294/294 294/294
HSW 387/387 387/387
BDW -1 316/316 315/316
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BDW igt_gem_gtt_hog PASS(15) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating
2015-02-26 18:20 ` [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating Damien Lespiau
2015-03-01 1:04 ` shuang.he
@ 2015-04-07 22:44 ` Rodrigo Vivi
1 sibling, 0 replies; 7+ messages in thread
From: Rodrigo Vivi @ 2015-04-07 22:44 UTC (permalink / raw)
To: Damien Lespiau; +Cc: intel-gfx
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
On Thu, Feb 26, 2015 at 10:20 AM, Damien Lespiau
<damien.lespiau@intel.com> wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 1 +
> drivers/gpu/drm/i915/intel_pm.c | 4 ++++
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 55143cb..6849b74 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6056,6 +6056,7 @@ enum skl_disp_power_wells {
> # define GEN6_CSUNIT_CLOCK_GATE_DISABLE (1 << 7)
>
> #define GEN6_UCGCTL2 0x9404
> +# define GEN6_VFUNIT_CLOCK_GATE_DISABLE (1 << 31)
> # define GEN7_VDSUNIT_CLOCK_GATE_DISABLE (1 << 30)
> # define GEN7_TDLUNIT_CLOCK_GATE_DISABLE (1 << 22)
> # define GEN6_RCZUNIT_CLOCK_GATE_DISABLE (1 << 13)
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index f11e487..601f43c 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -75,6 +75,10 @@ static void skl_init_clock_gating(struct drm_device *dev)
> I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
> GEN8_GAPSUNIT_CLOCK_GATE_DISABLE |
> GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
> +
> + /* WaDisableVFUnitClockGating:skl */
> + I915_WRITE(GEN6_UCGCTL2, I915_READ(GEN6_UCGCTL2) |
> + GEN6_VFUNIT_CLOCK_GATE_DISABLE);
> }
>
> if (INTEL_REVID(dev) <= SKL_REVID_D0) {
> --
> 1.8.3.1
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-04-08 8:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-26 18:20 [PATCH 0/2] A couple of follow up W/A patches Damien Lespiau
2015-02-26 18:20 ` [PATCH 1/2] drm/i915/skl: Fix stepping check for a couple of W/As Damien Lespiau
2015-04-07 22:45 ` Rodrigo Vivi
2015-04-08 8:15 ` Daniel Vetter
2015-02-26 18:20 ` [PATCH 2/2] drm/i915/skl: Implement WaDisableVFUnitClockGating Damien Lespiau
2015-03-01 1:04 ` shuang.he
2015-04-07 22:44 ` Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox