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

Commit fb7f3c43 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tomi Valkeinen
Browse files

drm/omap: omap_display_timings: rename y_res to vactive



In preparation to move the stack to use the generic videmode struct for
display timing information rename the y_res member to vactive.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 81899060
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct panel_drv_data {

static const struct omap_video_timings tvc_pal_timings = {
	.hactive	= 720,
	.y_res		= 574,
	.vactive	= 574,
	.pixelclock	= 13500000,
	.hsw		= 64,
	.hfp		= 12,
+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@

static const struct omap_video_timings dvic_default_timings = {
	.hactive	= 640,
	.y_res		= 480,
	.vactive	= 480,

	.pixelclock	= 23500000,

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@

static const struct omap_video_timings hdmic_default_timings = {
	.hactive	= 640,
	.y_res		= 480,
	.vactive	= 480,
	.pixelclock	= 25175000,
	.hsw		= 96,
	.hfp		= 16,
+4 −4
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static void dsicm_get_resolution(struct omap_dss_device *dssdev,
		u16 *xres, u16 *yres)
{
	*xres = dssdev->panel.timings.hactive;
	*yres = dssdev->panel.timings.y_res;
	*yres = dssdev->panel.timings.vactive;
}

static ssize_t dsicm_num_errors_show(struct device *dev,
@@ -893,7 +893,7 @@ static int dsicm_update(struct omap_dss_device *dssdev,
	/* XXX no need to send this every frame, but dsi break if not done */
	r = dsicm_set_update_window(ddata, 0, 0,
			dssdev->panel.timings.hactive,
			dssdev->panel.timings.y_res);
			dssdev->panel.timings.vactive);
	if (r)
		goto err;

@@ -1025,7 +1025,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev,

	size = min(w * h * 3,
			dssdev->panel.timings.hactive *
			dssdev->panel.timings.y_res * 3);
			dssdev->panel.timings.vactive * 3);

	in->ops.dsi->bus_lock(in);

@@ -1187,7 +1187,7 @@ static int dsicm_probe(struct platform_device *pdev)
		return r;

	ddata->timings.hactive = 864;
	ddata->timings.y_res = 480;
	ddata->timings.vactive = 480;
	ddata->timings.pixelclock = 864 * 480 * 60;

	dssdev = &ddata->dssdev;
+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@

static struct omap_video_timings lb035q02_timings = {
	.hactive = 320,
	.y_res = 240,
	.vactive = 240,

	.pixelclock	= 6500000,

Loading