|
@@ -1213,20 +1213,17 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
|
|
tv_ctl |= TV_TRILEVEL_SYNC;
|
|
tv_ctl |= TV_TRILEVEL_SYNC;
|
|
if (tv_mode->pal_burst)
|
|
if (tv_mode->pal_burst)
|
|
tv_ctl |= TV_PAL_BURST;
|
|
tv_ctl |= TV_PAL_BURST;
|
|
|
|
+
|
|
scctl1 = 0;
|
|
scctl1 = 0;
|
|
- /* dda1 implies valid video levels */
|
|
|
|
- if (tv_mode->dda1_inc) {
|
|
|
|
|
|
+ if (tv_mode->dda1_inc)
|
|
scctl1 |= TV_SC_DDA1_EN;
|
|
scctl1 |= TV_SC_DDA1_EN;
|
|
- }
|
|
|
|
-
|
|
|
|
if (tv_mode->dda2_inc)
|
|
if (tv_mode->dda2_inc)
|
|
scctl1 |= TV_SC_DDA2_EN;
|
|
scctl1 |= TV_SC_DDA2_EN;
|
|
-
|
|
|
|
if (tv_mode->dda3_inc)
|
|
if (tv_mode->dda3_inc)
|
|
scctl1 |= TV_SC_DDA3_EN;
|
|
scctl1 |= TV_SC_DDA3_EN;
|
|
-
|
|
|
|
scctl1 |= tv_mode->sc_reset;
|
|
scctl1 |= tv_mode->sc_reset;
|
|
- scctl1 |= video_levels->burst << TV_BURST_LEVEL_SHIFT;
|
|
|
|
|
|
+ if (video_levels)
|
|
|
|
+ scctl1 |= video_levels->burst << TV_BURST_LEVEL_SHIFT;
|
|
scctl1 |= tv_mode->dda1_inc << TV_SCDDA1_INC_SHIFT;
|
|
scctl1 |= tv_mode->dda1_inc << TV_SCDDA1_INC_SHIFT;
|
|
|
|
|
|
scctl2 = tv_mode->dda2_size << TV_SCDDA2_SIZE_SHIFT |
|
|
scctl2 = tv_mode->dda2_size << TV_SCDDA2_SIZE_SHIFT |
|