summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/si.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-08-06 11:39:38 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-08-30 16:30:34 -0400
commit5e884f606cdba9c599c9c9373808f272ae794088 (patch)
tree37ff80e016bf2b79d91bd4be289dcceab9691e93 /drivers/gpu/drm/radeon/si.c
parent9e9d976205626c3bd92776181cde6a2dda648c2b (diff)
downloadblackbird-op-linux-5e884f606cdba9c599c9c9373808f272ae794088.tar.gz
blackbird-op-linux-5e884f606cdba9c599c9c9373808f272ae794088.zip
drm/radeon: restructure UVD code to handle UVD PG (v2)
When we PG (powergate) UVD, we need to re-initialize it before we can use it again. v2: rebase on UVD stop fixes Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
-rw-r--r--drivers/gpu/drm/radeon/si.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 4f91e1f4d814..da23ce8f4388 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -6421,7 +6421,7 @@ static int si_startup(struct radeon_device *rdev)
UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR,
0, 0xfffff, RADEON_CP_PACKET2);
if (!r)
- r = r600_uvd_init(rdev);
+ r = r600_uvd_init(rdev, true);
if (r)
DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);
}
OpenPOWER on IntegriCloud