drm/i915: Add logical mapping for video decode engines

Add logical mapping for VDBOXs. This mapping is required for
split-frame workloads, which otherwise fail with

	00000000-F8C53528: [GUC] 0441-INVALID_ENGINE_SUBMIT_MASK

... if the application is using the logical id to reorder the engines and
then using it for the batch buffer submission. It's not a big problem on
media version 11 and 12 as they have only 2 instances of VCS and the
logical to physical mapping is monotonically increasing - if the
application is not using the logical id.

Changing it for the previous platforms allows the media driver
implementation for the next ones (12.50 and above) to be the same,
checking the logical id. It should also not introduce any bug for the
old versions of userspace not checking the id.

The mapping added here is the complete map needed by XEHPSDV. Previous
platforms with only 2 instances will just use a partial map and should
still work.

v2: Remove static from map variable (José)

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
[ Extend the mapping to media versions 11 and 12 and give proper
  justification in the commit message why ]
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220316234538.434357-2-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index d26cef970f404d394802f3619ac4982a2e20c7c4..624117c55d1b40d2913093ffea41a45b1dc0a953 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -729,12 +729,24 @@ static void populate_logical_ids(struct intel_gt *gt, u8 *logical_ids,
 
 static void setup_logical_ids(struct intel_gt *gt, u8 *logical_ids, u8 class)
 {
-       int i;
-       u8 map[MAX_ENGINE_INSTANCE + 1];
+       /*
+        * Logical to physical mapping is needed for proper support
+        * to split-frame feature.
+        */
+       if (MEDIA_VER(gt->i915) >= 11 && class == VIDEO_DECODE_CLASS) {
+               const u8 map[] = { 0, 2, 4, 6, 1, 3, 5, 7 };
 
-       for (i = 0; i < MAX_ENGINE_INSTANCE + 1; ++i)
-               map[i] = i;
-       populate_logical_ids(gt, logical_ids, class, map, ARRAY_SIZE(map));
+               populate_logical_ids(gt, logical_ids, class,
+                                    map, ARRAY_SIZE(map));
+       } else {
+               int i;
+               u8 map[MAX_ENGINE_INSTANCE + 1];
+
+               for (i = 0; i < MAX_ENGINE_INSTANCE + 1; ++i)
+                       map[i] = i;
+               populate_logical_ids(gt, logical_ids, class,
+                                    map, ARRAY_SIZE(map));
+       }
 }
 
 /**