drm/i915/guc : GEM_BUG_ON on invoking GuC reset function
authorSujaritha Sundaresan <sujaritha.sundaresan@intel.com>
Tue, 2 Jan 2018 21:20:25 +0000 (13:20 -0800)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 3 Jan 2018 14:02:12 +0000 (14:02 +0000)
Instead of returning -EINVAL, GEM_BUG_ON when GuC reset is invoked for
platforms not supporting as we don't expect to invoke it.

v2: re-wording commit message and subject (Sagar)

Signed-off-by: Sujaritha Sundaresan <sujaritha.sundaresan@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/1514928025-29659-2-git-send-email-sujaritha.sundaresan@intel.com
drivers/gpu/drm/i915/intel_uncore.c

index 89547b614aa6db389d9abfb56d8703ef79d42dd9..94e1fb3a2936d9fa0da7a96a0560588af1d51d86 100644 (file)
@@ -1936,8 +1936,7 @@ int intel_reset_guc(struct drm_i915_private *dev_priv)
 {
        int ret;
 
-       if (!HAS_GUC(dev_priv))
-               return -EINVAL;
+       GEM_BUG_ON(!HAS_GUC(dev_priv));
 
        intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
        ret = gen6_hw_domain_reset(dev_priv, GEN9_GRDOM_GUC);