Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index a56084410372..66c222836631 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -28,6 +28,7 @@
 #include <drm/radeon_drm.h>
 #include "radeon_reg.h"
 #include "radeon.h"
+#include "radeon_trace.h"
 
 static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
 {
@@ -80,10 +81,13 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                 p->relocs[i].lobj.bo = p->relocs[i].robj;
                 p->relocs[i].lobj.written = !!r->write_domain;
 
-                /* the first reloc of an UVD job is the
-                   msg and that must be in VRAM */
-                if (p->ring == R600_RING_TYPE_UVD_INDEX && i == 0) {
-                        /* TODO: is this still needed for NI+ ? */
+                /* the first reloc of an UVD job is the msg and that must be in
+                   VRAM, also but everything into VRAM on AGP cards to avoid
+                   image corruptions */
+                if (p->ring == R600_RING_TYPE_UVD_INDEX &&
+                    p->rdev->family < CHIP_PALM &&
+                    (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
+
                         p->relocs[i].lobj.domain =
                                 RADEON_GEM_DOMAIN_VRAM;
 
@@ -559,6 +563,8 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
                 return r;
         }
 
+        trace_radeon_cs(&parser);
+
         r = radeon_cs_ib_chunk(rdev, &parser);
         if (r) {
                 goto out;