On Tue, Jun 21, 2016 at 03:02:57PM +0100, Tvrtko Ursulin wrote:
>
> On 21/06/16 14:00, Chris Wilson wrote:
> >On Tue, Jun 21, 2016 at 01:48:23PM +0100, Tvrtko Ursulin wrote:
> >>From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> >>
> >>No need for local struct drm_device * since dev_priv is the
> >>correct thing to pass in to NEEDS_WaRsDisableCoarsePowerGating
> >>anyway. Changed the macro definition for the latter to reflect
> >>that as well.
> >>
> >>Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> >>Cc: Dave Gordon <david.s.gordon@xxxxxxxxx>
> >>---
> >> drivers/gpu/drm/i915/i915_drv.h | 7 ++++---
> >> drivers/gpu/drm/i915/i915_guc_submission.c | 3 +--
> >> 2 files changed, 5 insertions(+), 5 deletions(-)
> >>
> >>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> >>index 48928227bdcc..3775d26ac573 100644
> >>--- a/drivers/gpu/drm/i915/i915_drv.h
> >>+++ b/drivers/gpu/drm/i915/i915_drv.h
> >>@@ -2788,9 +2788,10 @@ struct drm_i915_cmd_table {
> >> #define HAS_BROKEN_CS_TLB(dev) (IS_I830(dev) || IS_845G(dev))
> >>
> >> /* WaRsDisableCoarsePowerGating:skl,bxt */
> >>-#define NEEDS_WaRsDisableCoarsePowerGating(dev) (IS_BXT_REVID(dev, 0, BXT_REVID_A1) || \
> >>- IS_SKL_GT3(dev) || \
> >>- IS_SKL_GT4(dev))
> >>+#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) (IS_BXT_REVID(dev_priv, \
> >>+ 0, BXT_REVID_A1) || \
> >>+ IS_SKL_GT3(dev_priv) || \
> >>+ IS_SKL_GT4(dev_priv))
> >
> >#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \
> > (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1) || \
> > IS_SKL_GT3(dev_priv) ||
> > IS_SKL_GT4(dev_priv))
> >
> >Other than that,
> >Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> >
> >Just wondering if you fancy having a go at IS_SKL_GT(dev_priv, min, max)...
>
> What do you have in mind?
>
> This is a single call site for them BTW. And GCC amazingly does
> manage to merge the two GT tests on its own already. :)
#define GT(x) ((INTEL_DEVID(x) & 0xf0) >> 4)
IS_SKL_GT(dev, min, max) ({
int gt__ = GT(dev);
IS_SKYLAKE(dev) && gt__ >= (min) && gt__ < (min);
})
Give or take some more massaging.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
