diff options
author | Dave Airlie <airlied@redhat.com> | 2011-05-19 00:14:42 -0400 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2011-05-22 06:25:27 -0400 |
commit | 0b65f83f9d2fab47b9b6040fe75fc2cfc73032d4 (patch) | |
tree | 0b1bed04eafc415a9f0b7068c39609af78a6d2eb /drivers | |
parent | f25a5c63bfa017498c9adecb24d649ae96ba5c68 (diff) |
drm/radeon/cayman: setup hdp to invalidate and flush when asked
On cayman we need to set the bit to cause HDP flushes to invalidate the
HDP cache also.
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/nid.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 7aade20f63a8..57d3d6c208d8 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -931,6 +931,10 @@ static void cayman_gpu_init(struct radeon_device *rdev) | |||
931 | WREG32(CB_PERF_CTR3_SEL_0, 0); | 931 | WREG32(CB_PERF_CTR3_SEL_0, 0); |
932 | WREG32(CB_PERF_CTR3_SEL_1, 0); | 932 | WREG32(CB_PERF_CTR3_SEL_1, 0); |
933 | 933 | ||
934 | tmp = RREG32(HDP_MISC_CNTL); | ||
935 | tmp |= HDP_FLUSH_INVALIDATE_CACHE; | ||
936 | WREG32(HDP_MISC_CNTL, tmp); | ||
937 | |||
934 | hdp_host_path_cntl = RREG32(HDP_HOST_PATH_CNTL); | 938 | hdp_host_path_cntl = RREG32(HDP_HOST_PATH_CNTL); |
935 | WREG32(HDP_HOST_PATH_CNTL, hdp_host_path_cntl); | 939 | WREG32(HDP_HOST_PATH_CNTL, hdp_host_path_cntl); |
936 | 940 | ||
diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h index 0f9a08b53fbd..b2088c1981d8 100644 --- a/drivers/gpu/drm/radeon/nid.h +++ b/drivers/gpu/drm/radeon/nid.h | |||
@@ -136,6 +136,8 @@ | |||
136 | #define HDP_NONSURFACE_INFO 0x2C08 | 136 | #define HDP_NONSURFACE_INFO 0x2C08 |
137 | #define HDP_NONSURFACE_SIZE 0x2C0C | 137 | #define HDP_NONSURFACE_SIZE 0x2C0C |
138 | #define HDP_ADDR_CONFIG 0x2F48 | 138 | #define HDP_ADDR_CONFIG 0x2F48 |
139 | #define HDP_MISC_CNTL 0x2F4C | ||
140 | #define HDP_FLUSH_INVALIDATE_CACHE (1 << 0) | ||
139 | 141 | ||
140 | #define CC_SYS_RB_BACKEND_DISABLE 0x3F88 | 142 | #define CC_SYS_RB_BACKEND_DISABLE 0x3F88 |
141 | #define GC_USER_SYS_RB_BACKEND_DISABLE 0x3F8C | 143 | #define GC_USER_SYS_RB_BACKEND_DISABLE 0x3F8C |