diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2016-06-08 00:47:41 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 15:06:23 -0400 |
commit | ccdbb20a75e3e3917f327a185c1a45722b5d359f (patch) | |
tree | 9c666e7c9af403001605b51b947ce65a44ec1e51 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | 5e037834eb6218e4fa845347dbd9ef1b49c2550e (diff) |
drm/amdgpu: add read/write function for GC CAC programming
Create a GC_CAC_IND_INDEX/DATA pair of funcitons to program
all the CAC registers
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 29d0055fe50d..9c9f28c1ce84 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -1488,9 +1488,12 @@ int amdgpu_device_init(struct amdgpu_device *adev, | |||
1488 | adev->uvd_ctx_wreg = &amdgpu_invalid_wreg; | 1488 | adev->uvd_ctx_wreg = &amdgpu_invalid_wreg; |
1489 | adev->didt_rreg = &amdgpu_invalid_rreg; | 1489 | adev->didt_rreg = &amdgpu_invalid_rreg; |
1490 | adev->didt_wreg = &amdgpu_invalid_wreg; | 1490 | adev->didt_wreg = &amdgpu_invalid_wreg; |
1491 | adev->gc_cac_rreg = &amdgpu_invalid_rreg; | ||
1492 | adev->gc_cac_wreg = &amdgpu_invalid_wreg; | ||
1491 | adev->audio_endpt_rreg = &amdgpu_block_invalid_rreg; | 1493 | adev->audio_endpt_rreg = &amdgpu_block_invalid_rreg; |
1492 | adev->audio_endpt_wreg = &amdgpu_block_invalid_wreg; | 1494 | adev->audio_endpt_wreg = &amdgpu_block_invalid_wreg; |
1493 | 1495 | ||
1496 | |||
1494 | DRM_INFO("initializing kernel modesetting (%s 0x%04X:0x%04X 0x%04X:0x%04X 0x%02X).\n", | 1497 | DRM_INFO("initializing kernel modesetting (%s 0x%04X:0x%04X 0x%04X:0x%04X 0x%02X).\n", |
1495 | amdgpu_asic_name[adev->asic_type], pdev->vendor, pdev->device, | 1498 | amdgpu_asic_name[adev->asic_type], pdev->vendor, pdev->device, |
1496 | pdev->subsystem_vendor, pdev->subsystem_device, pdev->revision); | 1499 | pdev->subsystem_vendor, pdev->subsystem_device, pdev->revision); |
@@ -1515,6 +1518,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, | |||
1515 | spin_lock_init(&adev->pcie_idx_lock); | 1518 | spin_lock_init(&adev->pcie_idx_lock); |
1516 | spin_lock_init(&adev->uvd_ctx_idx_lock); | 1519 | spin_lock_init(&adev->uvd_ctx_idx_lock); |
1517 | spin_lock_init(&adev->didt_idx_lock); | 1520 | spin_lock_init(&adev->didt_idx_lock); |
1521 | spin_lock_init(&adev->gc_cac_idx_lock); | ||
1518 | spin_lock_init(&adev->audio_endpt_idx_lock); | 1522 | spin_lock_init(&adev->audio_endpt_idx_lock); |
1519 | 1523 | ||
1520 | adev->rmmio_base = pci_resource_start(adev->pdev, 5); | 1524 | adev->rmmio_base = pci_resource_start(adev->pdev, 5); |