Am 26.08.2014 um 19:12 schrieb Alex Deucher:
> Don't enable UVD on these asics as they don't have
> UVD hardware.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Christian K?nig <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/radeon/r600.c | 57
> +++++++++++++++++++++---------------
> drivers/gpu/drm/radeon/radeon_asic.c | 10 ++++++-
> 2 files changed, 42 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index e79d3f8..afbdd08 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2991,15 +2991,16 @@ static int r600_startup(struct radeon_device *rdev)
> return r;
> }
>
> - r = uvd_v1_0_resume(rdev);
> - if (!r) {
> - r = radeon_fence_driver_start_ring(rdev,
> R600_RING_TYPE_UVD_INDEX);
> - if (r) {
> - dev_err(rdev->dev, "failed initializing UVD fences
> (%d).\n", r);
> + if (rdev->has_uvd) {
> + r = uvd_v1_0_resume(rdev);
> + if (!r) {
> + r = radeon_fence_driver_start_ring(rdev,
> R600_RING_TYPE_UVD_INDEX);
> + if (r) {
> + dev_err(rdev->dev, "failed initializing UVD
> fences (%d).\n", r);
> + }
> }
> - }
> - if (r) {
> - rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_size = 0;
> + if (r)
> + rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_size = 0;
> }
>
> /* Enable IRQ */
> @@ -3030,14 +3031,16 @@ static int r600_startup(struct radeon_device *rdev)
> if (r)
> return r;
>
> - ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
> - if (ring->ring_size) {
> - r = radeon_ring_init(rdev, ring, ring->ring_size, 0,
> - RADEON_CP_PACKET2);
> - if (!r)
> - r = uvd_v1_0_init(rdev);
> - if (r)
> - DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);
> + if (rdev->has_uvd) {
> + ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
> + if (ring->ring_size) {
> + r = radeon_ring_init(rdev, ring, ring->ring_size, 0,
> + RADEON_CP_PACKET2);
> + if (!r)
> + r = uvd_v1_0_init(rdev);
> + if (r)
> + DRM_ERROR("radeon: failed initializing UVD
> (%d).\n", r);
> + }
> }
>
> r = radeon_ib_pool_init(rdev);
> @@ -3099,8 +3102,10 @@ int r600_suspend(struct radeon_device *rdev)
> radeon_pm_suspend(rdev);
> r600_audio_fini(rdev);
> r600_cp_stop(rdev);
> - uvd_v1_0_fini(rdev);
> - radeon_uvd_suspend(rdev);
> + if (rdev->has_uvd) {
> + uvd_v1_0_fini(rdev);
> + radeon_uvd_suspend(rdev);
> + }
> r600_irq_suspend(rdev);
> radeon_wb_disable(rdev);
> r600_pcie_gart_disable(rdev);
> @@ -3180,10 +3185,12 @@ int r600_init(struct radeon_device *rdev)
> rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;
> r600_ring_init(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX], 1024 *
> 1024);
>
> - r = radeon_uvd_init(rdev);
> - if (!r) {
> - rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_obj = NULL;
> - r600_ring_init(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX],
> 4096);
> + if (rdev->has_uvd) {
> + r = radeon_uvd_init(rdev);
> + if (!r) {
> + rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_obj = NULL;
> + r600_ring_init(rdev,
> &rdev->ring[R600_RING_TYPE_UVD_INDEX], 4096);
> + }
> }
>
> rdev->ih.ring_obj = NULL;
> @@ -3215,8 +3222,10 @@ void r600_fini(struct radeon_device *rdev)
> r600_audio_fini(rdev);
> r600_cp_fini(rdev);
> r600_irq_fini(rdev);
> - uvd_v1_0_fini(rdev);
> - radeon_uvd_fini(rdev);
> + if (rdev->has_uvd) {
> + uvd_v1_0_fini(rdev);
> + radeon_uvd_fini(rdev);
> + }
> radeon_wb_fini(rdev);
> radeon_ib_pool_fini(rdev);
> radeon_irq_kms_fini(rdev);
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.c
> b/drivers/gpu/drm/radeon/radeon_asic.c
> index 9e6699a..d91f965 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.c
> +++ b/drivers/gpu/drm/radeon/radeon_asic.c
> @@ -2313,7 +2313,15 @@ int radeon_asic_init(struct radeon_device *rdev)
> case CHIP_RS780:
> case CHIP_RS880:
> rdev->asic = &rs780_asic;
> - rdev->has_uvd = true;
> + /* 760G/780V/880V don't have UVD */
> + if ((rdev->pdev->device == 0x9616)||
> + (rdev->pdev->device == 0x9611)||
> + (rdev->pdev->device == 0x9613)||
> + (rdev->pdev->device == 0x9711)||
> + (rdev->pdev->device == 0x9713))
> + rdev->has_uvd = false;
> + else
> + rdev->has_uvd = true;
> break;
> case CHIP_RV770:
> case CHIP_RV730:
