diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-18 03:00:58 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-18 16:24:33 -0500 |
commit | 7a495cfd9b5f82c40608f26fe523dc9e8533dc14 (patch) | |
tree | de25cdfe1b64bab780ed16768ec326e8fd692dc9 | |
parent | ef46e0d247da0a7a408573aa15870e231bbd4af2 (diff) |
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@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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 18c406246a2d..22cf0f4ba248 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, | |||
902 | } | 902 | } |
903 | 903 | ||
904 | 904 | ||
905 | static void | ||
906 | intel_tv_get_config(struct intel_encoder *encoder, | ||
907 | struct intel_crtc_config *pipe_config) | ||
908 | { | ||
909 | pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; | ||
910 | } | ||
911 | |||
905 | static bool | 912 | static bool |
906 | intel_tv_compute_config(struct intel_encoder *encoder, | 913 | intel_tv_compute_config(struct intel_encoder *encoder, |
907 | struct intel_crtc_config *pipe_config) | 914 | struct intel_crtc_config *pipe_config) |
@@ -1621,6 +1628,7 @@ intel_tv_init(struct drm_device *dev) | |||
1621 | DRM_MODE_ENCODER_TVDAC); | 1628 | DRM_MODE_ENCODER_TVDAC); |
1622 | 1629 | ||
1623 | intel_encoder->compute_config = intel_tv_compute_config; | 1630 | intel_encoder->compute_config = intel_tv_compute_config; |
1631 | intel_encoder->get_config = intel_tv_get_config; | ||
1624 | intel_encoder->mode_set = intel_tv_mode_set; | 1632 | intel_encoder->mode_set = intel_tv_mode_set; |
1625 | intel_encoder->enable = intel_enable_tv; | 1633 | intel_encoder->enable = intel_enable_tv; |
1626 | intel_encoder->disable = intel_disable_tv; | 1634 | intel_encoder->disable = intel_disable_tv; |