| 57,6 → 57,10 |
|---|
| #define NTSC_TV_PLL_N_14 693 |
| #define NTSC_TV_PLL_P_14 7 |
| |
| #define PAL_TV_PLL_M_14 19 |
| #define PAL_TV_PLL_N_14 353 |
| #define PAL_TV_PLL_P_14 5 |
| |
| #define VERT_LEAD_IN_LINES 2 |
| #define FRAC_BITS 0xe |
| #define FRAC_MASK 0x3fff |
| 208,6 → 212,21 |
|---|
| 8, /* crtcPLL_postDiv */ |
| 1022, /* pixToTV */ |
| }, |
| { /* PAL timing for 14 Mhz ref clk */ |
| 800, /* horResolution */ |
| 600, /* verResolution */ |
| TV_STD_PAL, /* standard */ |
| 1131, /* horTotal */ |
| 742, /* verTotal */ |
| 813, /* horStart */ |
| 840, /* horSyncStart */ |
| 633, /* verSyncStart */ |
| 708369, /* defRestart */ |
| 211, /* crtcPLL_N */ |
| 9, /* crtcPLL_M */ |
| 8, /* crtcPLL_postDiv */ |
| 759, /* pixToTV */ |
| }, |
| }; |
| |
| #define N_AVAILABLE_MODES ARRAY_SIZE(available_tv_modes) |
| 242,7 → 261,7 |
|---|
| if (pll->reference_freq == 2700) |
| const_ptr = &available_tv_modes[1]; |
| else |
| const_ptr = &available_tv_modes[1]; /* FIX ME */ |
| const_ptr = &available_tv_modes[3]; |
| } |
| return const_ptr; |
| } |
| 477,7 → 496,7 |
|---|
| |
| restart -= v_offset + h_offset; |
| |
| DRM_DEBUG("compute_restarts: def = %u h = %d v = %d, p1 = %04x, p2 = %04x, restart = %d\n", |
| DRM_DEBUG_KMS("compute_restarts: def = %u h = %d v = %d, p1 = %04x, p2 = %04x, restart = %d\n", |
| const_ptr->def_restart, tv_dac->h_pos, tv_dac->v_pos, p1, p2, restart); |
| |
| tv_dac->tv.hrestart = restart % h_total; |
| 486,7 → 505,7 |
|---|
| restart /= v_total; |
| tv_dac->tv.frestart = restart % f_total; |
| |
| DRM_DEBUG("compute_restart: F/H/V=%u,%u,%u\n", |
| DRM_DEBUG_KMS("compute_restart: F/H/V=%u,%u,%u\n", |
| (unsigned)tv_dac->tv.frestart, |
| (unsigned)tv_dac->tv.vrestart, |
| (unsigned)tv_dac->tv.hrestart); |
| 504,7 → 523,7 |
|---|
| tv_dac->tv.timing_cntl = (tv_dac->tv.timing_cntl & ~RADEON_H_INC_MASK) | |
| ((u32)h_inc << RADEON_H_INC_SHIFT); |
| |
| DRM_DEBUG("compute_restart: h_size = %d h_inc = %d\n", tv_dac->h_size, h_inc); |
| DRM_DEBUG_KMS("compute_restart: h_size = %d h_inc = %d\n", tv_dac->h_size, h_inc); |
| |
| return h_changed; |
| } |
| 623,8 → 642,8 |
|---|
| } |
| flicker_removal = (tmp + 500) / 1000; |
| |
| if (flicker_removal < 2) |
| flicker_removal = 2; |
| if (flicker_removal < 3) |
| flicker_removal = 3; |
| for (i = 0; i < ARRAY_SIZE(SLOPE_limit); ++i) { |
| if (flicker_removal == SLOPE_limit[i]) |
| break; |
| 685,9 → 704,9 |
|---|
| n = PAL_TV_PLL_N_27; |
| p = PAL_TV_PLL_P_27; |
| } else { |
| m = PAL_TV_PLL_M_27; |
| n = PAL_TV_PLL_N_27; |
| p = PAL_TV_PLL_P_27; |
| m = PAL_TV_PLL_M_14; |
| n = PAL_TV_PLL_N_14; |
| p = PAL_TV_PLL_P_14; |
| } |
| } |
| |