diff options
| author |   Christian König <christian.koenig@amd.com> | 2017-04-11 19:20:20 +0200 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2017-04-28 17:32:22 -0400 |
| commit | 8f12bbe6d94a51f3ae314c27cc7b9b315adfe383 (patch) | |
| tree | d92b843f05c0b32dc30e48cedf198c565486a025 /drivers/gpu/drm/radeon/radeon_cs.c | |
| parent | drm/amdgpu: bump version number to note race fix and new fence functionality (diff) | |
| download | linux-dev-8f12bbe6d94a51f3ae314c27cc7b9b315adfe383.tar.xz linux-dev-8f12bbe6d94a51f3ae314c27cc7b9b315adfe383.zip | |
drm/radeon: force the UVD DPB into VRAM as well
Seems to be mandatory for WMV playback.
Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=100510
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_cs.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index df6b58c08544..3ac671f6c8e1 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -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 || pci_find_capability(p->rdev->ddev->pdev, + (i <= 0 || pci_find_capability(p->rdev->ddev->pdev, PCI_CAP_ID_AGP) || p->rdev->family == CHIP_RS780 || p->rdev->family == CHIP_RS880)) { |