diff options
| author |   Jerome Glisse <jglisse@redhat.com> | 2013-01-21 15:50:03 -0500 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2013-01-23 13:51:43 -0500 |
| commit | e521a29014794d139cca46396d1af8faf1295a26 (patch) | |
| tree | 1b0ededea1a4cde9b927daca2b8f84cae3ace076 /drivers/gpu/drm/radeon/radeon_cursor.c | |
| parent | ttm: on move memory failure don't leave a node dangling (diff) | |
| download | linux-dev-e521a29014794d139cca46396d1af8faf1295a26.tar.xz linux-dev-e521a29014794d139cca46396d1af8faf1295a26.zip | |
drm/radeon: fix cursor corruption on DCE6 and newer
Aruba and newer gpu does not need the avivo cursor work around,
quite the opposite this work around lead to corruption.
agd5f: check DCE6 rather than ARUBA since the issue is DCE
version specific rather than family specific.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_cursor.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cursor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c index ad6df625e8b8..0d67674b64b1 100644 --- a/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/drivers/gpu/drm/radeon/radeon_cursor.c @@ -241,7 +241,8 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, y = 0; } - if (ASIC_IS_AVIVO(rdev)) { + /* fixed on DCE6 and newer */ + if (ASIC_IS_AVIVO(rdev) && !ASIC_IS_DCE6(rdev)) { int i = 0; struct drm_crtc *crtc_p; |