drm/amdgpu: fix a page fault (dbbf2728) · Commits · 戴 / test

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

drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -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;

Admin message