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

Commit e09a8c3a authored by Timur Tabi's avatar Timur Tabi Committed by Florian Tobias Schandinat
Browse files

drivers/video: fsl-diu-fb: add default platform ops functions 



The DIU driver requires some platform-specific functions to be defined,
but two them can be optional because most platforms implement them the
same way.  Functions set_gamma_table() and get_pixel_format() are only
needed because of quirks in the Freescale MPC8610 HPCD reference board.
For other boards, a generic implementation works, so we shouldn't
require the platform code to define them.

Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent d397e916

drivers/video/fsl-diu-fb.c

+61 −3
Original line number Diff line number Diff line
@@ -832,6 +832,7 @@ static void update_lcdc(struct fb_info *info) 
		for (j = 0; j <= 255; j++)

			*gamma_table_base++ = j;



	if (diu_ops.set_gamma_table)

		diu_ops.set_gamma_table(data->monitor_port, data->gamma);



	disable_lcdc(info);
@@ -917,6 +918,59 @@ static int fsl_diu_set_aoi(struct fb_info *info) 
	return 0;

}



/**

 * fsl_diu_get_pixel_format: return the pixel format for a given color depth

 *

 * The pixel format is a 32-bit value that determine which bits in each

 * pixel are to be used for each color.  This is the default function used

 * if the platform does not define its own version.

 */

static u32 fsl_diu_get_pixel_format(unsigned int bits_per_pixel)

{

#define PF_BYTE_F		0x10000000

#define PF_ALPHA_C_MASK		0x0E000000

#define PF_ALPHA_C_SHIFT	25

#define PF_BLUE_C_MASK		0x01800000

#define PF_BLUE_C_SHIFT		23

#define PF_GREEN_C_MASK		0x00600000

#define PF_GREEN_C_SHIFT	21

#define PF_RED_C_MASK		0x00180000

#define PF_RED_C_SHIFT		19

#define PF_PALETTE		0x00040000

#define PF_PIXEL_S_MASK		0x00030000

#define PF_PIXEL_S_SHIFT	16

#define PF_COMP_3_MASK		0x0000F000

#define PF_COMP_3_SHIFT		12

#define PF_COMP_2_MASK		0x00000F00

#define PF_COMP_2_SHIFT		8

#define PF_COMP_1_MASK		0x000000F0

#define PF_COMP_1_SHIFT		4

#define PF_COMP_0_MASK		0x0000000F

#define PF_COMP_0_SHIFT		0



#define MAKE_PF(alpha, red, blue, green, size, c0, c1, c2, c3) \

	cpu_to_le32(PF_BYTE_F | (alpha << PF_ALPHA_C_SHIFT) | \

	(blue << PF_BLUE_C_SHIFT) | (green << PF_GREEN_C_SHIFT) | \

	(red << PF_RED_C_SHIFT) | (c3 << PF_COMP_3_SHIFT) | \

	(c2 << PF_COMP_2_SHIFT) | (c1 << PF_COMP_1_SHIFT) | \

	(c0 << PF_COMP_0_SHIFT) | (size << PF_PIXEL_S_SHIFT))



	switch (bits_per_pixel) {

	case 32:

		/* 0x88883316 */

		return MAKE_PF(3, 2, 0, 1, 3, 8, 8, 8, 8);

	case 24:

		/* 0x88082219 */

		return MAKE_PF(4, 0, 1, 2, 2, 0, 8, 8, 8);

	case 16:

		/* 0x65053118 */

		return MAKE_PF(4, 2, 1, 0, 1, 5, 6, 5, 0);

	default:

		pr_err("fsl-diu: unsupported color depth %u\n", bits_per_pixel);

		return 0;

	}

}



/*

 * Using the fb_var_screeninfo in fb_info we set the resolution of this

 * particular framebuffer. This function alters the fb_fix_screeninfo stored
@@ -952,8 +1006,12 @@ static int fsl_diu_set_par(struct fb_info *info) 
		}

	}



	if (diu_ops.get_pixel_format)

		ad->pix_fmt = diu_ops.get_pixel_format(data->monitor_port,

						       var->bits_per_pixel);

	else

		ad->pix_fmt = fsl_diu_get_pixel_format(var->bits_per_pixel);



	ad->addr    = cpu_to_le32(info->fix.smem_start);

	ad->src_size_g_alpha = cpu_to_le32((var->yres_virtual << 12) |

				var->xres_virtual) | mfbi->g_alpha;