Commit 1d37b689 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: encoder->get_config is no longer optional

We must have one to fill out the adjusted_mode.crtc_clock. And with
the tv encoder fixed up every encoder we have has a ->get_config
callback. So we can drop the checks.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7a495cfd
...@@ -9252,8 +9252,7 @@ check_crtc_state(struct drm_device *dev) ...@@ -9252,8 +9252,7 @@ check_crtc_state(struct drm_device *dev)
enum pipe pipe; enum pipe pipe;
if (encoder->base.crtc != &crtc->base) if (encoder->base.crtc != &crtc->base)
continue; continue;
if (encoder->get_config && if (encoder->get_hw_state(encoder, &pipe))
encoder->get_hw_state(encoder, &pipe))
encoder->get_config(encoder, &pipe_config); encoder->get_config(encoder, &pipe_config);
} }
...@@ -10913,8 +10912,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) ...@@ -10913,8 +10912,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
if (encoder->get_hw_state(encoder, &pipe)) { if (encoder->get_hw_state(encoder, &pipe)) {
crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]); crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
encoder->base.crtc = &crtc->base; encoder->base.crtc = &crtc->base;
if (encoder->get_config) encoder->get_config(encoder, &crtc->config);
encoder->get_config(encoder, &crtc->config);
} else { } else {
encoder->base.crtc = NULL; encoder->base.crtc = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment