Commit 0c91d257 authored by Hans de Goede's avatar Hans de Goede
Browse files

videomodes: Add pixelclock_khz and refresh fields to ctfb_res_modes



Add pixelclock_khz and refresh fields to ctfb_res_modes:

1) pixelclocks are usually referred to in hz, not picoseconds, and e.g
pll-s are also typically programmed in hz, not ps. Converting between the
2 leads to rounding differences, add a pixelclock_khz field to directly
store the *exact* pixelclock for a mode, so that drivers do not need to
resort to rounding tricks to try and guess the exact pixelclock;

2) The video-mode environment variable, as parsed by video_get_video_mode
also contains the vertical refresh rate, add a refresh field, so that
the refresh-rate can be matched when parsing the video-mode environment
variable.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarAnatolij Gustschin <agust@denx.de>
parent 81ec1001
...@@ -84,13 +84,13 @@ const struct ctfb_vesa_modes vesa_modes[VESA_MODES_COUNT] = { ...@@ -84,13 +84,13 @@ const struct ctfb_vesa_modes vesa_modes[VESA_MODES_COUNT] = {
{0x31B, RES_MODE_1280x1024, 24}, {0x31B, RES_MODE_1280x1024, 24},
}; };
const struct ctfb_res_modes res_mode_init[RES_MODES_COUNT] = { const struct ctfb_res_modes res_mode_init[RES_MODES_COUNT] = {
/* x y pixclk le ri up lo hs vs s vmode */ /* x y hz pixclk ps/kHz le ri up lo hs vs s vmode */
{640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, FB_VMODE_NONINTERLACED}, { 640, 480, 60, 39721, 25180, 40, 24, 32, 11, 96, 2, 0, FB_VMODE_NONINTERLACED},
{800, 600, 27778, 64, 24, 22, 1, 72, 2, 0, FB_VMODE_NONINTERLACED}, { 800, 600, 60, 27778, 36000, 64, 24, 22, 1, 72, 2, 0, FB_VMODE_NONINTERLACED},
{1024, 768, 15384, 168, 8, 29, 3, 144, 4, 0, FB_VMODE_NONINTERLACED}, {1024, 768, 60, 15384, 65000, 168, 8, 29, 3, 144, 4, 0, FB_VMODE_NONINTERLACED},
{960, 720, 13100, 160, 40, 32, 8, 80, 4, 0, FB_VMODE_NONINTERLACED}, { 960, 720, 80, 13100, 76335, 160, 40, 32, 8, 80, 4, 0, FB_VMODE_NONINTERLACED},
{1152, 864, 12004, 200, 64, 32, 16, 80, 4, 0, FB_VMODE_NONINTERLACED}, {1152, 864, 60, 12004, 83300, 200, 64, 32, 16, 80, 4, 0, FB_VMODE_NONINTERLACED},
{1280, 1024, 9090, 200, 48, 26, 1, 184, 3, 0, FB_VMODE_NONINTERLACED}, {1280, 1024, 60, 9090, 110000, 200, 48, 26, 1, 184, 3, 0, FB_VMODE_NONINTERLACED},
}; };
/************************************************************************ /************************************************************************
...@@ -183,6 +183,7 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv) ...@@ -183,6 +183,7 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv)
while ((i = video_get_param_len (p, ',')) != 0) { while ((i = video_get_param_len (p, ',')) != 0) {
GET_OPTION ("x:", pPar->xres) GET_OPTION ("x:", pPar->xres)
GET_OPTION ("y:", pPar->yres) GET_OPTION ("y:", pPar->yres)
GET_OPTION ("refresh:", pPar->refresh)
GET_OPTION ("le:", pPar->left_margin) GET_OPTION ("le:", pPar->left_margin)
GET_OPTION ("ri:", pPar->right_margin) GET_OPTION ("ri:", pPar->right_margin)
GET_OPTION ("up:", pPar->upper_margin) GET_OPTION ("up:", pPar->upper_margin)
...@@ -192,6 +193,7 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv) ...@@ -192,6 +193,7 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv)
GET_OPTION ("sync:", pPar->sync) GET_OPTION ("sync:", pPar->sync)
GET_OPTION ("vmode:", pPar->vmode) GET_OPTION ("vmode:", pPar->vmode)
GET_OPTION ("pclk:", pPar->pixclock) GET_OPTION ("pclk:", pPar->pixclock)
GET_OPTION ("pclk_khz:", pPar->pixclock_khz)
GET_OPTION ("depth:", bpp) GET_OPTION ("depth:", bpp)
p += i; p += i;
if (*p != 0) if (*p != 0)
......
...@@ -35,8 +35,10 @@ ...@@ -35,8 +35,10 @@
struct ctfb_res_modes { struct ctfb_res_modes {
int xres; /* visible resolution */ int xres; /* visible resolution */
int yres; int yres;
int refresh; /* vertical refresh rate in hz */
/* Timing: All values in pixclocks, except pixclock (of course) */ /* Timing: All values in pixclocks, except pixclock (of course) */
int pixclock; /* pixel clock in ps (pico seconds) */ int pixclock; /* pixel clock in ps (pico seconds) */
int pixclock_khz; /* pixel clock in kHz */
int left_margin; /* time from sync to picture */ int left_margin; /* time from sync to picture */
int right_margin; /* time from picture to sync */ int right_margin; /* time from picture to sync */
int upper_margin; /* time from sync to picture */ int upper_margin; /* time from sync to picture */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment