Re: [PATCH] drm/radeon: make audio_init consistent across asics

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 04.06.2012 23:18, alexdeucher@xxxxxxxxx wrote:
From: Alex Deucher<alexander.deucher@xxxxxxx>

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@xxxxxxx>
Reviewed-by: Christian König<christian.koenig@xxxxxxx>

---
  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;
  }


_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel



[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux