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

OMAP: DSS2: move set/get_wss() 



Move set/get_wss() 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 37ac60e4

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

+3 −3
Original line number Diff line number Diff line
@@ -469,9 +469,6 @@ struct omap_dss_device { 
	void (*get_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);



	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);

	u32 (*get_wss)(struct omap_dss_device *dssdev);



	/* platform specific  */

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

	void (*platform_disable)(struct omap_dss_device *dssdev);
@@ -516,6 +513,9 @@ 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 (*set_wss)(struct omap_dss_device *dssdev, u32 wss);

	u32 (*get_wss)(struct omap_dss_device *dssdev);

};



int omap_dss_register_driver(struct omap_dss_driver *);

drivers/video/omap2/dss/display.c

+4 −4
Original line number Diff line number Diff line
@@ -247,10 +247,10 @@ static ssize_t display_wss_show(struct device *dev, 
	struct omap_dss_device *dssdev = to_dss_device(dev);

	unsigned int wss;



	if (!dssdev->get_wss)

	if (!dssdev->driver->get_wss)

		return -ENOENT;



	wss = dssdev->get_wss(dssdev);

	wss = dssdev->driver->get_wss(dssdev);



	return snprintf(buf, PAGE_SIZE, "0x%05x\n", wss);

}
@@ -262,7 +262,7 @@ static ssize_t display_wss_store(struct device *dev, 
	unsigned long wss;

	int r;



	if (!dssdev->get_wss || !dssdev->set_wss)

	if (!dssdev->driver->get_wss || !dssdev->driver->set_wss)

		return -ENOENT;



	if (strict_strtoul(buf, 0, &wss))
@@ -271,7 +271,7 @@ static ssize_t display_wss_store(struct device *dev, 
	if (wss > 0xfffff)

		return -EINVAL;



	r = dssdev->set_wss(dssdev, wss);

	r = dssdev->driver->set_wss(dssdev, wss);

	if (r)

		return r;

drivers/video/omap2/dss/venc.c

+34 −33
Original line number Diff line number Diff line
@@ -557,6 +557,37 @@ static int venc_set_update_mode(struct omap_dss_device *dssdev, 
	return 0;

}



static u32 venc_get_wss(struct omap_dss_device *dssdev)

{

	/* Invert due to VENC_L21_WC_CTL:INV=1 */

	return (venc.wss_data >> 8) ^ 0xfffff;

}



static int venc_set_wss(struct omap_dss_device *dssdev,	u32 wss)

{

	const struct venc_config *config;



	DSSDBG("venc_set_wss\n");



	mutex_lock(&venc.venc_lock);



	config = venc_timings_to_config(&dssdev->panel.timings);



	/* Invert due to VENC_L21_WC_CTL:INV=1 */

	venc.wss_data = (wss ^ 0xfffff) << 8;



	venc_enable_clocks(1);



	venc_write_reg(VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |

			venc.wss_data);



	venc_enable_clocks(0);



	mutex_unlock(&venc.venc_lock);



	return 0;

}



static struct omap_dss_driver venc_driver = {

	.probe		= venc_panel_probe,

	.remove		= venc_panel_remove,
@@ -572,6 +603,9 @@ static struct omap_dss_driver venc_driver = { 
	.set_update_mode = venc_set_update_mode,

	.get_update_mode = venc_get_update_mode,



	.get_wss	= venc_get_wss,

	.set_wss	= venc_set_wss,



	.driver         = {

		.name   = "venc",

		.owner  = THIS_MODULE,
@@ -656,37 +690,6 @@ static int venc_check_timings(struct omap_dss_device *dssdev, 
	return -EINVAL;

}



static u32 venc_get_wss(struct omap_dss_device *dssdev)

{

	/* Invert due to VENC_L21_WC_CTL:INV=1 */

	return (venc.wss_data >> 8) ^ 0xfffff;

}



static int venc_set_wss(struct omap_dss_device *dssdev,	u32 wss)

{

	const struct venc_config *config;



	DSSDBG("venc_set_wss\n");



	mutex_lock(&venc.venc_lock);



	config = venc_timings_to_config(&dssdev->panel.timings);



	/* Invert due to VENC_L21_WC_CTL:INV=1 */

	venc.wss_data = (wss ^ 0xfffff) << 8;



	venc_enable_clocks(1);



	venc_write_reg(VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |

			venc.wss_data);



	venc_enable_clocks(0);



	mutex_unlock(&venc.venc_lock);



	return 0;

}



int venc_init_display(struct omap_dss_device *dssdev)

{

	DSSDBG("init_display\n");
@@ -694,8 +697,6 @@ int venc_init_display(struct omap_dss_device *dssdev) 
	dssdev->get_timings = venc_get_timings;

	dssdev->set_timings = venc_set_timings;

	dssdev->check_timings = venc_check_timings;

	dssdev->get_wss = venc_get_wss;

	dssdev->set_wss = venc_set_wss;



	return 0;

}