diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2013-08-06 15:32:22 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-08 08:04:50 -0400 |
commit | bf02db99384929a12eff0cf1205b4547e41e881b (patch) | |
tree | 8722cad05138fd9360f50363148d0f20de5df195 | |
parent | c5022bb9ff2a606839ede18ccf268444d3f99729 (diff) |
drm: Handle the DBLCLK flag in the common infoframe helper
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 8d1139f602ec..a9c8980367e0 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -3102,6 +3102,9 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, | |||
3102 | if (err < 0) | 3102 | if (err < 0) |
3103 | return err; | 3103 | return err; |
3104 | 3104 | ||
3105 | if (mode->flags & DRM_MODE_FLAG_DBLCLK) | ||
3106 | frame->pixel_repeat = 1; | ||
3107 | |||
3105 | frame->video_code = drm_match_cea_mode(mode); | 3108 | frame->video_code = drm_match_cea_mode(mode); |
3106 | if (!frame->video_code) | 3109 | if (!frame->video_code) |
3107 | return 0; | 3110 | return 0; |
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index b7514886debc..b54fe29f2eb5 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -364,9 +364,6 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, | |||
364 | return; | 364 | return; |
365 | } | 365 | } |
366 | 366 | ||
367 | if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) | ||
368 | frame.avi.pixel_repeat = 1; | ||
369 | |||
370 | if (intel_hdmi->rgb_quant_range_selectable) { | 367 | if (intel_hdmi->rgb_quant_range_selectable) { |
371 | if (intel_crtc->config.limited_color_range) | 368 | if (intel_crtc->config.limited_color_range) |
372 | frame.avi.quantization_range = | 369 | frame.avi.quantization_range = |