drm/i915: split encoder get_config calls from crtc get_clock calls
Subsystems (2)
PATCH 1/1 drm/i915: split encoder get_config calls from crtc get_clock calls
This should help on HSW, where we don't currently have a get_clock call.
Reported-by Paulo Zanoni <[email protected]>
Signed-off-by Jesse Barnes <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +14 -10
@@ -8377,14 +8377,13 @@ check_crtc_state(struct drm_device *dev) base.head) {if (encoder->base.crtc != &crtc->base)continue ; -if (encoder->get_config && - dev_priv->display.get_clock) { +if (encoder->get_config) encoder->get_config (encoder, &pipe_config); - dev_priv->display.get_clock (crtc, - &pipe_config); - } } +if (dev_priv->display.get_clock) + dev_priv->display.get_clock (crtc, &pipe_config); +WARN (crtc->active != active,"crtc active state doesn't match with hw state " "(expected %i, found %i)\n" , crtc->active, active);
@@ -9956,12 +9955,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)if (encoder->get_hw_state (encoder, &pipe)) { crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[pipe]); encoder->base.crtc = &crtc->base; -if (encoder->get_config && - dev_priv->display.get_clock) { +if (encoder->get_config) encoder->get_config (encoder, &crtc->config); - dev_priv->display.get_clock (crtc, - &crtc->config); - } }else { encoder->base.crtc =NULL ; }
@@ -9974,6 +9969,15 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) pipe); } +list_for_each_entry (crtc, &dev->mode_config.crtc_list, + base.head) { +if (!crtc->active) +continue ; +if (dev_priv->display.get_clock) + dev_priv->display.get_clock (crtc, + &crtc->config); + } +list_for_each_entry (connector, &dev->mode_config.connector_list, base.head) {if (connector->get_hw_state (connector)) {
Signature · 1 line
1.7.9.5
Daniel Vetter
AppliedQuoted 4 lines · Jesse Barnes
This should help on HSW, where we don't currently have a
get_clockcall.Reported-by Paulo Zanoni <[email protected]>Signed-off-by Jesse Barnes <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch