diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-05-08 19:16:58 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-05-08 19:16:58 +0300 |
| commit | 9b61b2069681b60d0d0bedbd0fe3c70123dddb19 (patch) | |
| tree | 483407944dd3037584b8825e0d33feb7f4eddf5f /drivers/gpu/drm/i915/display/intel_sdvo.c | |
| parent | b9112b17950c955071abfd4331d4daa162d6ec4d (diff) | |
| parent | 2ff85dc64df5bc0ff12e2f4e23fae7bbadbf1d5d (diff) | |
| download | linux-9b61b2069681b60d0d0bedbd0fe3c70123dddb19.tar.xz | |
Merge branch 'topic/hda-config-pm-cleanup' into for-next
Pull HD-audio CONFIG_PM cleanup.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sdvo.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c index 5f9e748adc89..0cd9c183f621 100644 --- a/drivers/gpu/drm/i915/display/intel_sdvo.c +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c @@ -1842,8 +1842,6 @@ static void intel_disable_sdvo(struct intel_atomic_state *state, struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc); u32 temp; - encoder->audio_disable(encoder, old_crtc_state, conn_state); - intel_sdvo_set_active_outputs(intel_sdvo, 0); if (0) intel_sdvo_set_encoder_power_state(intel_sdvo, @@ -1935,8 +1933,6 @@ static void intel_enable_sdvo(struct intel_atomic_state *state, intel_sdvo_set_encoder_power_state(intel_sdvo, DRM_MODE_DPMS_ON); intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo_connector->output_flag); - - encoder->audio_enable(encoder, pipe_config, conn_state); } static enum drm_mode_status |