[PATCH v2 2/2] drm/i915: Use graphics ver, rel info for media on old platforms

[Lucas De Marchi]

On Tue, Oct 11, 2022 at 08:38:51AM -0700, Radhakrishna Sripada wrote:
>Platforms prior to MTL do not have a separate media and graphics version.
>On platforms where GMD id is not supported, reuse the graphics ip version,
>release info for media.
>
>The rest of the IP graphics, display versions would be copied during driver
>creation.
>
>While at it warn if GMD is not used for platforms greater than gen12.
>
>v2:
> - Use simple assignment to copy contents of the structure(JaniN)
>
>Fixes: c2c7075225ef ("drm/i915: Read graphics/media/display arch version from hw")
>Cc: Jani Nikula <jani.nikula at linux.intel.com>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Cc: Matt Roper <matthew.d.roper at intel.com>
>Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
>Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada at intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/i915/intel_device_info.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>index 37267c662dc6..1dc1fb29a776 100644
>--- a/drivers/gpu/drm/i915/intel_device_info.c
>+++ b/drivers/gpu/drm/i915/intel_device_info.c
>@@ -329,8 +329,16 @@ static void intel_ipver_early_init(struct drm_i915_private *i915)
> {
> 	struct intel_runtime_info *runtime = RUNTIME_INFO(i915);
>
>-	if (!HAS_GMD_ID(i915))
>+	if (!HAS_GMD_ID(i915)) {
>+		drm_WARN_ON(&i915->drm, RUNTIME_INFO(i915)->graphics.ip.ver > 12);
>+		/*
>+		 * On older platforms, graphics and media share the same ip
>+		 * version and release.
>+		 */
>+		RUNTIME_INFO(i915)->media.ip =
>+			RUNTIME_INFO(i915)->graphics.ip;
> 		return;
>+	}
>
> 	ip_ver_read(i915, i915_mmio_reg_offset(GMD_ID_GRAPHICS),
> 		    &runtime->graphics.ip);
>-- 
>2.34.1
>
>