diff options
| author | Dave Gordon | 2016-05-13 16:36:30 +0200 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-05-23 15:21:52 +0200 |
| commit | 1a3d1898375224f02a3e257cff4619d5a2492f1f (patch) | |
| tree | 719a02c344d4142c3162c4ff43571b07bf061553 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915/guc: rename loader entry points (diff) | |
| download | kernel-qcow2-linux-1a3d1898375224f02a3e257cff4619d5a2492f1f.tar.gz kernel-qcow2-linux-1a3d1898375224f02a3e257cff4619d5a2492f1f.tar.xz kernel-qcow2-linux-1a3d1898375224f02a3e257cff4619d5a2492f1f.zip | |
drm/i915/guc: distinguish HAS_GUC() from HAS_GUC_UCODE/HAS_GUC_SCHED
For now, anything with a GuC requires uCode loading, and then supports
command submission once loaded. But these are logically distinct from
simply "having a GuC", so we need a separate macro for the latter. Then,
various tests should use this new macro rather than HAS_GUC_UCODE() or
testing enable_guc_submission.
v4:
Added a couple more uses of the new macro.
Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 29bdd79d9039..b6dfd0264950 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5039,7 +5039,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv) for_each_engine(engine, dev_priv) I915_WRITE(RING_MAX_IDLE(engine->mmio_base), 10); - if (HAS_GUC_UCODE(dev_priv)) + if (HAS_GUC(dev_priv)) I915_WRITE(GUC_MAX_IDLE_COUNT, 0xA); I915_WRITE(GEN6_RC_SLEEP, 0); |