summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-09-15 23:23:07 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-09-20 14:28:14 -0400
commit4ca5a6cba53e13b8fd153b0762b4128fab6a3cfb (patch)
treee3f81e02c8e37aa3ce8e4b54529e0b25dee387e5
parent6ddf2ed6e00396883b3123032ccb4416205aac7c (diff)
downloadop-kernel-dev-4ca5a6cba53e13b8fd153b0762b4128fab6a3cfb.zip
op-kernel-dev-4ca5a6cba53e13b8fd153b0762b4128fab6a3cfb.tar.gz
drm/radeon: avoid UVD corruption on AGP cards using GPU gart
If the user has forced the driver to use the internal GPU gart rather than AGP on an AGP card, force the buffers to vram as well. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/radeon/radeon_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index ac6ece6..80285e3 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -85,7 +85,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
VRAM, also but everything into VRAM on AGP cards to avoid
image corruptions */
if (p->ring == R600_RING_TYPE_UVD_INDEX &&
- (i == 0 || p->rdev->flags & RADEON_IS_AGP)) {
+ (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
/* TODO: is this still needed for NI+ ? */
p->relocs[i].lobj.domain =
RADEON_GEM_DOMAIN_VRAM;
OpenPOWER on IntegriCloud