From: "Christian König" <deathsimple@vodafone.de>
To: alexdeucher@gmail.com
Cc: Alex Deucher <alexander.deucher@amd.com>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/radeon: make audio_init consistent across asics
Date: Tue, 05 Jun 2012 12:02:40 +0200 [thread overview]
Message-ID: <4FCDD940.9070508@vodafone.de> (raw)
In-Reply-To: <1338844731-23759-1-git-send-email-alexdeucher@gmail.com>
On 04.06.2012 23:18, alexdeucher@gmail.com wrote:
> From: Alex Deucher<alexander.deucher@amd.com>
>
> 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<alexander.deucher@amd.com>
Reviewed-by: Christian König<christian.koenig@amd.com>
> ---
> 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 = 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 = 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 = false;
> }
>
> - r = 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/rs600.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 = r600_audio_init(rdev);
> - if (r) {
> - dev_err(rdev->dev, "failed initializing audio\n");
> - return r;
> - }
> -
> r = 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 = 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/rs690.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 = r600_audio_init(rdev);
> - if (r) {
> - dev_err(rdev->dev, "failed initializing audio\n");
> - return r;
> - }
> -
> r = 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 = 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/rv770.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 = 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 = 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 = false;
> }
>
> - r = r600_audio_init(rdev);
> - if (r) {
> - dev_err(rdev->dev, "radeon: audio init failed\n");
> - return r;
> - }
> -
> return 0;
> }
>
prev parent reply other threads:[~2012-06-05 10:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-04 21:18 [PATCH] drm/radeon: make audio_init consistent across asics alexdeucher
2012-06-05 7:17 ` Rafał Miłecki
2012-06-05 10:02 ` Christian König [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FCDD940.9070508@vodafone.de \
--to=deathsimple@vodafone.de \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.