evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/radeon: assign pin in detect

Browse source 
We need the pin from detect on, it's too late in dpms.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2015-02-27 10:36:39 -05:00
parent add7d75966
commit d3c34d2c73
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/radeon/radeon_audio.c
View file

@ -452,7 +452,7 @@ void radeon_audio_enable(struct radeon_device *rdev,
} }
void radeon_audio_detect(struct drm_connector *connector, void radeon_audio_detect(struct drm_connector *connector,
enum drm_connector_status status) enum drm_connector_status status)
{ {
struct radeon_device *rdev; struct radeon_device *rdev;
struct radeon_encoder *radeon_encoder; struct radeon_encoder *radeon_encoder;
@ -483,6 +483,7 @@ void radeon_audio_detect(struct drm_connector *connector,
else else
radeon_encoder->audio = rdev->audio.hdmi_funcs; radeon_encoder->audio = rdev->audio.hdmi_funcs;
dig->afmt->pin = radeon_audio_get_pin(connector->encoder);
radeon_audio_write_speaker_allocation(connector->encoder); radeon_audio_write_speaker_allocation(connector->encoder);
radeon_audio_write_sad_regs(connector->encoder); radeon_audio_write_sad_regs(connector->encoder);
if (connector->encoder->crtc) if (connector->encoder->crtc)
@ -491,6 +492,7 @@ void radeon_audio_detect(struct drm_connector *connector,
radeon_audio_enable(rdev, dig->afmt->pin, 0xf); radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
} else { } else {
radeon_audio_enable(rdev, dig->afmt->pin, 0); radeon_audio_enable(rdev, dig->afmt->pin, 0);
dig->afmt->pin = NULL;
} }
} }
@ -704,7 +706,6 @@ static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
return; return;
/* disable audio prior to setting up hw */ /* disable audio prior to setting up hw */
dig->afmt->pin = radeon_audio_get_pin(encoder);
radeon_audio_enable(rdev, dig->afmt->pin, 0); radeon_audio_enable(rdev, dig->afmt->pin, 0);
radeon_audio_set_dto(encoder, mode->clock); radeon_audio_set_dto(encoder, mode->clock);
@ -734,7 +735,6 @@ static void radeon_audio_dp_mode_set(struct drm_encoder *encoder,
return; return;
/* disable audio prior to setting up hw */ /* disable audio prior to setting up hw */
dig->afmt->pin = radeon_audio_get_pin(encoder);
radeon_audio_enable(rdev, dig->afmt->pin, 0); radeon_audio_enable(rdev, dig->afmt->pin, 0);
radeon_audio_set_dto(encoder, rdev->clock.default_dispclk * 10); radeon_audio_set_dto(encoder, rdev->clock.default_dispclk * 10);