From: Michal Wajdeczko Date: Thu, 13 Jun 2024 12:07:49 +0000 (+0200) Subject: drm/xe/vf: Use correct check for being a VF driver X-Git-Tag: v6.11-rc1~141^2~16^2~61 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aaf3fd08d08e1bb9dc72bc2bd189464972d27c4;p=thirdparty%2Fkernel%2Flinux.git drm/xe/vf: Use correct check for being a VF driver The IS_SRIOV macro returns true also when we are running as a PF driver. Use correct IS_SRIOV_VF macro to skip force-wake management. Fixes: 513ea833c201 ("drm/xe/vf: Ignore force-wake requests if VF") Signed-off-by: Michal Wajdeczko Cc: Piotr Piórkowski Cc: Rodrigo Vivi Cc: Nirmoy Das Reviewed-by: Piotr Piórkowski Reviewed-by: Nirmoy Das Link: https://patchwork.freedesktop.org/patch/msgid/20240613120749.2032-1-michal.wajdeczko@intel.com --- diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c index 5db6926120c39..b263fff152737 100644 --- a/drivers/gpu/drm/xe/xe_force_wake.c +++ b/drivers/gpu/drm/xe/xe_force_wake.c @@ -97,7 +97,7 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw) static void __domain_ctl(struct xe_gt *gt, struct xe_force_wake_domain *domain, bool wake) { - if (IS_SRIOV(gt_to_xe(gt))) + if (IS_SRIOV_VF(gt_to_xe(gt))) return; xe_mmio_write32(gt, domain->reg_ctl, domain->mask | (wake ? domain->val : 0)); @@ -108,7 +108,7 @@ static int __domain_wait(struct xe_gt *gt, struct xe_force_wake_domain *domain, u32 value; int ret; - if (IS_SRIOV(gt_to_xe(gt))) + if (IS_SRIOV_VF(gt_to_xe(gt))) return 0; ret = xe_mmio_wait32(gt, domain->reg_ack, domain->val, wake ? domain->val : 0,