diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/nid.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/sid.h | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 27769e724b6d..02e958063682 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
| @@ -621,6 +621,8 @@ static void cayman_gpu_init(struct radeon_device *rdev) | |||
| 621 | 621 | ||
| 622 | WREG32(GB_ADDR_CONFIG, gb_addr_config); | 622 | WREG32(GB_ADDR_CONFIG, gb_addr_config); |
| 623 | WREG32(DMIF_ADDR_CONFIG, gb_addr_config); | 623 | WREG32(DMIF_ADDR_CONFIG, gb_addr_config); |
| 624 | if (ASIC_IS_DCE6(rdev)) | ||
| 625 | WREG32(DMIF_ADDR_CALC, gb_addr_config); | ||
| 624 | WREG32(HDP_ADDR_CONFIG, gb_addr_config); | 626 | WREG32(HDP_ADDR_CONFIG, gb_addr_config); |
| 625 | WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config); | 627 | WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config); |
| 626 | WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config); | 628 | WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config); |
diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h index 079dee202a9e..445b235c4323 100644 --- a/drivers/gpu/drm/radeon/nid.h +++ b/drivers/gpu/drm/radeon/nid.h | |||
| @@ -45,6 +45,10 @@ | |||
| 45 | #define ARUBA_GB_ADDR_CONFIG_GOLDEN 0x12010001 | 45 | #define ARUBA_GB_ADDR_CONFIG_GOLDEN 0x12010001 |
| 46 | 46 | ||
| 47 | #define DMIF_ADDR_CONFIG 0xBD4 | 47 | #define DMIF_ADDR_CONFIG 0xBD4 |
| 48 | |||
| 49 | /* DCE6 only */ | ||
| 50 | #define DMIF_ADDR_CALC 0xC00 | ||
| 51 | |||
| 48 | #define SRBM_GFX_CNTL 0x0E44 | 52 | #define SRBM_GFX_CNTL 0x0E44 |
| 49 | #define RINGID(x) (((x) & 0x3) << 0) | 53 | #define RINGID(x) (((x) & 0x3) << 0) |
| 50 | #define VMID(x) (((x) & 0x7) << 0) | 54 | #define VMID(x) (((x) & 0x7) << 0) |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 862b52c69882..ace45da91434 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
| @@ -1765,6 +1765,7 @@ static void si_gpu_init(struct radeon_device *rdev) | |||
| 1765 | 1765 | ||
| 1766 | WREG32(GB_ADDR_CONFIG, gb_addr_config); | 1766 | WREG32(GB_ADDR_CONFIG, gb_addr_config); |
| 1767 | WREG32(DMIF_ADDR_CONFIG, gb_addr_config); | 1767 | WREG32(DMIF_ADDR_CONFIG, gb_addr_config); |
| 1768 | WREG32(DMIF_ADDR_CALC, gb_addr_config); | ||
| 1768 | WREG32(HDP_ADDR_CONFIG, gb_addr_config); | 1769 | WREG32(HDP_ADDR_CONFIG, gb_addr_config); |
| 1769 | WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config); | 1770 | WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config); |
| 1770 | WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config); | 1771 | WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config); |
diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h index 23fc08fc8e7f..f84cff0aafcc 100644 --- a/drivers/gpu/drm/radeon/sid.h +++ b/drivers/gpu/drm/radeon/sid.h | |||
| @@ -65,6 +65,8 @@ | |||
| 65 | 65 | ||
| 66 | #define DMIF_ADDR_CONFIG 0xBD4 | 66 | #define DMIF_ADDR_CONFIG 0xBD4 |
| 67 | 67 | ||
| 68 | #define DMIF_ADDR_CALC 0xC00 | ||
| 69 | |||
| 68 | #define SRBM_STATUS 0xE50 | 70 | #define SRBM_STATUS 0xE50 |
| 69 | #define GRBM_RQ_PENDING (1 << 5) | 71 | #define GRBM_RQ_PENDING (1 << 5) |
| 70 | #define VMC_BUSY (1 << 8) | 72 | #define VMC_BUSY (1 << 8) |