Re: [Freedreno] [PATCH 2/7] drm/msm/adreno: Add ZAP firmware name to A635
On Tue, Oct 17, 2023 at 12:33:45AM -0700, Rob Clark wrote: > > On Mon, Oct 16, 2023 at 1:12 PM Akhil P Oommen > wrote: > > > > On Tue, Sep 26, 2023 at 08:24:37PM +0200, Konrad Dybcio wrote: > > > > > > Some (many?) devices with A635 expect a ZAP shader to be loaded. > > > > > > Set the file name to allow for that. > > > > > > Signed-off-by: Konrad Dybcio > > > --- > > > drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c > > > b/drivers/gpu/drm/msm/adreno/adreno_device.c > > > index fa527935ffd4..16527fe8584d 100644 > > > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > > > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > > > @@ -454,6 +454,7 @@ static const struct adreno_info gpulist[] = { > > > .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | > > > ADRENO_QUIRK_HAS_HW_APRIV, > > > .init = a6xx_gpu_init, > > > + .zapfw = "a660_zap.mbn", > > > > sc7280 doesn't have a TZ and so no zap shader support. Can we handle > > this using "firmware-name" property in your top level platform dt? Zap > > firmwares are signed with different keys for each OEMs. So there is > > cross-compatibility anyway. I had a typo here. I meant "no cross compatibility". > > I think this ends up working out because the version of sc7280 that > doesn't have TZ also doesn't have the associated mem-region/etc.. but > maybe we should deprecate the zapfw field as in practice it isn't > useful (ie. always overriden by firmware-name). Sounds good. > > Fwiw there are windows laptops with sc7180/sc7280 which do use zap fw. Aah! right. > > BR, > -R > > > > > -Ahil. > > > > > .hwcg = a660_hwcg, > > > .address_space_size = SZ_16G, > > > .speedbins = ADRENO_SPEEDBINS( > > > > > > -- > > > 2.42.0 > > >
Re: [Freedreno] [PATCH 2/7] drm/msm/adreno: Add ZAP firmware name to A635
On 10/17/23 09:33, Rob Clark wrote: On Mon, Oct 16, 2023 at 1:12 PM Akhil P Oommen wrote: On Tue, Sep 26, 2023 at 08:24:37PM +0200, Konrad Dybcio wrote: Some (many?) devices with A635 expect a ZAP shader to be loaded. Set the file name to allow for that. Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index fa527935ffd4..16527fe8584d 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -454,6 +454,7 @@ static const struct adreno_info gpulist[] = { .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | ADRENO_QUIRK_HAS_HW_APRIV, .init = a6xx_gpu_init, + .zapfw = "a660_zap.mbn", sc7280 doesn't have a TZ and so no zap shader support. Can we handle this using "firmware-name" property in your top level platform dt? Zap firmwares are signed with different keys for each OEMs. So there is cross-compatibility anyway. I think this ends up working out because the version of sc7280 that doesn't have TZ also doesn't have the associated mem-region/etc.. Yes but maybe we should deprecate the zapfw field as in practice it isn't useful (ie. always overriden by firmware-name). Also yes, we've discussed that on IRC once Fwiw there are windows laptops with sc7180/sc7280 which do use zap fw. Correct, e.g. the SC7180 Acer Aspire 1 that is supported upstream. Konrad Konrad
Re: [Freedreno] [PATCH 2/7] drm/msm/adreno: Add ZAP firmware name to A635
On Mon, Oct 16, 2023 at 1:12 PM Akhil P Oommen wrote: > > On Tue, Sep 26, 2023 at 08:24:37PM +0200, Konrad Dybcio wrote: > > > > Some (many?) devices with A635 expect a ZAP shader to be loaded. > > > > Set the file name to allow for that. > > > > Signed-off-by: Konrad Dybcio > > --- > > drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c > > b/drivers/gpu/drm/msm/adreno/adreno_device.c > > index fa527935ffd4..16527fe8584d 100644 > > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > > @@ -454,6 +454,7 @@ static const struct adreno_info gpulist[] = { > > .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | > > ADRENO_QUIRK_HAS_HW_APRIV, > > .init = a6xx_gpu_init, > > + .zapfw = "a660_zap.mbn", > > sc7280 doesn't have a TZ and so no zap shader support. Can we handle > this using "firmware-name" property in your top level platform dt? Zap > firmwares are signed with different keys for each OEMs. So there is > cross-compatibility anyway. I think this ends up working out because the version of sc7280 that doesn't have TZ also doesn't have the associated mem-region/etc.. but maybe we should deprecate the zapfw field as in practice it isn't useful (ie. always overriden by firmware-name). Fwiw there are windows laptops with sc7180/sc7280 which do use zap fw. BR, -R > > -Ahil. > > > .hwcg = a660_hwcg, > > .address_space_size = SZ_16G, > > .speedbins = ADRENO_SPEEDBINS( > > > > -- > > 2.42.0 > >
Re: [Freedreno] [PATCH 2/7] drm/msm/adreno: Add ZAP firmware name to A635
On Tue, Sep 26, 2023 at 08:24:37PM +0200, Konrad Dybcio wrote: > > Some (many?) devices with A635 expect a ZAP shader to be loaded. > > Set the file name to allow for that. > > Signed-off-by: Konrad Dybcio > --- > drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c > b/drivers/gpu/drm/msm/adreno/adreno_device.c > index fa527935ffd4..16527fe8584d 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > @@ -454,6 +454,7 @@ static const struct adreno_info gpulist[] = { > .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | > ADRENO_QUIRK_HAS_HW_APRIV, > .init = a6xx_gpu_init, > + .zapfw = "a660_zap.mbn", sc7280 doesn't have a TZ and so no zap shader support. Can we handle this using "firmware-name" property in your top level platform dt? Zap firmwares are signed with different keys for each OEMs. So there is cross-compatibility anyway. -Ahil. > .hwcg = a660_hwcg, > .address_space_size = SZ_16G, > .speedbins = ADRENO_SPEEDBINS( > > -- > 2.42.0 >