aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index 6b719e11b2cd..f9a5482101bc 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -49,6 +49,11 @@ static int uvd_v7_0_start(struct amdgpu_device *adev);
49static void uvd_v7_0_stop(struct amdgpu_device *adev); 49static void uvd_v7_0_stop(struct amdgpu_device *adev);
50static int uvd_v7_0_sriov_start(struct amdgpu_device *adev); 50static int uvd_v7_0_sriov_start(struct amdgpu_device *adev);
51 51
52static int amdgpu_ih_clientid_uvds[] = {
53 SOC15_IH_CLIENTID_UVD,
54 SOC15_IH_CLIENTID_UVD1
55};
56
52/** 57/**
53 * uvd_v7_0_ring_get_rptr - get read pointer 58 * uvd_v7_0_ring_get_rptr - get read pointer
54 * 59 *
@@ -397,13 +402,13 @@ static int uvd_v7_0_sw_init(void *handle)
397 402
398 for (j = 0; j < adev->uvd.num_uvd_inst; j++) { 403 for (j = 0; j < adev->uvd.num_uvd_inst; j++) {
399 /* UVD TRAP */ 404 /* UVD TRAP */
400 r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_UVD, 124, &adev->uvd.inst[j].irq); 405 r = amdgpu_irq_add_id(adev, amdgpu_ih_clientid_uvds[j], 124, &adev->uvd.inst[j].irq);
401 if (r) 406 if (r)
402 return r; 407 return r;
403 408
404 /* UVD ENC TRAP */ 409 /* UVD ENC TRAP */
405 for (i = 0; i < adev->uvd.num_enc_rings; ++i) { 410 for (i = 0; i < adev->uvd.num_enc_rings; ++i) {
406 r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_UVD, i + 119, &adev->uvd.inst[j].irq); 411 r = amdgpu_irq_add_id(adev, amdgpu_ih_clientid_uvds[j], i + 119, &adev->uvd.inst[j].irq);
407 if (r) 412 if (r)
408 return r; 413 return r;
409 } 414 }
@@ -1480,6 +1485,9 @@ static int uvd_v7_0_process_interrupt(struct amdgpu_device *adev,
1480 case SOC15_IH_CLIENTID_UVD: 1485 case SOC15_IH_CLIENTID_UVD:
1481 ip_instance = 0; 1486 ip_instance = 0;
1482 break; 1487 break;
1488 case SOC15_IH_CLIENTID_UVD1:
1489 ip_instance = 1;
1490 break;
1483 default: 1491 default:
1484 DRM_ERROR("Unhandled client id: %d\n", entry->client_id); 1492 DRM_ERROR("Unhandled client id: %d\n", entry->client_id);
1485 return 0; 1493 return 0;