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

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

drm/omap: Replace struct omap_video_timings with videomode 



omap_video_timings can be replaced with the generic videomode in omapdrm
and the omap_video_timings can be removed.

This patch will replace the omap_video_timings with videomode.
With the change we no longer need the functions to convert to/from
videomode and drm_display_mode to omap_video_timings, these can be removed
as well.

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

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

+5 −5
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ struct panel_drv_data { 


	struct device *dev;



	struct omap_video_timings timings;

	struct videomode timings;



	bool invert_polarity;

};



static const struct omap_video_timings tvc_pal_timings = {

static const struct videomode tvc_pal_timings = {

	.hactive	= 720,

	.vactive	= 574,

	.pixelclock	= 13500000,
@@ -127,7 +127,7 @@ static void tvc_disable(struct omap_dss_device *dssdev) 
}



static void tvc_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;
@@ -139,7 +139,7 @@ static void tvc_set_timings(struct omap_dss_device *dssdev, 
}



static void tvc_get_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);
@@ -147,7 +147,7 @@ static void tvc_get_timings(struct omap_dss_device *dssdev, 
}



static int tvc_check_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

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

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "../dss/omapdss.h"



static const struct omap_video_timings dvic_default_timings = {

static const struct videomode dvic_default_timings = {

	.hactive	= 640,

	.vactive	= 480,
@@ -42,7 +42,7 @@ struct panel_drv_data { 
	struct omap_dss_device dssdev;

	struct omap_dss_device *in;



	struct omap_video_timings timings;

	struct videomode timings;



	struct i2c_adapter *i2c_adapter;

};
@@ -113,7 +113,7 @@ static void dvic_disable(struct omap_dss_device *dssdev) 
}



static void dvic_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;
@@ -125,7 +125,7 @@ static void dvic_set_timings(struct omap_dss_device *dssdev, 
}



static void dvic_get_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);
@@ -133,7 +133,7 @@ static void dvic_get_timings(struct omap_dss_device *dssdev, 
}



static int dvic_check_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

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

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include "../dss/omapdss.h"



static const struct omap_video_timings hdmic_default_timings = {

static const struct videomode hdmic_default_timings = {

	.hactive	= 640,

	.vactive	= 480,

	.pixelclock	= 25175000,
@@ -41,7 +41,7 @@ struct panel_drv_data { 


	struct device *dev;



	struct omap_video_timings timings;

	struct videomode timings;



	int hpd_gpio;

};
@@ -120,7 +120,7 @@ static void hdmic_disable(struct omap_dss_device *dssdev) 
}



static void hdmic_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;
@@ -132,7 +132,7 @@ static void hdmic_set_timings(struct omap_dss_device *dssdev, 
}



static void hdmic_get_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);
@@ -140,7 +140,7 @@ static void hdmic_get_timings(struct omap_dss_device *dssdev, 
}



static int hdmic_check_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct panel_drv_data { 


	struct gpio_desc *enable_gpio;



	struct omap_video_timings timings;

	struct videomode timings;

};



#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -123,7 +123,7 @@ static void opa362_disable(struct omap_dss_device *dssdev) 
}



static void opa362_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;
@@ -137,7 +137,7 @@ static void opa362_set_timings(struct omap_dss_device *dssdev, 
}



static void opa362_get_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);
@@ -147,7 +147,7 @@ static void opa362_get_timings(struct omap_dss_device *dssdev, 
}



static int opa362_check_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct panel_drv_data { 
	int pd_gpio;

	int data_lines;



	struct omap_video_timings timings;

	struct videomode timings;

};



#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -113,7 +113,7 @@ static void tfp410_disable(struct omap_dss_device *dssdev) 
	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static void tfp410_fix_timings(struct omap_video_timings *timings)

static void tfp410_fix_timings(struct videomode *timings)

{

	timings->flags |= DISPLAY_FLAGS_DE_HIGH |

			  DISPLAY_FLAGS_PIXDATA_POSEDGE |
@@ -121,7 +121,7 @@ static void tfp410_fix_timings(struct omap_video_timings *timings) 
}



static void tfp410_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;
@@ -135,7 +135,7 @@ static void tfp410_set_timings(struct omap_dss_device *dssdev, 
}



static void tfp410_get_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);
@@ -143,7 +143,7 @@ static void tfp410_get_timings(struct omap_dss_device *dssdev, 
}



static int tfp410_check_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct videomode *timings)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;