| Message ID | 20200112195405.1132288-3-robdclark@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm: use firmware-name to find zap fw | expand |
On Sun, Jan 12, 2020 at 11:53:58AM -0800, Rob Clark wrote: > From: Rob Clark <robdclark@chromium.org> > > For newer devices we want to require the path to come from the > firmware-name property in the zap-shader dt node. Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org> > Signed-off-by: Rob Clark <robdclark@chromium.org> > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 456bb5af1717..c146c3b8f52b 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -79,9 +79,21 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > ret = request_firmware_direct(&fw, fwname, gpu->dev->dev); > if (ret) > fw = ERR_PTR(ret); > - } else { > + } else if (fwname) { > /* Request the MDT file from the default location: */ > fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); > + } else { > + /* > + * For new targets, we require the firmware-name property, > + * if a zap-shader is required, rather than falling back > + * to a firmware name specified in gpulist. > + * > + * Because the firmware is signed with a (potentially) > + * device specific key, having the name come from gpulist > + * was a bad idea, and is only provided for backwards > + * compatibility for older targets. > + */ > + return -ENODEV; > } A possible future optimization would be to move a lot of this to the target specific code but we can do that once we're sure that all the rest of the fallout has bee militated. > > if (IS_ERR(fw)) { > @@ -170,14 +182,6 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid) > return -EPROBE_DEFER; > } > > - /* Each GPU has a target specific zap shader firmware name to use */ > - if (!adreno_gpu->info->zapfw) { > - zap_available = false; > - DRM_DEV_ERROR(&pdev->dev, > - "Zap shader firmware file not specified for this target\n"); > - return -ENODEV; > - } > - > return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid); > } > > -- > 2.24.1 >
On Sun 12 Jan 11:53 PST 2020, Rob Clark wrote: > From: Rob Clark <robdclark@chromium.org> > > For newer devices we want to require the path to come from the > firmware-name property in the zap-shader dt node. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Rob Clark <robdclark@chromium.org> > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 456bb5af1717..c146c3b8f52b 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -79,9 +79,21 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > ret = request_firmware_direct(&fw, fwname, gpu->dev->dev); > if (ret) > fw = ERR_PTR(ret); > - } else { > + } else if (fwname) { > /* Request the MDT file from the default location: */ > fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); > + } else { > + /* > + * For new targets, we require the firmware-name property, > + * if a zap-shader is required, rather than falling back > + * to a firmware name specified in gpulist. > + * > + * Because the firmware is signed with a (potentially) > + * device specific key, having the name come from gpulist > + * was a bad idea, and is only provided for backwards > + * compatibility for older targets. > + */ > + return -ENODEV; > } > > if (IS_ERR(fw)) { > @@ -170,14 +182,6 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid) > return -EPROBE_DEFER; > } > > - /* Each GPU has a target specific zap shader firmware name to use */ > - if (!adreno_gpu->info->zapfw) { > - zap_available = false; > - DRM_DEV_ERROR(&pdev->dev, > - "Zap shader firmware file not specified for this target\n"); > - return -ENODEV; > - } > - > return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid); > } > > -- > 2.24.1 >
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 456bb5af1717..c146c3b8f52b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -79,9 +79,21 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, ret = request_firmware_direct(&fw, fwname, gpu->dev->dev); if (ret) fw = ERR_PTR(ret); - } else { + } else if (fwname) { /* Request the MDT file from the default location: */ fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); + } else { + /* + * For new targets, we require the firmware-name property, + * if a zap-shader is required, rather than falling back + * to a firmware name specified in gpulist. + * + * Because the firmware is signed with a (potentially) + * device specific key, having the name come from gpulist + * was a bad idea, and is only provided for backwards + * compatibility for older targets. + */ + return -ENODEV; } if (IS_ERR(fw)) { @@ -170,14 +182,6 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid) return -EPROBE_DEFER; } - /* Each GPU has a target specific zap shader firmware name to use */ - if (!adreno_gpu->info->zapfw) { - zap_available = false; - DRM_DEV_ERROR(&pdev->dev, - "Zap shader firmware file not specified for this target\n"); - return -ENODEV; - } - return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid); }