summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Belgaumkar <vinay.belgaumkar@intel.com>2022-05-05 22:41:42 -0700
committerJohn Harrison <John.C.Harrison@Intel.com>2022-05-13 15:09:02 -0700
commitca10b9d60f8c9556720bad8b1ec7d522e353a01d (patch)
tree5f159751815742d2f6e82de37364347b89a45de3
parent18fb42db05a0b93ab5dd5eab5315e50eaa3ca620 (diff)
downloadlinux-stable-ca10b9d60f8c9556720bad8b1ec7d522e353a01d.tar.gz
linux-stable-ca10b9d60f8c9556720bad8b1ec7d522e353a01d.tar.bz2
linux-stable-ca10b9d60f8c9556720bad8b1ec7d522e353a01d.zip
drm/i915/guc/rc: Use i915_probe_error instead of drm_error
To avoid false positives in error injection cases. Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220506054142.5025-1-vinay.belgaumkar@intel.com
-rw-r--r--drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
index e00661fb0853..8f8dd05835c5 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
@@ -49,7 +49,6 @@ static int guc_action_control_gucrc(struct intel_guc *guc, bool enable)
static int __guc_rc_control(struct intel_guc *guc, bool enable)
{
struct intel_gt *gt = guc_to_gt(guc);
- struct drm_device *drm = &guc_to_gt(guc)->i915->drm;
int ret;
if (!intel_uc_uses_guc_rc(&gt->uc))
@@ -60,8 +59,8 @@ static int __guc_rc_control(struct intel_guc *guc, bool enable)
ret = guc_action_control_gucrc(guc, enable);
if (ret) {
- drm_err(drm, "Failed to %s GuC RC (%pe)\n",
- str_enable_disable(enable), ERR_PTR(ret));
+ i915_probe_error(guc_to_gt(guc)->i915, "Failed to %s GuC RC (%pe)\n",
+ str_enable_disable(enable), ERR_PTR(ret));
return ret;
}