if the crtc has audio is enabled. Otherwise, when the first atomic modeset happens it will warn when trying to drop the audio power domain.
Signed-off-by: Bob Paauwe <[email protected]> --- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5155efb6..caeb3e1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10561,6 +10561,7 @@ found: } ret = intel_modeset_setup_plane_state(state, crtc, mode, fb, 0, 0); + if (ret) goto fail; @@ -15998,6 +15999,10 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) memset(&crtc->base.mode, 0, sizeof(crtc->base.mode)); if (crtc->base.state->active) { + if (crtc->config->has_audio) + intel_display_power_get(dev_priv, + POWER_DOMAIN_AUDIO); + intel_mode_from_pipe_config(&crtc->base.mode, crtc->config); intel_mode_from_pipe_config(&crtc->base.state->adjusted_mode, crtc->config); WARN_ON(drm_atomic_set_mode_for_crtc(crtc->base.state, &crtc->base.mode)); -- 2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
