lkml.org 
[lkml]   [2020]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 035/152] drm/amdgpu: fix a page fault
    Date
    From: Sonny Jiang <sonny.jiang@amd.com>

    commit dbbf2728d50343b7947001a81f4c8cc98e4b44e5 upstream.

    The UVD firmware is copied to cpu addr in uvd_resume, so it
    should be used after that. This is to fix a bug introduced by
    patch drm/amdgpu: fix SI UVD firmware validate resume fail.

    Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
    Reviewed-by: Leo Liu <leo.liu@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    CC: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c
    +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c
    @@ -555,13 +555,6 @@ 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,
    @@ -573,6 +566,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);
    +
    r = amdgpu_uvd_entity_init(adev);

    return r;

    \
     
     \ /
      Last update: 2020-12-01 10:12    [W:4.152 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site