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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=1d37b689b1c07c01101534e55ffcd43f69069355
Commit:     1d37b689b1c07c01101534e55ffcd43f69069355
Parent:     7a495cfd9b5f82c40608f26fe523dc9e8533dc14
Author:     Daniel Vetter <daniel.vetter at ffwll.ch>
AuthorDate: Mon Nov 18 09:00:59 2013 +0100
Committer:  Daniel Vetter <daniel.vetter at ffwll.ch>
CommitDate: Mon Nov 18 22:24:49 2013 +0100

    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 at linux.intel.com>
    Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 drivers/gpu/drm/i915/intel_display.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c9882e8..de6edd0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9252,8 +9252,7 @@ check_crtc_state(struct drm_device *dev)
 			enum pipe pipe;
 			if (encoder->base.crtc != &crtc->base)
 				continue;
-			if (encoder->get_config &&
-			    encoder->get_hw_state(encoder, &pipe))
+			if (encoder->get_hw_state(encoder, &pipe))
 				encoder->get_config(encoder, &pipe_config);
 		}
 
@@ -10913,8 +10912,7 @@ 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)
-				encoder->get_config(encoder, &crtc->config);
+			encoder->get_config(encoder, &crtc->config);
 		} else {
 			encoder->base.crtc = NULL;
 		}