Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
- omapdss: compilation fix and DVI fix for PandaBoard
- mxsfb: fix colors when using 18bit LCD bus
* tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
ARM: OMAP: dss-common: fix Panda's DVI DDC channel
video: mxsfb: fix color settings for 18bit data bus and 32bpp
OMAPDSS: analog-tv-connector: compile fix
+17
-29
+1
-1
arch/arm/mach-omap2/dss-common.c
+1
-1
arch/arm/mach-omap2/dss-common.c
-26
drivers/video/mxsfb.c
-26
drivers/video/mxsfb.c
···
239
239
}
240
240
};
241
241
242
-
static const struct fb_bitfield def_rgb666[] = {
243
-
[RED] = {
244
-
.offset = 16,
245
-
.length = 6,
246
-
},
247
-
[GREEN] = {
248
-
.offset = 8,
249
-
.length = 6,
250
-
},
251
-
[BLUE] = {
252
-
.offset = 0,
253
-
.length = 6,
254
-
},
255
-
[TRANSP] = { /* no support for transparency */
256
-
.length = 0,
257
-
}
258
-
};
259
-
260
242
static const struct fb_bitfield def_rgb888[] = {
261
243
[RED] = {
262
244
.offset = 16,
···
291
309
break;
292
310
case STMLCDIF_16BIT:
293
311
case STMLCDIF_18BIT:
294
-
/* 24 bit to 18 bit mapping */
295
-
rgb = def_rgb666;
296
-
break;
297
312
case STMLCDIF_24BIT:
298
313
/* real 24 bit */
299
314
rgb = def_rgb888;
···
432
453
return -EINVAL;
433
454
case STMLCDIF_16BIT:
434
455
case STMLCDIF_18BIT:
435
-
/* 24 bit to 18 bit mapping */
436
-
ctrl |= CTRL_DF24; /* ignore the upper 2 bits in
437
-
* each colour component
438
-
*/
439
-
break;
440
456
case STMLCDIF_24BIT:
441
457
/* real 24 bit */
442
458
break;
+16
-2
drivers/video/omap2/displays-new/connector-analog-tv.c
+16
-2
drivers/video/omap2/displays-new/connector-analog-tv.c
···
28
28
bool invert_polarity;
29
29
};
30
30
31
+
static const struct omap_video_timings tvc_pal_timings = {
32
+
.x_res = 720,
33
+
.y_res = 574,
34
+
.pixel_clock = 13500,
35
+
.hsw = 64,
36
+
.hfp = 12,
37
+
.hbp = 68,
38
+
.vsw = 5,
39
+
.vfp = 5,
40
+
.vbp = 41,
41
+
42
+
.interlace = true,
43
+
};
44
+
31
45
#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
32
46
33
47
static int tvc_connect(struct omap_dss_device *dssdev)
···
226
212
return -ENODEV;
227
213
}
228
214
229
-
ddata->timings = omap_dss_pal_timings;
215
+
ddata->timings = tvc_pal_timings;
230
216
231
217
dssdev = &ddata->dssdev;
232
218
dssdev->driver = &tvc_driver;
233
219
dssdev->dev = &pdev->dev;
234
220
dssdev->type = OMAP_DISPLAY_TYPE_VENC;
235
221
dssdev->owner = THIS_MODULE;
236
-
dssdev->panel.timings = omap_dss_pal_timings;
222
+
dssdev->panel.timings = tvc_pal_timings;
237
223
238
224
r = omapdss_register_display(dssdev);
239
225
if (r) {