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

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

drm/omap: omap_display_timings: rename x_res to hactive 



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

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent bd9642b9

drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct panel_drv_data { 
};



static const struct omap_video_timings tvc_pal_timings = {

	.x_res		= 720,

	.hactive	= 720,

	.y_res		= 574,

	.pixelclock	= 13500000,

	.hsw		= 64,

drivers/gpu/drm/omapdrm/displays/connector-dvi.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "../dss/omapdss.h"



static const struct omap_video_timings dvic_default_timings = {

	.x_res		= 640,

	.hactive	= 640,

	.y_res		= 480,



	.pixelclock	= 23500000,

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "../dss/omapdss.h"



static const struct omap_video_timings hdmic_default_timings = {

	.x_res		= 640,

	.hactive	= 640,

	.y_res		= 480,

	.pixelclock	= 25175000,

	.hsw		= 96,

drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c

+4 −4
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static const struct backlight_ops dsicm_bl_ops = { 
static void dsicm_get_resolution(struct omap_dss_device *dssdev,

		u16 *xres, u16 *yres)

{

	*xres = dssdev->panel.timings.x_res;

	*xres = dssdev->panel.timings.hactive;

	*yres = dssdev->panel.timings.y_res;

}
@@ -892,7 +892,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.x_res,

			dssdev->panel.timings.hactive,

			dssdev->panel.timings.y_res);

	if (r)

		goto err;
@@ -1024,7 +1024,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev, 
	}



	size = min(w * h * 3,

			dssdev->panel.timings.x_res *

			dssdev->panel.timings.hactive *

			dssdev->panel.timings.y_res * 3);



	in->ops.dsi->bus_lock(in);
@@ -1186,7 +1186,7 @@ static int dsicm_probe(struct platform_device *pdev) 
	if (r)

		return r;



	ddata->timings.x_res = 864;

	ddata->timings.hactive = 864;

	ddata->timings.y_res = 480;

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

drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "../dss/omapdss.h"



static struct omap_video_timings lb035q02_timings = {

	.x_res = 320,

	.hactive = 320,

	.y_res = 240,



	.pixelclock	= 6500000,