diff options
| author | Michel Thierry <michel.thierry@intel.com> | 2018-03-28 13:58:50 -0700 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-03-29 11:29:30 +0100 |
| commit | 4d07f6c40a764748f3c30c65d9f8e75a36fd1ad9 (patch) | |
| tree | 70f95603b57e40873f8cc3aecf809a968c15c671 /drivers/gpu/drm/i915/intel_uc.c | |
| parent | 0a015ff9730c169aa0d581e3f7727752ba3ff5b3 (diff) | |
| download | linux-stable-4d07f6c40a764748f3c30c65d9f8e75a36fd1ad9.tar.gz linux-stable-4d07f6c40a764748f3c30c65d9f8e75a36fd1ad9.tar.bz2 linux-stable-4d07f6c40a764748f3c30c65d9f8e75a36fd1ad9.zip | |
drm/i915/guc: enable guc interrupts unconditionally in uc_resume
Probably lost while rebasing commit eacd8391f977 ("drm/i915/guc: Keep GuC
interrupts enabled when using GuC").
Not really needed since i915_gem_init_hw is called before uc_resume, but
it brings symmetry to uc_suspend.
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180328205851.16188-1-michel.thierry@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 081e42462aad..1cffaf7b5dbe 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -480,8 +480,7 @@ int intel_uc_resume(struct drm_i915_private *i915) if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS) return 0; - if (i915_modparams.guc_log_level) - gen9_enable_guc_interrupts(i915); + gen9_enable_guc_interrupts(i915); err = intel_guc_resume(guc); if (err) { |