* [PATCH] drm/radeon: make audio_init consistent across asics
@ 2012-06-04 21:18 alexdeucher
2012-06-05 7:17 ` Rafał Miłecki
2012-06-05 10:02 ` Christian König
0 siblings, 2 replies; 3+ messages in thread
From: alexdeucher @ 2012-06-04 21:18 UTC (permalink / raw)
To: airlied, dri-devel; +Cc: Alex Deucher
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>
---
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;
}
--
1.7.7.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/radeon: make audio_init consistent across asics
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
1 sibling, 0 replies; 3+ messages in thread
From: Rafał Miłecki @ 2012-06-05 7:17 UTC (permalink / raw)
To: alexdeucher; +Cc: Alex Deucher, dri-devel
2012/6/4 <alexdeucher@gmail.com>:
> 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.
Reviewed-by: Rafał Miłecki <zajec5@gmail.com>
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon: make audio_init consistent across asics
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
1 sibling, 0 replies; 3+ messages in thread
From: Christian König @ 2012-06-05 10:02 UTC (permalink / raw)
To: alexdeucher; +Cc: Alex Deucher, dri-devel
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;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-05 10:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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.