]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/xe/vf: Use correct check for being a VF driver
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Thu, 13 Jun 2024 12:07:49 +0000 (14:07 +0200)
committerMichal Wajdeczko <michal.wajdeczko@intel.com>
Thu, 13 Jun 2024 18:31:24 +0000 (20:31 +0200)
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 <michal.wajdeczko@intel.com>
Cc: Piotr Piórkowski <piotr.piorkowski@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240613120749.2032-1-michal.wajdeczko@intel.com
drivers/gpu/drm/xe/xe_force_wake.c

index 5db6926120c392bae4b24cabe47774707335019f..b263fff1527377836380e316a60e8513bd35704e 100644 (file)
@@ -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,