Patch "drm/radeon: drop dce6_dp_enable" has been added to the 4.0-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/radeon: drop dce6_dp_enable
to the 4.0-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-drop-dce6_dp_enable.patch
and it can be found in the queue-4.0 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
12428327bbd1180b5d8ef83fdf9482b878d0502aMon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 31 Mar 2015 11:38:48 -0400
Subject: drm/radeon: drop dce6_dp_enable
From: Alex Deucher <[email protected]>
commit 12428327bbd1180b5d8ef83fdf9482b878d0502a upstream.
It's mostly duplicated with evergreen_dp_enable. This is a prerequisite for fix implemented in another patch.
--- drivers/gpu/drm/radeon/dce6_afmt.c | 25 ------------------------- drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon_audio.c | 3 +-- 3 files changed, 2 insertions(+), 28 deletions(-)
drivers/gpu/drm/radeon/dce6_afmt.c +0 -25
@@ -295,28 +295,3 @@ void dce6_dp_audio_set_dto(struct radeonWREG32 (DCCG_AUDIO_DTO1_MODULE , clock); } } - -void dce6_dp_enable (struct drm_encoder *encoder,bool enable) -{ -struct drm_device *dev = encoder->dev; -struct radeon_device *rdev = dev->dev_private; -struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder); -struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; - -if (!dig || !dig->afmt) -return ; - -if (enable) { -WREG32 (EVERGREEN_DP_SEC_TIMESTAMP + dig->afmt->offset, -EVERGREEN_DP_SEC_TIMESTAMP_MODE (1 )); -WREG32 (EVERGREEN_DP_SEC_CNTL + dig->afmt->offset, -EVERGREEN_DP_SEC_ASP_ENABLE |/* Audio packet transmission */ -EVERGREEN_DP_SEC_ATP_ENABLE |/* Audio timestamp packet transmission */ -EVERGREEN_DP_SEC_AIP_ENABLE |/* Audio infoframe packet transmission */ -EVERGREEN_DP_SEC_STREAM_ENABLE );/* Master enable for secondary stream engine */ - }else { -WREG32 (EVERGREEN_DP_SEC_CNTL + dig->afmt->offset,0 ); - } - - dig->afmt->enabled = enable; -}
drivers/gpu/drm/radeon/evergreen_hdmi.c +1 -1
@@ -437,7 +437,7 @@ void evergreen_dp_enable(struct drm_encoWREG32 (EVERGREEN_DP_SEC_TIMESTAMP + dig->afmt->offset,EVERGREEN_DP_SEC_TIMESTAMP_MODE (1 )); -if (radeon_connector->con_priv) { +if (!ASIC_IS_DCE6 (rdev) && radeon_connector->con_priv) { dig_connector = radeon_connector->con_priv; val =RREG32 (EVERGREEN_DP_SEC_AUD_N + dig->afmt->offset); val &= ~EVERGREEN_DP_SEC_N_BASE_MULTIPLE (0xf );
drivers/gpu/drm/radeon/radeon_audio.c +1 -2
@@ -102,7 +102,6 @@ static void radeon_audio_dp_mode_set(strvoid r600_hdmi_enable (struct drm_encoder *encoder,bool enable);void evergreen_hdmi_enable (struct drm_encoder *encoder,bool enable);void evergreen_dp_enable (struct drm_encoder *encoder,bool enable); -void dce6_dp_enable (struct drm_encoder *encoder,bool enable);static const u32 pin_offsets[7 ] = {
@@ -240,7 +239,7 @@ static struct radeon_audio_funcs dce6_dp .set_avi_packet = evergreen_set_avi_packet, .set_audio_packet = dce4_set_audio_packet, .mode_set = radeon_audio_dp_mode_set, - .dpms = dce6_dp_enable, + .dpms = evergreen_dp_enable, };static void radeon_audio_interface_init (struct radeon_device *rdev)
Patches currently in stable-queue which might be from [email protected] are
queue-4.0/drm-radeon-fix-lockup-when-bos-aren-t-part-of-the-vm-on-release.patch queue-4.0/drm-radeon-reset-bos-address-after-clearing-it.patch queue-4.0/drm-radeon-adjust-pll-when-audio-is-not-enabled.patch queue-4.0/drm-radeon-add-si-dpm-quirk-for-sapphire-r9-270-dual-x-2g-gddr5.patch queue-4.0/drm-radeon-only-enable-audio-streams-if-the-monitor-supports-it.patch queue-4.0/drm-radeon-only-mark-audio-as-connected-if-the-monitor-supports-it-v3.patch queue-4.0/drm-radeon-drop-dce6_dp_enable.patch queue-4.0/drm-radeon-audio-don-t-enable-packets-until-the-end.patch queue-4.0/drm-radeon-check-new-address-before-removing-old-one.patch queue-4.0/drm-radeon-fix-ordering-of-avi-packet-setup.patch queue-4.0/drm-radeon-use-drm_calloc_ab-for-cs-relocs.patch