Patch "drm/radeon: clean up radeon_audio_enable" has been added to the 4.1-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/radeon: clean up radeon_audio_enable
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-clean-up-radeon_audio_enable.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
010621936103fcfc15375ccdc92c0f583923d489Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Mon, 18 May 2015 11:11:48 -0400
Subject: drm/radeon: clean up radeon_audio_enable
From: Alex Deucher <[email protected]>
commit 010621936103fcfc15375ccdc92c0f583923d489 upstream.
- make it static
- fix mask/bool handling for last param
--- drivers/gpu/drm/radeon/radeon_audio.c | 18 +++++++++--------- drivers/gpu/drm/radeon/radeon_audio.h | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/gpu/drm/radeon/radeon_audio.c +9 -9
@@ -242,6 +242,13 @@ static struct radeon_audio_funcs dce6_dp .dpms = evergreen_dp_enable, }; +static void radeon_audio_enable (struct radeon_device *rdev, +struct r600_audio_pin *pin,u8 enable_mask) +{ +if (rdev->audio.funcs->enable) + rdev->audio.funcs->enable (rdev, pin, enable_mask); +} +static void radeon_audio_interface_init (struct radeon_device *rdev) {if (ASIC_IS_DCE6 (rdev)) {
@@ -307,7 +314,7 @@ int radeon_audio_init(struct radeon_devi/* disable audio. it will be set up later */ for (i =0 ; i < rdev->audio.num_pins; i++) -radeon_audio_enable (rdev, &rdev->audio.pin[i], false); +radeon_audio_enable (rdev, &rdev->audio.pin[i],0 );return 0 ; }
@@ -443,13 +450,6 @@ static void radeon_audio_select_pin(stru radeon_encoder->audio->select_pin (encoder); } -void radeon_audio_enable (struct radeon_device *rdev, -struct r600_audio_pin *pin,u8 enable_mask) -{ -if (rdev->audio.funcs->enable) - rdev->audio.funcs->enable (rdev, pin, enable_mask); -} -void radeon_audio_detect (struct drm_connector *connector,enum drm_connector_status status) {
@@ -502,7 +502,7 @@ void radeon_audio_fini(struct radeon_devreturn ;for (i =0 ; i < rdev->audio.num_pins; i++) -radeon_audio_enable (rdev, &rdev->audio.pin[i], false); +radeon_audio_enable (rdev, &rdev->audio.pin[i],0 ); rdev->audio.enabled = false; }
drivers/gpu/drm/radeon/radeon_audio.h +0 -2
@@ -74,8 +74,6 @@ u32 radeon_audio_endpoint_rreg(struct ravoid radeon_audio_endpoint_wreg (struct radeon_device *rdev,u32 offset,u32 reg,u32 v);struct r600_audio_pin *radeon_audio_get_pin (struct drm_encoder *encoder); -void radeon_audio_enable (struct radeon_device *rdev, -struct r600_audio_pin *pin,u8 enable_mask);void radeon_audio_fini (struct radeon_device *rdev);void radeon_audio_mode_set (struct drm_encoder *encoder,struct drm_display_mode *mode);
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/drm-radeon-handle-irqs-only-based-on-irq-ring-not-irq-status-regs.patch queue-4.1/drm-radeon-fix-hdp-flushing.patch queue-4.1/drm-radeon-fix-user-ptr-race-condition.patch queue-4.1/drm-radeon-add-a-dpm-quirk-for-sapphire-radeon-r9-270x-2gb-gddr5.patch queue-4.1/drm-radeon-compute-ring-fix-hibernation-ci-gpu-family-v2.patch queue-4.1/drm-radeon-only-check-the-sink-type-on-dp-connectors.patch queue-4.1/drm-radeon-clean-up-reference-counting-and-pinning-of-the-cursor-bos.patch queue-4.1/drm-radeon-unpin-cursor-bos-on-suspend-and-pin-them-again-on-resume-v2.patch queue-4.1/drm-radeon-ci-silence-a-harmless-pcc-warning.patch queue-4.1/drm-radeon-sdma-fix-hibernation-ci-gpu-family.patch queue-4.1/drm-radeon-clean-up-radeon_audio_enable.patch queue-4.1/revert-drm-radeon-dont-switch-vt-on-suspend.patch queue-4.1/drm-radeon-take-the-mode_config-mutex-when-dealing-with-hpds-v2.patch queue-4.1/drm-radeon-don-t-flush-the-gart-tlb-if-rdev-gart.ptr-null.patch