diff options
| author | Liu Ying <b17645@freescale.com> | 2010-12-03 13:29:00 +0800 |
|---|---|---|
| committer | Liu Ying <b17645@freescale.com> | 2010-12-06 09:53:34 +0800 |
| commit | 02f15576f70a3c80cf44cb67d9b2251336919ccc (patch) | |
| tree | d554edbbd71f8fd620d502b625b90a95560aa266 | |
| parent | 6056b2ed1df775262e286d930fecdba44627dc72 (diff) | |
ENGR00134285 LDB:Correct the way to match registered fb info
In the probe function of LDB framebuffer driver, we will
try to match the LVDS video modes defined in the driver.
For LDB separate mode, we need to find two video modes matched,
whereas, for other LDB modes, we need to find only one video
mode matched.
Signed-off-by: Liu Ying <b17645@freescale.com>
| -rw-r--r-- | drivers/video/mxc/ldb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/video/mxc/ldb.c b/drivers/video/mxc/ldb.c index d2707b8ee5c6..258c51985b67 100644 --- a/drivers/video/mxc/ldb.c +++ b/drivers/video/mxc/ldb.c @@ -814,12 +814,14 @@ static int ldb_probe(struct platform_device *pdev) for (i = 0; i < num_registered_fb; i++) { if (registered_fb[i]->var.vmode == FB_VMODE_NONINTERLACED) { - ldb.fbi[i] = registered_fb[i]; - - mode = fb_match_mode(&ldb.fbi[i]->var, &ldb.modelist); + mode = fb_match_mode(®istered_fb[i]->var, + &ldb.modelist); if (mode) { dev_dbg(g_ldb_dev, "fb mode found\n"); + ldb.fbi[i] = registered_fb[i]; fb_videomode_to_var(&ldb.fbi[i]->var, mode); + } else if (i == 0 && ldb.chan_mode_opt != LDB_SEP) { + continue; } else { dev_warn(g_ldb_dev, "can't find video mode\n"); @@ -870,7 +872,7 @@ static int ldb_probe(struct platform_device *pdev) if (i == 0) primary = true; - if (ldb.fbi[1] != NULL) + if (ldb.fbi[1] != NULL || ldb.chan_mode_opt != LDB_SEP) break; } } |