The GPU on X1E80100 requires ZAP 'shader' file to be useful. Since the
file is signed by the OEM keys and might be not available by default,
disable the GPU node and drop the firmware name from the x1e80100.dtsi
file. Devices not being fused to use OEM keys can specify generic
location at `qcom/x1e80100/gen70500_zap.mbn` while enabling the GPU.

Fixes: 721e38301b79 ("arm64: dts: qcom: x1e80100: Add gpu support")
Cc: Akhil P Oommen <quic_akhilpo@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/x1e80100.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
index 7bca5fcd7d52..8df90d01eba8 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
@@ -3155,9 +3155,10 @@ gpu: gpu@3d00000 {
 			interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
 			interconnect-names = "gfx-mem";
 
+			status = "disabled";
+
 			zap-shader {
 				memory-region = <&gpu_microcode_mem>;
-				firmware-name = "qcom/gen70500_zap.mbn";
 			};
 
 			gpu_opp_table: opp-table {

---
base-commit: 3fe121b622825ff8cc995a1e6b026181c48188db
change-id: 20240715-x1e8-zap-name-7b3c79234401

Best regards,
-- 
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

On Mon, Jul 15, 2024 at 05:23:58PM +0300, Dmitry Baryshkov wrote:
> The GPU on X1E80100 requires ZAP 'shader' file to be useful. Since the
> file is signed by the OEM keys and might be not available by default,
> disable the GPU node and drop the firmware name from the x1e80100.dtsi
> file. Devices not being fused to use OEM keys can specify generic
> location at `qcom/x1e80100/gen70500_zap.mbn` while enabling the GPU.

Please enable the GPU for the CRD as part of this patch (e.g. move the
fw name property there).

Johan

On Mon, 15 Jul 2024 at 17:44, Johan Hovold <johan@kernel.org> wrote:
>
> On Mon, Jul 15, 2024 at 05:23:58PM +0300, Dmitry Baryshkov wrote:
> > The GPU on X1E80100 requires ZAP 'shader' file to be useful. Since the
> > file is signed by the OEM keys and might be not available by default,
> > disable the GPU node and drop the firmware name from the x1e80100.dtsi
> > file. Devices not being fused to use OEM keys can specify generic
> > location at `qcom/x1e80100/gen70500_zap.mbn` while enabling the GPU.
>
> Please enable the GPU for the CRD as part of this patch (e.g. move the
> fw name property there).

I can not just move the property, as it is going to have a different
value. I think GPU enablement for CRD should come as a separate patch.

-- 
With best wishes
Dmitry

On Mon, Jul 15, 2024 at 07:40:22PM +0300, Dmitry Baryshkov wrote:
> On Mon, 15 Jul 2024 at 17:44, Johan Hovold <johan@kernel.org> wrote:
> >
> > On Mon, Jul 15, 2024 at 05:23:58PM +0300, Dmitry Baryshkov wrote:
> > > The GPU on X1E80100 requires ZAP 'shader' file to be useful. Since the
> > > file is signed by the OEM keys and might be not available by default,
> > > disable the GPU node and drop the firmware name from the x1e80100.dtsi
> > > file. Devices not being fused to use OEM keys can specify generic
> > > location at `qcom/x1e80100/gen70500_zap.mbn` while enabling the GPU.
> >
> > Please enable the GPU for the CRD as part of this patch (e.g. move the
> > fw name property there).
> 
> I can not just move the property, as it is going to have a different
> value. I think GPU enablement for CRD should come as a separate patch.

The GPU is already enabled, this patch is effectively disabling it
unless you move (and update) the corresponding properties to the CRD
dts.

Johan

On 15.07.2024 6:44 PM, Johan Hovold wrote:
> On Mon, Jul 15, 2024 at 07:40:22PM +0300, Dmitry Baryshkov wrote:
>> On Mon, 15 Jul 2024 at 17:44, Johan Hovold <johan@kernel.org> wrote:
>>>
>>> On Mon, Jul 15, 2024 at 05:23:58PM +0300, Dmitry Baryshkov wrote:
>>>> The GPU on X1E80100 requires ZAP 'shader' file to be useful. Since the
>>>> file is signed by the OEM keys and might be not available by default,
>>>> disable the GPU node and drop the firmware name from the x1e80100.dtsi
>>>> file. Devices not being fused to use OEM keys can specify generic
>>>> location at `qcom/x1e80100/gen70500_zap.mbn` while enabling the GPU.
>>>
>>> Please enable the GPU for the CRD as part of this patch (e.g. move the
>>> fw name property there).
>>
>> I can not just move the property, as it is going to have a different
>> value. I think GPU enablement for CRD should come as a separate patch.
> 
> The GPU is already enabled, this patch is effectively disabling it
> unless you move (and update) the corresponding properties to the CRD

Right, sorry about not noticing this.

Dmitry, please do as Johan suggests here, taking care of the commit
you sent to linux-firmware moving stuff around..

Konrad

On 15.07.2024 4:23 PM, Dmitry Baryshkov wrote:
> The GPU on X1E80100 requires ZAP 'shader' file to be useful. Since the
> file is signed by the OEM keys and might be not available by default,
> disable the GPU node and drop the firmware name from the x1e80100.dtsi
> file. Devices not being fused to use OEM keys can specify generic
> location at `qcom/x1e80100/gen70500_zap.mbn` while enabling the GPU.
> 
> Fixes: 721e38301b79 ("arm64: dts: qcom: x1e80100: Add gpu support")
> Cc: Akhil P Oommen <quic_akhilpo@quicinc.com>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad