OSDN Git Service

drm/amdgpu/gfx7: use cached values for raster config in clear state
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 13 Nov 2017 20:45:31 +0000 (15:45 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 6 Dec 2017 17:47:47 +0000 (12:47 -0500)
Use the cached values rather than hardcoding it.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c

index 015f37b..83d94c2 100644 (file)
@@ -2551,29 +2551,8 @@ static int gfx_v7_0_cp_gfx_start(struct amdgpu_device *adev)
 
        amdgpu_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
        amdgpu_ring_write(ring, mmPA_SC_RASTER_CONFIG - PACKET3_SET_CONTEXT_REG_START);
-       switch (adev->asic_type) {
-       case CHIP_BONAIRE:
-               amdgpu_ring_write(ring, 0x16000012);
-               amdgpu_ring_write(ring, 0x00000000);
-               break;
-       case CHIP_KAVERI:
-               amdgpu_ring_write(ring, 0x00000000); /* XXX */
-               amdgpu_ring_write(ring, 0x00000000);
-               break;
-       case CHIP_KABINI:
-       case CHIP_MULLINS:
-               amdgpu_ring_write(ring, 0x00000000); /* XXX */
-               amdgpu_ring_write(ring, 0x00000000);
-               break;
-       case CHIP_HAWAII:
-               amdgpu_ring_write(ring, 0x3a00161a);
-               amdgpu_ring_write(ring, 0x0000002e);
-               break;
-       default:
-               amdgpu_ring_write(ring, 0x00000000);
-               amdgpu_ring_write(ring, 0x00000000);
-               break;
-       }
+       amdgpu_ring_write(ring, adev->gfx.config.rb_config[0][0].raster_config);
+       amdgpu_ring_write(ring, adev->gfx.config.rb_config[0][0].raster_config_1);
 
        amdgpu_ring_write(ring, PACKET3(PACKET3_PREAMBLE_CNTL, 0));
        amdgpu_ring_write(ring, PACKET3_PREAMBLE_END_CLEAR_STATE);