]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/gen12: Use fuse info to enable SFC
authorVenkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Wed, 21 Jul 2021 22:30:31 +0000 (15:30 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Thu, 22 Jul 2021 16:36:59 +0000 (09:36 -0700)
In Gen12 there are various fuse combinations and in each configuration
vdbox engine may be connected to SFC depending on which engines are
available, so we need to set the SFC capability based on fuse value from
the hardware. Even numbered physical instance always have SFC, odd
numbered physical instances have SFC only if previous even instance is
fused off.

v2:
 - Minor style & typo fixes (Tvrtko)
 - Drop an unwanted 'inline' (Tvrtko)

Bspec: 48028
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210721223043.834562-7-matthew.d.roper@intel.com
drivers/gpu/drm/i915/gt/intel_engine_cs.c

index d561573ed98c25291b6fac512c4fd71d8bacd081..c1c96ced2a4b0547ed678f750304b4db0936e276 100644 (file)
@@ -442,6 +442,28 @@ void intel_engines_free(struct intel_gt *gt)
        }
 }
 
+static
+bool gen11_vdbox_has_sfc(struct drm_i915_private *i915,
+                        unsigned int physical_vdbox,
+                        unsigned int logical_vdbox, u16 vdbox_mask)
+{
+       /*
+        * In Gen11, only even numbered logical VDBOXes are hooked
+        * up to an SFC (Scaler & Format Converter) unit.
+        * In Gen12, Even numbered physical instance always are connected
+        * to an SFC. Odd numbered physical instances have SFC only if
+        * previous even instance is fused off.
+        */
+       if (GRAPHICS_VER(i915) == 12)
+               return (physical_vdbox % 2 == 0) ||
+                       !(BIT(physical_vdbox - 1) & vdbox_mask);
+       else if (GRAPHICS_VER(i915) == 11)
+               return logical_vdbox % 2 == 0;
+
+       MISSING_CASE(GRAPHICS_VER(i915));
+       return false;
+}
+
 /*
  * Determine which engines are fused off in our particular hardware.
  * Note that we have a catch-22 situation where we need to be able to access
@@ -486,13 +508,9 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)
                        continue;
                }
 
-               /*
-                * In Gen11, only even numbered logical VDBOXes are
-                * hooked up to an SFC (Scaler & Format Converter) unit.
-                * In TGL each VDBOX has access to an SFC.
-                */
-               if (GRAPHICS_VER(i915) >= 12 || logical_vdbox++ % 2 == 0)
+               if (gen11_vdbox_has_sfc(i915, i, logical_vdbox, vdbox_mask))
                        gt->info.vdbox_sfc_access |= BIT(i);
+               logical_vdbox++;
        }
        drm_dbg(&i915->drm, "vdbox enable: %04x, instances: %04lx\n",
                vdbox_mask, VDBOX_MASK(gt));