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

Commit a2699504 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: DSS2: move get_recommended_bpp() 



Move get_recommended_bpp() from omap_dss_device to omap_dss_driver.

This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 96adcece

arch/arm/plat-omap/include/plat/display.h

+3 −4
Original line number Diff line number Diff line
@@ -433,8 +433,6 @@ struct omap_dss_device { 
		int acb;	/* ac-bias pin frequency */



		enum omap_panel_config config;



		u8 recommended_bpp;

	} panel;



	struct {
@@ -470,8 +468,6 @@ struct omap_dss_device { 
	int (*suspend)(struct omap_dss_device *dssdev);

	int (*resume)(struct omap_dss_device *dssdev);



	int (*get_recommended_bpp)(struct omap_dss_device *dssdev);



	int (*check_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*set_timings)(struct omap_dss_device *dssdev,
@@ -530,6 +526,7 @@ struct omap_dss_driver { 


	void (*get_resolution)(struct omap_dss_device *dssdev,

			u16 *xres, u16 *yres);

	int (*get_recommended_bpp)(struct omap_dss_device *dssdev);

};



int omap_dss_register_driver(struct omap_dss_driver *);
@@ -556,6 +553,8 @@ struct omap_overlay *omap_dss_get_overlay(int num); 


void omapdss_default_get_resolution(struct omap_dss_device *dssdev,

		u16 *xres, u16 *yres);

int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev);



typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);

int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);

int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);

drivers/video/omap2/displays/panel-taal.c

+2 −0
Original line number Diff line number Diff line
@@ -990,6 +990,8 @@ static struct omap_dss_driver taal_driver = { 


	.setup_update	= taal_setup_update,

	.get_resolution	= taal_get_resolution,

	.get_recommended_bpp = omapdss_default_get_recommended_bpp,



	.enable_te	= taal_enable_te,

	.wait_for_te	= taal_wait_te,

	.set_rotate	= taal_rotate,

drivers/video/omap2/dss/core.c

+3 −0
Original line number Diff line number Diff line
@@ -814,6 +814,9 @@ int omap_dss_register_driver(struct omap_dss_driver *dssdriver) 


	if (dssdriver->get_resolution == NULL)

		dssdriver->get_resolution = omapdss_default_get_resolution;

	if (dssdriver->get_recommended_bpp == NULL)

		dssdriver->get_recommended_bpp =

			omapdss_default_get_recommended_bpp;



	return driver_register(&dssdriver->driver);

}

drivers/video/omap2/dss/display.c

+2 −6
Original line number Diff line number Diff line
@@ -324,11 +324,8 @@ void default_get_overlay_fifo_thresholds(enum omap_plane plane, 
	*fifo_low = fifo_size - burst_size_bytes;

}



static int default_get_recommended_bpp(struct omap_dss_device *dssdev)

int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev)

{

	if (dssdev->panel.recommended_bpp)

		return dssdev->panel.recommended_bpp;



	switch (dssdev->type) {

	case OMAP_DISPLAY_TYPE_DPI:

		if (dssdev->phy.dpi.data_lines == 24)
@@ -350,6 +347,7 @@ static int default_get_recommended_bpp(struct omap_dss_device *dssdev) 
		BUG();

	}

}

EXPORT_SYMBOL(omapdss_default_get_recommended_bpp);



/* Checks if replication logic should be used. Only use for active matrix,

 * when overlay is in RGB12U or RGB16 mode, and LCD interface is
@@ -413,8 +411,6 @@ void dss_init_device(struct platform_device *pdev, 
		return;

	}



	dssdev->get_recommended_bpp = default_get_recommended_bpp;



	switch (dssdev->type) {

	case OMAP_DISPLAY_TYPE_DPI:

		r = dpi_init_display(dssdev);

drivers/video/omap2/dss/venc.c

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ static struct omap_dss_driver venc_driver = { 
	.resume		= venc_panel_resume,



	.get_resolution	= omapdss_default_get_resolution,

	.get_recommended_bpp = omapdss_default_get_recommended_bpp,



	.driver         = {

		.name   = "venc",