diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2013-01-21 15:50:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-03 18:24:40 -0600 |
| commit | d4ffc500fcf28db4bc6e358e318b37bb884e421b (patch) | |
| tree | 682fe25563d3e2d40df3cf0c798894266553a3bd | |
| parent | dec3b6a0b8a4b1503617c45b351aedbd63adab58 (diff) | |
| download | linux-3.10-d4ffc500fcf28db4bc6e358e318b37bb884e421b.tar.gz linux-3.10-d4ffc500fcf28db4bc6e358e318b37bb884e421b.tar.bz2 linux-3.10-d4ffc500fcf28db4bc6e358e318b37bb884e421b.zip | |
drm/radeon: fix cursor corruption on DCE6 and newer
commit e521a29014794d139cca46396d1af8faf1295a26 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 711e95ad39b..8fb6f41bd1f 100644 --- a/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/drivers/gpu/drm/radeon/radeon_cursor.c @@ -238,7 +238,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; |