diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-02-02 12:37:41 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 15:15:15 -0800 |
| commit | 9946bb87f3b9766f7d19515af6009cf8dd221fd1 (patch) | |
| tree | ba1b5a57ae6abcda99dacf4897c387fbeaebfae7 | |
| parent | 40219cd8c93ccf10dee7bd9e3aa31bd469fd44d6 (diff) | |
| download | linux-stable-9946bb87f3b9766f7d19515af6009cf8dd221fd1.tar.gz linux-stable-9946bb87f3b9766f7d19515af6009cf8dd221fd1.tar.bz2 linux-stable-9946bb87f3b9766f7d19515af6009cf8dd221fd1.zip | |
drm/radeon/kms/evergreen: always set certain VGT regs at CP init
commit 18ff84da29b3f0c073e0ce6e341663cc6bcb0ab7 upstream.
These should be handled by the clear_state setup, but set them
directly as well just to be sure.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 7b337c361a12..cff593d49c36 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1135,7 +1135,7 @@ static int evergreen_cp_start(struct radeon_device *rdev) cp_me = 0xff; WREG32(CP_ME_CNTL, cp_me); - r = radeon_ring_lock(rdev, evergreen_default_size + 15); + r = radeon_ring_lock(rdev, evergreen_default_size + 19); if (r) { DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r); return r; @@ -1168,6 +1168,11 @@ static int evergreen_cp_start(struct radeon_device *rdev) radeon_ring_write(rdev, 0xffffffff); radeon_ring_write(rdev, 0xffffffff); + radeon_ring_write(rdev, 0xc0026900); + radeon_ring_write(rdev, 0x00000316); + radeon_ring_write(rdev, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */ + radeon_ring_write(rdev, 0x00000010); /* */ + radeon_ring_unlock_commit(rdev); return 0; |