From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Christian_K=F6nig?= Subject: Re: [PATCH] drm/radeon: make audio_init consistent across asics Date: Tue, 05 Jun 2012 12:02:40 +0200 Message-ID: <4FCDD940.9070508@vodafone.de> References: <1338844731-23759-1-git-send-email-alexdeucher@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de [139.7.28.128]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D4919E9DD for ; Tue, 5 Jun 2012 03:02:57 -0700 (PDT) In-Reply-To: <1338844731-23759-1-git-send-email-alexdeucher@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: alexdeucher@gmail.com Cc: Alex Deucher , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On 04.06.2012 23:18, alexdeucher@gmail.com wrote: > From: Alex Deucher > > Call it in the asic startup callback on all asics. > Previously r600 and rv770 called it in the startup > and resume callbacks while all the other asics called > it in the startup callback. > > Signed-off-by: Alex Deucher Reviewed-by: Christian K=F6nig > --- > drivers/gpu/drm/radeon/r600.c | 15 ++++++--------- > drivers/gpu/drm/radeon/rs600.c | 12 ++++++------ > drivers/gpu/drm/radeon/rs690.c | 12 ++++++------ > drivers/gpu/drm/radeon/rv770.c | 18 ++++++------------ > 4 files changed, 24 insertions(+), 33 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c > index 09e33b3..a5dd221 100644 > --- a/drivers/gpu/drm/radeon/r600.c > +++ b/drivers/gpu/drm/radeon/r600.c > @@ -2410,6 +2410,12 @@ int r600_startup(struct radeon_device *rdev) > if (r) > return r; > > + r =3D r600_audio_init(rdev); > + if (r) { > + DRM_ERROR("radeon: audio init failed\n"); > + return r; > + } > + > return 0; > } > > @@ -2446,12 +2452,6 @@ int r600_resume(struct radeon_device *rdev) > return r; > } > > - r =3D r600_audio_init(rdev); > - if (r) { > - DRM_ERROR("radeon: audio resume failed\n"); > - return r; > - } > - > return r; > } > > @@ -2561,9 +2561,6 @@ int r600_init(struct radeon_device *rdev) > rdev->accel_working =3D false; > } > > - r =3D r600_audio_init(rdev); > - if (r) > - return r; /* TODO error handling */ > return 0; > } > > diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs60= 0.c > index e6c2e96..e11bc46 100644 > --- a/drivers/gpu/drm/radeon/rs600.c > +++ b/drivers/gpu/drm/radeon/rs600.c > @@ -907,12 +907,6 @@ static int rs600_startup(struct radeon_device *rdev) > return r; > } > > - r =3D r600_audio_init(rdev); > - if (r) { > - dev_err(rdev->dev, "failed initializing audio\n"); > - return r; > - } > - > r =3D radeon_ib_pool_start(rdev); > if (r) > return r; > @@ -921,6 +915,12 @@ static int rs600_startup(struct radeon_device *rdev) > if (r) > return r; > > + r =3D r600_audio_init(rdev); > + if (r) { > + dev_err(rdev->dev, "failed initializing audio\n"); > + return r; > + } > + > return 0; > } > > diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs69= 0.c > index 3277dde..159b6a4 100644 > --- a/drivers/gpu/drm/radeon/rs690.c > +++ b/drivers/gpu/drm/radeon/rs690.c > @@ -637,12 +637,6 @@ static int rs690_startup(struct radeon_device *rdev) > return r; > } > > - r =3D r600_audio_init(rdev); > - if (r) { > - dev_err(rdev->dev, "failed initializing audio\n"); > - return r; > - } > - > r =3D radeon_ib_pool_start(rdev); > if (r) > return r; > @@ -651,6 +645,12 @@ static int rs690_startup(struct radeon_device *rdev) > if (r) > return r; > > + r =3D r600_audio_init(rdev); > + if (r) { > + dev_err(rdev->dev, "failed initializing audio\n"); > + return r; > + } > + > return 0; > } > > diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv77= 0.c > index 04ddc36..4ad0281 100644 > --- a/drivers/gpu/drm/radeon/rv770.c > +++ b/drivers/gpu/drm/radeon/rv770.c > @@ -956,6 +956,12 @@ static int rv770_startup(struct radeon_device *rdev) > if (r) > return r; > > + r =3D r600_audio_init(rdev); > + if (r) { > + DRM_ERROR("radeon: audio init failed\n"); > + return r; > + } > + > return 0; > } > > @@ -978,12 +984,6 @@ int rv770_resume(struct radeon_device *rdev) > return r; > } > > - r =3D r600_audio_init(rdev); > - if (r) { > - dev_err(rdev->dev, "radeon: audio init failed\n"); > - return r; > - } > - > return r; > > } > @@ -1092,12 +1092,6 @@ int rv770_init(struct radeon_device *rdev) > rdev->accel_working =3D false; > } > > - r =3D r600_audio_init(rdev); > - if (r) { > - dev_err(rdev->dev, "radeon: audio init failed\n"); > - return r; > - } > - > return 0; > } >