On Mon, 10 Oct 2022, Radhakrishna Sripada <radhakrishna.srip...@intel.com>
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.
>
> Fixes: c2c7075225ef ("drm/i915: Read graphics/media/display arch version from
> hw")
> Cc: Jani Nikula <jani.nik...@linux.intel.com>
> Cc: Lucas De Marchi <lucas.demar...@intel.com>
> Cc: Matt Roper <matthew.d.ro...@intel.com>
> Signed-off-by: Radhakrishna Sripada <radhakrishna.srip...@intel.com>
> ---
> drivers/gpu/drm/i915/intel_device_info.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c
> b/drivers/gpu/drm/i915/intel_device_info.c
> index 090097bb3c0a..ba178b61bceb 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -329,8 +329,18 @@ 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.ver =
> + RUNTIME_INFO(i915)->graphics.ip.ver;
> + RUNTIME_INFO(i915)->media.ip.rel =
> + RUNTIME_INFO(i915)->graphics.ip.rel;
You could assign the whole struct ip_version (*) at once, or is there a
reason you're intentionally not assigning step?
BR,
Jani.
(*) Why does that name not have intel_ prefix?
> return;
> + }
>
> ip_ver_read(i915, i915_mmio_reg_offset(GMD_ID_GRAPHICS),
> &runtime->graphics.ip);
--
Jani Nikula, Intel Open Source Graphics Center
