Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a495cfd authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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 18442d08
Author: Ville Syrjälä <ville.syrjala@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@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ef46e0d2
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -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;