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

drm/omap: Use consistent name for struct videomode 



Use 'vm' to refer to a struct videomode instead of 'p', 't', 'timings' or
something else.

The code will be easier to follow if we use consistent names.

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

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

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




	struct device *dev;

	struct device *dev;





	struct videomode timings;

	struct videomode vm;





	bool invert_polarity;

	bool invert_polarity;

};

};





static const struct videomode tvc_pal_timings = {

static const struct videomode tvc_pal_vm = {

	.hactive	= 720,

	.hactive	= 720,

	.vactive	= 574,

	.vactive	= 574,

	.pixelclock	= 13500000,

	.pixelclock	= 13500000,
@@ -93,7 +93,7 @@ static int tvc_enable(struct omap_dss_device *dssdev) 
	if (omapdss_device_is_enabled(dssdev))

	if (omapdss_device_is_enabled(dssdev))

		return 0;

		return 0;





	in->ops.atv->set_timings(in, &ddata->timings);

	in->ops.atv->set_timings(in, &ddata->vm);





	if (!ddata->dev->of_node) {

	if (!ddata->dev->of_node) {

		in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);

		in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
@@ -127,32 +127,32 @@ static void tvc_disable(struct omap_dss_device *dssdev) 
}

}





static void tvc_set_timings(struct omap_dss_device *dssdev,

static void tvc_set_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			    struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	ddata->timings = *timings;

	ddata->vm = *vm;

	dssdev->panel.timings = *timings;

	dssdev->panel.vm = *vm;





	in->ops.atv->set_timings(in, timings);

	in->ops.atv->set_timings(in, vm);

}

}





static void tvc_get_timings(struct omap_dss_device *dssdev,

static void tvc_get_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			    struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);





	*timings = ddata->timings;

	*vm = ddata->vm;

}

}





static int tvc_check_timings(struct omap_dss_device *dssdev,

static int tvc_check_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			     struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	return in->ops.atv->check_timings(in, timings);

	return in->ops.atv->check_timings(in, vm);

}

}





static u32 tvc_get_wss(struct omap_dss_device *dssdev)

static u32 tvc_get_wss(struct omap_dss_device *dssdev)
@@ -254,14 +254,14 @@ static int tvc_probe(struct platform_device *pdev) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	ddata->timings = tvc_pal_timings;

	ddata->vm = tvc_pal_vm;





	dssdev = &ddata->dssdev;

	dssdev = &ddata->dssdev;

	dssdev->driver = &tvc_driver;

	dssdev->driver = &tvc_driver;

	dssdev->dev = &pdev->dev;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_VENC;

	dssdev->type = OMAP_DISPLAY_TYPE_VENC;

	dssdev->owner = THIS_MODULE;

	dssdev->owner = THIS_MODULE;

	dssdev->panel.timings = tvc_pal_timings;

	dssdev->panel.vm = tvc_pal_vm;





	r = omapdss_register_display(dssdev);

	r = omapdss_register_display(dssdev);

	if (r) {

	if (r) {

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

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




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

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





static const struct videomode dvic_default_timings = {

static const struct videomode dvic_default_vm = {

	.hactive	= 640,

	.hactive	= 640,

	.vactive	= 480,

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

	struct omap_dss_device dssdev;

	struct omap_dss_device *in;

	struct omap_dss_device *in;





	struct videomode timings;

	struct videomode vm;





	struct i2c_adapter *i2c_adapter;

	struct i2c_adapter *i2c_adapter;

};

};
@@ -88,7 +88,7 @@ static int dvic_enable(struct omap_dss_device *dssdev) 
	if (omapdss_device_is_enabled(dssdev))

	if (omapdss_device_is_enabled(dssdev))

		return 0;

		return 0;





	in->ops.dvi->set_timings(in, &ddata->timings);

	in->ops.dvi->set_timings(in, &ddata->vm);





	r = in->ops.dvi->enable(in);

	r = in->ops.dvi->enable(in);

	if (r)

	if (r)
@@ -113,32 +113,32 @@ static void dvic_disable(struct omap_dss_device *dssdev) 
}

}





static void dvic_set_timings(struct omap_dss_device *dssdev,

static void dvic_set_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			     struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	ddata->timings = *timings;

	ddata->vm = *vm;

	dssdev->panel.timings = *timings;

	dssdev->panel.vm = *vm;





	in->ops.dvi->set_timings(in, timings);

	in->ops.dvi->set_timings(in, vm);

}

}





static void dvic_get_timings(struct omap_dss_device *dssdev,

static void dvic_get_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			     struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);





	*timings = ddata->timings;

	*vm = ddata->vm;

}

}





static int dvic_check_timings(struct omap_dss_device *dssdev,

static int dvic_check_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			      struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	return in->ops.dvi->check_timings(in, timings);

	return in->ops.dvi->check_timings(in, vm);

}

}





static int dvic_ddc_read(struct i2c_adapter *adapter,

static int dvic_ddc_read(struct i2c_adapter *adapter,
@@ -285,14 +285,14 @@ static int dvic_probe(struct platform_device *pdev) 
	if (r)

	if (r)

		return r;

		return r;





	ddata->timings = dvic_default_timings;

	ddata->vm = dvic_default_vm;





	dssdev = &ddata->dssdev;

	dssdev = &ddata->dssdev;

	dssdev->driver = &dvic_driver;

	dssdev->driver = &dvic_driver;

	dssdev->dev = &pdev->dev;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_DVI;

	dssdev->type = OMAP_DISPLAY_TYPE_DVI;

	dssdev->owner = THIS_MODULE;

	dssdev->owner = THIS_MODULE;

	dssdev->panel.timings = dvic_default_timings;

	dssdev->panel.vm = dvic_default_vm;





	r = omapdss_register_display(dssdev);

	r = omapdss_register_display(dssdev);

	if (r) {

	if (r) {

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

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




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

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





static const struct videomode hdmic_default_timings = {

static const struct videomode hdmic_default_vm = {

	.hactive	= 640,

	.hactive	= 640,

	.vactive	= 480,

	.vactive	= 480,

	.pixelclock	= 25175000,

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




	struct device *dev;

	struct device *dev;





	struct videomode timings;

	struct videomode vm;





	int hpd_gpio;

	int hpd_gpio;

};

};
@@ -93,7 +93,7 @@ static int hdmic_enable(struct omap_dss_device *dssdev) 
	if (omapdss_device_is_enabled(dssdev))

	if (omapdss_device_is_enabled(dssdev))

		return 0;

		return 0;





	in->ops.hdmi->set_timings(in, &ddata->timings);

	in->ops.hdmi->set_timings(in, &ddata->vm);





	r = in->ops.hdmi->enable(in);

	r = in->ops.hdmi->enable(in);

	if (r)

	if (r)
@@ -120,32 +120,32 @@ static void hdmic_disable(struct omap_dss_device *dssdev) 
}

}





static void hdmic_set_timings(struct omap_dss_device *dssdev,

static void hdmic_set_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			      struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	ddata->timings = *timings;

	ddata->vm = *vm;

	dssdev->panel.timings = *timings;

	dssdev->panel.vm = *vm;





	in->ops.hdmi->set_timings(in, timings);

	in->ops.hdmi->set_timings(in, vm);

}

}





static void hdmic_get_timings(struct omap_dss_device *dssdev,

static void hdmic_get_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			      struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);





	*timings = ddata->timings;

	*vm = ddata->vm;

}

}





static int hdmic_check_timings(struct omap_dss_device *dssdev,

static int hdmic_check_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			       struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	return in->ops.hdmi->check_timings(in, timings);

	return in->ops.hdmi->check_timings(in, vm);

}

}





static int hdmic_read_edid(struct omap_dss_device *dssdev,

static int hdmic_read_edid(struct omap_dss_device *dssdev,
@@ -256,14 +256,14 @@ static int hdmic_probe(struct platform_device *pdev) 
			goto err_reg;

			goto err_reg;

	}

	}





	ddata->timings = hdmic_default_timings;

	ddata->vm = hdmic_default_vm;





	dssdev = &ddata->dssdev;

	dssdev = &ddata->dssdev;

	dssdev->driver = &hdmic_driver;

	dssdev->driver = &hdmic_driver;

	dssdev->dev = &pdev->dev;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_HDMI;

	dssdev->type = OMAP_DISPLAY_TYPE_HDMI;

	dssdev->owner = THIS_MODULE;

	dssdev->owner = THIS_MODULE;

	dssdev->panel.timings = hdmic_default_timings;

	dssdev->panel.vm = hdmic_default_vm;





	r = omapdss_register_display(dssdev);

	r = omapdss_register_display(dssdev);

	if (r) {

	if (r) {

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

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




	struct gpio_desc *enable_gpio;

	struct gpio_desc *enable_gpio;





	struct videomode timings;

	struct videomode vm;

};

};





#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)

#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -90,7 +90,7 @@ static int opa362_enable(struct omap_dss_device *dssdev) 
	if (omapdss_device_is_enabled(dssdev))

	if (omapdss_device_is_enabled(dssdev))

		return 0;

		return 0;





	in->ops.atv->set_timings(in, &ddata->timings);

	in->ops.atv->set_timings(in, &ddata->vm);





	r = in->ops.atv->enable(in);

	r = in->ops.atv->enable(in);

	if (r)

	if (r)
@@ -123,38 +123,38 @@ static void opa362_disable(struct omap_dss_device *dssdev) 
}

}





static void opa362_set_timings(struct omap_dss_device *dssdev,

static void opa362_set_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			       struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	dev_dbg(dssdev->dev, "set_timings\n");

	dev_dbg(dssdev->dev, "set_timings\n");





	ddata->timings = *timings;

	ddata->vm = *vm;

	dssdev->panel.timings = *timings;

	dssdev->panel.vm = *vm;





	in->ops.atv->set_timings(in, timings);

	in->ops.atv->set_timings(in, vm);

}

}





static void opa362_get_timings(struct omap_dss_device *dssdev,

static void opa362_get_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			       struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);





	dev_dbg(dssdev->dev, "get_timings\n");

	dev_dbg(dssdev->dev, "get_timings\n");





	*timings = ddata->timings;

	*vm = ddata->vm;

}

}





static int opa362_check_timings(struct omap_dss_device *dssdev,

static int opa362_check_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

				struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	dev_dbg(dssdev->dev, "check_timings\n");

	dev_dbg(dssdev->dev, "check_timings\n");





	return in->ops.atv->check_timings(in, timings);

	return in->ops.atv->check_timings(in, vm);

}

}





static void opa362_set_type(struct omap_dss_device *dssdev,

static void opa362_set_type(struct omap_dss_device *dssdev,

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

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

	int pd_gpio;

	int data_lines;

	int data_lines;





	struct videomode timings;

	struct videomode vm;

};

};





#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)

#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -81,7 +81,7 @@ static int tfp410_enable(struct omap_dss_device *dssdev) 
	if (omapdss_device_is_enabled(dssdev))

	if (omapdss_device_is_enabled(dssdev))

		return 0;

		return 0;





	in->ops.dpi->set_timings(in, &ddata->timings);

	in->ops.dpi->set_timings(in, &ddata->vm);

	if (ddata->data_lines)

	if (ddata->data_lines)

		in->ops.dpi->set_data_lines(in, ddata->data_lines);

		in->ops.dpi->set_data_lines(in, ddata->data_lines);
@@ -113,44 +113,43 @@ static void tfp410_disable(struct omap_dss_device *dssdev) 
	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}

}





static void tfp410_fix_timings(struct videomode *timings)

static void tfp410_fix_timings(struct videomode *vm)

{

{

	timings->flags |= DISPLAY_FLAGS_DE_HIGH |

	vm->flags |= DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE |

			  DISPLAY_FLAGS_PIXDATA_POSEDGE |

		     DISPLAY_FLAGS_SYNC_POSEDGE;

		     DISPLAY_FLAGS_SYNC_POSEDGE;

}

}





static void tfp410_set_timings(struct omap_dss_device *dssdev,

static void tfp410_set_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			       struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	tfp410_fix_timings(timings);

	tfp410_fix_timings(vm);





	ddata->timings = *timings;

	ddata->vm = *vm;

	dssdev->panel.timings = *timings;

	dssdev->panel.vm = *vm;





	in->ops.dpi->set_timings(in, timings);

	in->ops.dpi->set_timings(in, vm);

}

}





static void tfp410_get_timings(struct omap_dss_device *dssdev,

static void tfp410_get_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

			       struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);





	*timings = ddata->timings;

	*vm = ddata->vm;

}

}





static int tfp410_check_timings(struct omap_dss_device *dssdev,

static int tfp410_check_timings(struct omap_dss_device *dssdev,

		struct videomode *timings)

				struct videomode *vm)

{

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in = ddata->in;





	tfp410_fix_timings(timings);

	tfp410_fix_timings(vm);





	return in->ops.dpi->check_timings(in, timings);

	return in->ops.dpi->check_timings(in, vm);

}

}





static const struct omapdss_dvi_ops tfp410_dvi_ops = {

static const struct omapdss_dvi_ops tfp410_dvi_ops = {