Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4e30ef0 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon: make audio_init consistent across asics 



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: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 99becf13

drivers/gpu/drm/radeon/r600.c

+6 −9
Original line number Diff line number Diff line
@@ -2426,6 +2426,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;

}
@@ -2462,12 +2468,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;

}
@@ -2577,9 +2577,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;

}

drivers/gpu/drm/radeon/rs600.c

+6 −6
Original line number Diff line number Diff line
@@ -908,12 +908,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;
@@ -922,6 +916,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;

}

drivers/gpu/drm/radeon/rs690.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/radeon/rv770.c

+6 −12
Original line number Diff line number Diff line
@@ -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;

}