diff options
| author | Sujaritha Sundaresan | 2018-01-02 22:20:25 +0100 |
|---|---|---|
| committer | Chris Wilson | 2018-01-03 15:02:12 +0100 |
| commit | 6f25d0be180f5b4713c6fb5a6619fe11dd1dacd9 (patch) | |
| tree | 67c839e469874f56b752a53164f3ece355968a81 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | drm/i915/guc : Decoupling ADS and logs from submission (diff) | |
| download | kernel-qcow2-linux-6f25d0be180f5b4713c6fb5a6619fe11dd1dacd9.tar.gz kernel-qcow2-linux-6f25d0be180f5b4713c6fb5a6619fe11dd1dacd9.tar.xz kernel-qcow2-linux-6f25d0be180f5b4713c6fb5a6619fe11dd1dacd9.zip | |
drm/i915/guc : GEM_BUG_ON on invoking GuC reset function
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 89547b614aa6..94e1fb3a2936 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -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); |