Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bb63845 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

fbdev: add some missing mac modes 



Add the missing mac video modes for the Portrait and 12" RGB displays. The
specs come from the Mac LC III developer note.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 18814ee8

drivers/video/macmodes.c

+28 −24
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 


static const struct fb_videomode mac_modedb[] = {

    {

	/* 512x384, 60Hz, Non-Interlaced (15.67 MHz dot clock) */

	"mac2", 60, 512, 384, 63828, 80, 16, 19, 1, 32, 3,

	0, FB_VMODE_NONINTERLACED

    }, {

	/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */

	"mac5", 60, 640, 480, 39722, 32, 32, 33, 10, 96, 2,

	0, FB_VMODE_NONINTERLACED
@@ -40,6 +44,10 @@ static const struct fb_videomode mac_modedb[] = { 
	/* 640x480, 67Hz, Non-Interlaced (30.0 MHz dotclock) */

	"mac6", 67, 640, 480, 33334, 80, 80, 39, 3, 64, 3,

	0, FB_VMODE_NONINTERLACED

    }, {

	/* 640x870, 75Hz (portrait), Non-Interlaced (57.28 MHz dot clock) */

	"mac7", 75, 640, 870, 17457, 80, 32, 42, 3, 80, 3,

	0, FB_VMODE_NONINTERLACED

    }, {

	/* 800x600, 56 Hz, Non-Interlaced (36.00 MHz dotclock) */

	"mac9", 56, 800, 600, 27778, 112, 40, 22, 1, 72, 2,
@@ -104,10 +112,6 @@ static const struct fb_videomode mac_modedb[] = { 
	/* VMODE_512_384_60I: 512x384, 60Hz, Interlaced (NTSC) */

	"mac1", 60, 512, 384, pixclock, left, right, upper, lower, hslen, vslen,

	sync, FB_VMODE_INTERLACED

    }, {

	/* VMODE_512_384_60: 512x384, 60Hz, Non-Interlaced */

    	"mac2", 60, 512, 384, pixclock, left, right, upper, lower, hslen, vslen,

	sync, FB_VMODE_NONINTERLACED

    }, {

	/* VMODE_640_480_50I: 640x480, 50Hz, Interlaced (PAL) */

	"mac3", 50, 640, 480, pixclock, left, right, upper, lower, hslen, vslen,
@@ -116,10 +120,6 @@ static const struct fb_videomode mac_modedb[] = { 
	/* VMODE_640_480_60I: 640x480, 60Hz, Interlaced (NTSC) */

	"mac4", 60, 640, 480, pixclock, left, right, upper, lower, hslen, vslen,

	sync, FB_VMODE_INTERLACED

    }, {

	/* VMODE_640_870_75P: 640x870, 75Hz (portrait), Non-Interlaced */

	"mac7", 75, 640, 870, pixclock, left, right, upper, lower, hslen, vslen,

	sync, FB_VMODE_NONINTERLACED

    }, {

	/* VMODE_768_576_50I: 768x576, 50Hz (PAL full frame), Interlaced */

	"mac8", 50, 768, 576, pixclock, left, right, upper, lower, hslen, vslen,
@@ -141,31 +141,35 @@ static const struct mode_map { 
    int vmode;

    const struct fb_videomode *mode;

} mac_modes[] = {

    /* 512x384 */

    { VMODE_512_384_60, &mac_modedb[0] },

    /* 640x480 */

    { VMODE_640_480_60, &mac_modedb[0] },

    { VMODE_640_480_67, &mac_modedb[1] },

    { VMODE_640_480_60, &mac_modedb[1] },

    { VMODE_640_480_67, &mac_modedb[2] },

    /* 640x870 */

    { VMODE_640_870_75P, &mac_modedb[3] },

    /* 800x600 */

    { VMODE_800_600_56, &mac_modedb[2] },

    { VMODE_800_600_60, &mac_modedb[3] },

    { VMODE_800_600_75, &mac_modedb[5] },

    { VMODE_800_600_72, &mac_modedb[4] },

    { VMODE_800_600_56, &mac_modedb[4] },

    { VMODE_800_600_60, &mac_modedb[5] },

    { VMODE_800_600_75, &mac_modedb[7] },

    { VMODE_800_600_72, &mac_modedb[6] },

    /* 832x624 */

    { VMODE_832_624_75, &mac_modedb[6] },

    { VMODE_832_624_75, &mac_modedb[8] },

    /* 1024x768 */

    { VMODE_1024_768_60, &mac_modedb[7] },

    { VMODE_1024_768_70, &mac_modedb[8] },

    { VMODE_1024_768_75V, &mac_modedb[9] },

    { VMODE_1024_768_75, &mac_modedb[10] },

    { VMODE_1024_768_60, &mac_modedb[9] },

    { VMODE_1024_768_70, &mac_modedb[10] },

    { VMODE_1024_768_75V, &mac_modedb[11] },

    { VMODE_1024_768_75, &mac_modedb[12] },

    /* 1152x768 */

    { VMODE_1152_768_60, &mac_modedb[14] },

    { VMODE_1152_768_60, &mac_modedb[16] },

    /* 1152x870 */

    { VMODE_1152_870_75, &mac_modedb[11] },

    { VMODE_1152_870_75, &mac_modedb[13] },

    /* 1280x960 */

    { VMODE_1280_960_75, &mac_modedb[12] },

    { VMODE_1280_960_75, &mac_modedb[14] },

    /* 1280x1024 */

    { VMODE_1280_1024_75, &mac_modedb[13] },

    { VMODE_1280_1024_75, &mac_modedb[15] },

    /* 1600x1024 */

    { VMODE_1600_1024_60, &mac_modedb[15] },

    { VMODE_1600_1024_60, &mac_modedb[17] },

    { -1, NULL }

};