[PATCH v2] drm/amdgpu: fix SI UVD firmware validate resume fail

[Leo Liu]

Reviewed-by: Leo Liu <leo.liu at amd.com>


On 2020-11-13 5:33 p.m., Jiang, Sonny wrote:
>
> [AMD Official Use Only - Internal Distribution Only]
>
>
> [AMD Official Use Only - Internal Distribution Only]
>
>
> Ping.
> ------------------------------------------------------------------------
> *From:* Jiang, Sonny <Sonny.Jiang at amd.com>
> *Sent:* Monday, November 9, 2020 2:41 PM
> *To:* amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
> *Cc:* Jiang, Sonny <Sonny.Jiang at amd.com>
> *Subject:* [PATCH v2] drm/amdgpu: fix SI UVD firmware validate resume 
> fail
> The SI UVD firmware validate key is stored at the end of firmware,
> which is changed during resume while playing video. So get the key
> at sw_init and store it for fw validate using.
>
> Signed-off-by: Sonny Jiang <sonny.jiang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h |  1 +
>  drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c   | 20 +++++++++++---------
>  2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
> index 5eb63288d157..edbb8194ee81 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
> @@ -67,6 +67,7 @@ struct amdgpu_uvd {
>          unsigned                harvest_config;
>          /* store image width to adjust nb memory state */
>          unsigned                decode_image_width;
> +       uint32_t                keyselect;
>  };
>
>  int amdgpu_uvd_sw_init(struct amdgpu_device *adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c 
> b/drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c
> index 7cf4b11a65c5..3a5dce634cda 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c
> @@ -277,15 +277,8 @@ static void uvd_v3_1_mc_resume(struct 
> amdgpu_device *adev)
>   */
>  static int uvd_v3_1_fw_validate(struct amdgpu_device *adev)
>  {
> -       void *ptr;
> -       uint32_t ucode_len, i;
> -       uint32_t keysel;
> -
> -       ptr = adev->uvd.inst[0].cpu_addr;
> -       ptr += 192 + 16;
> -       memcpy(&ucode_len, ptr, 4);
> -       ptr += ucode_len;
> -       memcpy(&keysel, ptr, 4);
> +       int i;
> +       uint32_t keysel = adev->uvd.keyselect;
>
>          WREG32(mmUVD_FW_START, keysel);
>
> @@ -550,6 +543,8 @@ static int uvd_v3_1_sw_init(void *handle)
>          struct amdgpu_ring *ring;
>          struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>          int r;
> +       void *ptr;
> +       uint32_t ucode_len;
>
>          /* UVD TRAP */
>          r = amdgpu_irq_add_id(adev, AMDGPU_IRQ_CLIENTID_LEGACY, 124, 
> &adev->uvd.inst->irq);
> @@ -560,6 +555,13 @@ static int uvd_v3_1_sw_init(void *handle)
>          if (r)
>                  return r;
>
> +       /* Retrieval firmware validate key */
> +       ptr = adev->uvd.inst[0].cpu_addr;
> +       ptr += 192 + 16;
> +       memcpy(&ucode_len, ptr, 4);
> +       ptr += ucode_len;
> +       memcpy(&adev->uvd.keyselect, ptr, 4);
> +
>          ring = &adev->uvd.inst->ring;
>          sprintf(ring->name, "uvd");
>          r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0,
> -- 
> 2.25.1
>
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cleo.liu%40amd.com%7C695a4d51b81b4a08dbe208d888242256%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637409036097906257%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=8u1TK45gYH0hQ8dn5x1A9ckXIYQjGCedmkp8mpt4EW4%3D&reserved=0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20201116/572c40cb/attachment.htm>