]> www.infradead.org Git - users/jedix/linux-maple.git/commit
drm/i915: ARL requires a newer GSC firmware
authorJohn Harrison <John.C.Harrison@Intel.com>
Fri, 2 Aug 2024 03:10:51 +0000 (20:10 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 26 Aug 2024 14:21:11 +0000 (10:21 -0400)
commit67733d7a71503fd3e32eeada371f8aa2516c5c95
tree372257adf632d0f33d02e9fb331bd0d5b0d8317b
parent594cf78dc36f31c0c7e0de4567e644f406d46bae
drm/i915: ARL requires a newer GSC firmware

ARL and MTL share a single GSC firmware blob. However, ARL requires a
newer version of it.

So add differentiate of the PCI ids for ARL from MTL and create ARL as
a sub-platform of MTL. That way, all the existing workarounds and such
still treat ARL as MTL exactly as before. However, now the GSC code
can check for ARL and do an extra version check on the firmware before
committing to it.

Also, the version extraction code has various ways of failing but the
return code was being ignore and so the firmware load would attempt to
continue anyway. Fix that by propagating the return code to the next
level out.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Fixes: 213c43676beb ("drm/i915/mtl: Remove the 'force_probe' requirement for Meteor Lake")
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240802031051.3816392-1-John.C.Harrison@Intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_device_info.c
drivers/gpu/drm/i915/intel_device_info.h
include/drm/intel/i915_pciids.h