drm/i915/tv: add ->get_config callback

[Linux-MTD Mailing List]

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

    drm/i915/tv: add ->get_config callback
    
    We need this to properly fill in adjusted_mode.crtc_clock, otherwise
    the state checker gets unhappy. This seems to have been forgotten in
    the big clock rework in
    
    commit 18442d08786472c63a0a80c27f92b033dffc26de
    Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
    Date:   Fri Sep 13 16:00:08 2013 +0300
    
        drm/i915: Fix port_clock and adjusted_mode.clock readout all over
    
    Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
    Cc: Jani Nikula <jani.nikula at 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_tv.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 18c4062..22cf0f4 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -902,6 +902,13 @@ intel_tv_mode_valid(struct drm_connector *connector,
 }
 
 
+static void
+intel_tv_get_config(struct intel_encoder *encoder,
+		    struct intel_crtc_config *pipe_config)
+{
+	pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock;
+}
+
 static bool
 intel_tv_compute_config(struct intel_encoder *encoder,
 			struct intel_crtc_config *pipe_config)
@@ -1621,6 +1628,7 @@ intel_tv_init(struct drm_device *dev)
 			 DRM_MODE_ENCODER_TVDAC);
 
 	intel_encoder->compute_config = intel_tv_compute_config;
+	intel_encoder->get_config = intel_tv_get_config;
 	intel_encoder->mode_set = intel_tv_mode_set;
 	intel_encoder->enable = intel_enable_tv;
 	intel_encoder->disable = intel_disable_tv;