xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2013-11-18 09:00:59 +01:00
parent 7a495cfd9b
commit 1d37b689b1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/intel_display.c
View File

@@ -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,7 +10912,6 @@ 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;