From: Rob Clark <robdclark@xxxxxxxxxxxx> For devices which use zap fw to take the GPU out of secure mode on reset, the firmware is likely to be signed with a device specific key. Meaning that we can't have a single filesystem (or /lib/firmware) that works on multiple devices. So allow a firmware-name to be specified in the zap-shader node in dt. This moves the zap-shader node out of the core sdm845.dtsi and into per- device dts files. Which also removes the need for /delete-node/ in sdm845-cheza.dtsi (as cheza devices do not use zap). This aligns with how Bjorn has been handling the similar situation with adsp/cdsp/mpss fw: https://patchwork.kernel.org/patch/11160089/ Rob Clark (3): drm/msm: support firmware-name for zap fw dt-bindings: drm/msm/gpu: Document firmware-name arm64: dts: sdm845: move gpu zap nodes to per-device dts .../devicetree/bindings/display/msm/gpu.txt | 3 ++ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 1 - arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 7 ++++ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 8 +++++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 +--- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 7 ++++ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 32 +++++++++++++++++-- 7 files changed, 55 insertions(+), 9 deletions(-) -- 2.24.1