From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?windows-1252?Q?Christian_K=F6nig?= Subject: Re: [PATCH] drm/radeon: 760G/780V/880V don't have UVD Date: Tue, 26 Aug 2014 19:36:19 +0200 Message-ID: <53FCC593.80200@vodafone.de> References: <1409073157-13019-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DEED89C96 for ; Tue, 26 Aug 2014 10:36:54 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix2 Daemon) with ESMTP id 854E276862E for ; Tue, 26 Aug 2014 19:36:53 +0200 (CEST) Received: from pegasos-out.vodafone.de ([127.0.0.1]) by localhost (rohrpostix2.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KwYHlsaZdLTD for ; Tue, 26 Aug 2014 19:36:32 +0200 (CEST) In-Reply-To: <1409073157-13019-1-git-send-email-alexander.deucher@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Alex Deucher , dri-devel@lists.freedesktop.org Cc: Alex Deucher List-Id: dri-devel@lists.freedesktop.org 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 Reviewed-by: Christian K=F6nig > --- > 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 *rde= v) > return r; > } > = > - r =3D uvd_v1_0_resume(rdev); > - if (!r) { > - r =3D 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 =3D uvd_v1_0_resume(rdev); > + if (!r) { > + r =3D 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 =3D 0; > + if (r) > + rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_size =3D 0; > } > = > /* Enable IRQ */ > @@ -3030,14 +3031,16 @@ static int r600_startup(struct radeon_device *rde= v) > if (r) > return r; > = > - ring =3D &rdev->ring[R600_RING_TYPE_UVD_INDEX]; > - if (ring->ring_size) { > - r =3D radeon_ring_init(rdev, ring, ring->ring_size, 0, > - RADEON_CP_PACKET2); > - if (!r) > - r =3D uvd_v1_0_init(rdev); > - if (r) > - DRM_ERROR("radeon: failed initializing UVD (%d).\n", r); > + if (rdev->has_uvd) { > + ring =3D &rdev->ring[R600_RING_TYPE_UVD_INDEX]; > + if (ring->ring_size) { > + r =3D radeon_ring_init(rdev, ring, ring->ring_size, 0, > + RADEON_CP_PACKET2); > + if (!r) > + r =3D uvd_v1_0_init(rdev); > + if (r) > + DRM_ERROR("radeon: failed initializing UVD (%d).\n", r); > + } > } > = > r =3D 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 =3D NULL; > r600_ring_init(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1= 024); > = > - r =3D radeon_uvd_init(rdev); > - if (!r) { > - rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_obj =3D NULL; > - r600_ring_init(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX], 4096); > + if (rdev->has_uvd) { > + r =3D radeon_uvd_init(rdev); > + if (!r) { > + rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_obj =3D NULL; > + r600_ring_init(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX], 4096); > + } > } > = > rdev->ih.ring_obj =3D 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/radeo= n/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 =3D &rs780_asic; > - rdev->has_uvd =3D true; > + /* 760G/780V/880V don't have UVD */ > + if ((rdev->pdev->device =3D=3D 0x9616)|| > + (rdev->pdev->device =3D=3D 0x9611)|| > + (rdev->pdev->device =3D=3D 0x9613)|| > + (rdev->pdev->device =3D=3D 0x9711)|| > + (rdev->pdev->device =3D=3D 0x9713)) > + rdev->has_uvd =3D false; > + else > + rdev->has_uvd =3D true; > break; > case CHIP_RV770: > case CHIP_RV730: