drm/radeon: force the UVD DPB into VRAM as well
Subsystems (2)
PATCH 1/1 drm/radeon: force the UVD DPB into VRAM as well
From: Christian König <[email protected]>
Seems to be mandatory for WMV playback.
Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=100510
--- drivers/gpu/drm/radeon/radeon_cs.c | 10 ++++++---- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/radeon_cs.c +6 -4
@@ -117,11 +117,13 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) priority = (r->flags &RADEON_RELOC_PRIO_MASK ) *2 + !!r->write_domain; -/* the first reloc of an UVD job is the msg and that must be in -VRAM, also but everything into VRAM on AGP cards and older -IGP chips to avoid image corruptions */ +/* The first reloc of an UVD job is the msg and that must be in +* VRAM, the second reloc is the DPB and for WMV that must be in +* VRAM as well. Also put everything into VRAM on AGP cards and older +* IGP chips to avoid image corruptions +*/ if (p->ring ==R600_RING_TYPE_UVD_INDEX && - (i ==0 ||drm_pci_device_is_agp (p->rdev->ddev) || + (i <=1 ||drm_pci_device_is_agp (p->rdev->ddev) || p->rdev->family ==CHIP_RS780 || p->rdev->family ==CHIP_RS880 )) {
drivers/gpu/drm/radeon/radeon_uvd.c +1 -1
@@ -621,7 +621,7 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p, }/* TODO: is this still necessary on NI+ ? */ -if ((cmd ==0 || cmd ==0x3 ) && +if ((cmd ==0 || cmd ==1 || cmd ==0x3 ) && (start >>28 ) != (p->rdev->uvd.gpu_addr >>28 )) {DRM_ERROR ("msg/fb buffer %LX-%LX out of 256MB segment!\n" , start, end);
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1491931324-1358-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Acked-by Alex DeucherQuoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Tuesday, April 11, 2017 1:22 PM
To: [email protected]
Cc: [email protected]
Subject: [PATCH] drm/radeon: force the UVD DPB into VRAM as well
Quoted 7 lines
From: Christian König <[email protected]>
Seems to be mandatory for WMV playback.
Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=100510
Signed-off-by Christian König <[email protected]>
Quoted 51 lines
--- drivers/gpu/drm/radeon/radeon_cs.c | 10 ++++++---- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)drivers/gpu/drm/radeon/radeon_cs.c +0
-2@@ -117,11 +117,13 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) priority = (r->flags &RADEON_RELOC_PRIO_MASK ) *2 + !!r->write_domain; -/* the first reloc of an UVD job is the msg and that must be in -VRAM, also but everything into VRAM on AGP cards and older
drivers/gpu/drm/radeon/radeon_cs.c +2
-1-IGP chips to avoid image corruptions */ +/* The first reloc of an UVD job is the msg and that must be in +* VRAM, the second reloc is the DPB and for WMV that must be in
drivers/gpu/drm/radeon/radeon_cs.c +1
-0+* VRAM as well. Also put everything into VRAM on AGP cards and older
drivers/gpu/drm/radeon/radeon_cs.c +3
-1+* IGP chips to avoid image corruptions +*/ if (p->ring ==R600_RING_TYPE_UVD_INDEX && - (i ==0 ||drm_pci_device_is_agp (p->rdev->ddev) || + (i <=1 ||drm_pci_device_is_agp (p->rdev->ddev) || p->rdev->family ==CHIP_RS780 || p->rdev->family ==CHIP_RS880 )) {drivers/gpu/drm/radeon/radeon_uvd.c +1
-1@@ -621,7 +621,7 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p, }/* TODO: is this still necessary on NI+ ? */ -if ((cmd ==0 || cmd ==0x3 ) && +if ((cmd ==0 || cmd ==1 || cmd ==0x3 ) && (start >>28 ) != (p->rdev->uvd.gpu_addr >>28 )) { DRM_ERROR("msg/fb buffer %LX-%LX out of 256MBsegment!\n",
start, end);
--
2.5.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx