On Wed 12 Apr 14:15 PDT 2017, Jordan Crouse wrote:
> The zap shader firmware name is not platform specific. Move it
> to the device table instead.
>
> Signed-off-by: Jordan Crouse <jcrouse@xxxxxxxxxxxxxx>
This looks good, but it should be squashed with the previous commits.
Regards,
Bjorn
> ---
> drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 24 ++++++++++++------------
> drivers/gpu/drm/msm/adreno/adreno_device.c | 1 +
> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 +
> 3 files changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> index 8678bce..fc9a81a 100644
> --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> @@ -82,10 +82,9 @@ static int zap_load_segments(struct device *dev,
> return ret;
> }
>
> -static int zap_load_mdt(struct device *dev)
> +static int zap_load_mdt(struct device *dev, const char *fwname)
> {
> char filename[64];
> - const char *fwname;
> const struct elf32_hdr *ehdr;
> const struct elf32_phdr *phdrs;
> const struct firmware *mdt;
> @@ -101,13 +100,6 @@ static int zap_load_mdt(struct device *dev)
> return ret;
> }
>
> - /* Get the firmware and PAS id from the device node */
> - if (of_property_read_string(dev->of_node, "qcom,firmware",
> - &fwname)) {
> - DRM_DEV_ERROR(dev, "Could not read a firmware name\n");
> - return -EINVAL;
> - }
> -
> snprintf(filename, sizeof(filename), "%s.mdt", fwname);
>
> /* Request the MDT file for the firmware */
> @@ -491,16 +483,24 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu)
> if (loaded)
> return a5xx_zap_shader_resume(gpu);
>
> + /* We need SCM to be able to load the firmware */
> if (!qcom_scm_is_available()) {
> DRM_DEV_ERROR(&pdev->dev, "SCM is not available\n");
> return -EPROBE_DEFER;
> }
>
> + /* Each GPU has a target specific zap shader firmware name to use */
> + if (!adreno_gpu->info->zapfw) {
> + DRM_DEV_ERROR(&pdev->dev,
> + "Zap shader firmware file not specified for this target\n");
> + return -ENODEV;
> + }
> +
> /* Find the sub-node for the zap shader */
> node = of_get_child_by_name(pdev->dev.of_node, "zap-shader");
> if (!node) {
> - DRM_ERROR("%s: zap-shader not found in device tree\n",
> - gpu->name);
> + DRM_DEV_ERROR(&pdev->dev,
> + "zap-shader not found in device tree\n");
> return -ENODEV;
> }
>
> @@ -520,7 +520,7 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu)
> }
> }
>
> - ret = zap_load_mdt(&a5xx_gpu->zap_dev);
> + ret = zap_load_mdt(&a5xx_gpu->zap_dev, adreno_gpu->info->zapfw);
>
> loaded = !ret;
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
> index c0fa5d1..6118b10 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> @@ -86,6 +86,7 @@
> ADRENO_QUIRK_FAULT_DETECT_MASK,
> .init = a5xx_gpu_init,
> .gpmufw = "a530v3_gpmu.fw2",
> + .zapfw = "a530_zap",
> },
> };
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> index fb4831f..12b1483 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> @@ -77,6 +77,7 @@ struct adreno_info {
> uint32_t gmem;
> enum adreno_quirks quirks;
> struct msm_gpu *(*init)(struct drm_device *dev);
> + const char *zapfw;
> };
>
> const struct adreno_info *adreno_info(struct adreno_rev rev);
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
