提交 71677043 编写于 作者: C Chris Wilson 提交者: Eric Anholt

drm/i915: Remove the redundant check for a fixed_panel_mode

We already checked just a couple of lines above that we have found a
fixed_panel_mode for the LVDS, so remove the surplus check.
Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: NEric Anholt <eric@anholt.net>
上级 4f444071
...@@ -200,12 +200,11 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder, ...@@ -200,12 +200,11 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
if (dev_priv->panel_fixed_mode == NULL) if (dev_priv->panel_fixed_mode == NULL)
return true; return true;
/* /*
* If we have timings from the BIOS for the panel, put them in * We have timings from the BIOS for the panel, put them in
* to the adjusted mode. The CRTC will be set up for this mode, * to the adjusted mode. The CRTC will be set up for this mode,
* with the panel scaling set up to source from the H/VDisplay * with the panel scaling set up to source from the H/VDisplay
* of the original mode. * of the original mode.
*/ */
if (dev_priv->panel_fixed_mode != NULL) {
adjusted_mode->hdisplay = dev_priv->panel_fixed_mode->hdisplay; adjusted_mode->hdisplay = dev_priv->panel_fixed_mode->hdisplay;
adjusted_mode->hsync_start = adjusted_mode->hsync_start =
dev_priv->panel_fixed_mode->hsync_start; dev_priv->panel_fixed_mode->hsync_start;
...@@ -220,7 +219,6 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder, ...@@ -220,7 +219,6 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
adjusted_mode->vtotal = dev_priv->panel_fixed_mode->vtotal; adjusted_mode->vtotal = dev_priv->panel_fixed_mode->vtotal;
adjusted_mode->clock = dev_priv->panel_fixed_mode->clock; adjusted_mode->clock = dev_priv->panel_fixed_mode->clock;
drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V); drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
}
/* Make sure pre-965s set dither correctly */ /* Make sure pre-965s set dither correctly */
if (!IS_I965G(dev)) { if (!IS_I965G(dev)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册