From: Alex Deucher Date: Mon, 16 Sep 2013 03:23:07 +0000 (-0400) Subject: drm/radeon: avoid UVD corruption on AGP cards using GPU gart X-Git-Tag: v3.12-rc3~7^2~1^2~17 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ca5a6cba53e13b8fd153b0762b4128fab6a3cfb;p=karo-tx-linux.git 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 Reviewed-by: Christian König Tested-by: Dieter Nützel Cc: stable@vger.kernel.org --- diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index ac6ece61a476..80285e35bc65 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;