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

Commit 2872c807 authored by Philipp Zabel's avatar Philipp Zabel
Browse files

drm/imx: consolidate bus format variable names 



This patch consolidates the different interface_pix_fmt, pixel_fmt, pix_fmt,
and pixfmt variables to a common name "bus_format" wherever they describe the
pixel format on the bus between display controller and encoder hardware.
At the same time, it renames imx_drm_panel_format to imx_drm_set_bus_format.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Tested-by: default avatarEmil Renner Berthing <kernel@esmil.dk>
parent a7c6e76f

drivers/gpu/drm/imx/dw_hdmi-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void dw_hdmi_imx_encoder_commit(struct drm_encoder *encoder) 


static void dw_hdmi_imx_encoder_prepare(struct drm_encoder *encoder)

{

	imx_drm_panel_format(encoder, MEDIA_BUS_FMT_RGB888_1X24);

	imx_drm_set_bus_format(encoder, MEDIA_BUS_FMT_RGB888_1X24);

}



static struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = {

drivers/gpu/drm/imx/imx-drm-core.c

+7 −7
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ static struct imx_drm_crtc *imx_drm_find_crtc(struct drm_crtc *crtc) 
	return NULL;

}



int imx_drm_panel_format_pins(struct drm_encoder *encoder,

		u32 interface_pix_fmt, int hsync_pin, int vsync_pin)

int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, u32 bus_format,

		int hsync_pin, int vsync_pin)

{

	struct imx_drm_crtc_helper_funcs *helper;

	struct imx_drm_crtc *imx_crtc;
@@ -116,16 +116,16 @@ int imx_drm_panel_format_pins(struct drm_encoder *encoder, 
	helper = &imx_crtc->imx_drm_helper_funcs;

	if (helper->set_interface_pix_fmt)

		return helper->set_interface_pix_fmt(encoder->crtc,

				interface_pix_fmt, hsync_pin, vsync_pin);

					bus_format, hsync_pin, vsync_pin);

	return 0;

}

EXPORT_SYMBOL_GPL(imx_drm_panel_format_pins);

EXPORT_SYMBOL_GPL(imx_drm_set_bus_format_pins);



int imx_drm_panel_format(struct drm_encoder *encoder, u32 interface_pix_fmt)

int imx_drm_set_bus_format(struct drm_encoder *encoder, u32 bus_format)

{

	return imx_drm_panel_format_pins(encoder, interface_pix_fmt, 2, 3);

	return imx_drm_set_bus_format_pins(encoder, bus_format, 2, 3);

}

EXPORT_SYMBOL_GPL(imx_drm_panel_format);

EXPORT_SYMBOL_GPL(imx_drm_set_bus_format);



int imx_drm_crtc_vblank_get(struct imx_drm_crtc *imx_drm_crtc)

{

drivers/gpu/drm/imx/imx-drm.h

+5 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ struct imx_drm_crtc_helper_funcs { 
	int (*enable_vblank)(struct drm_crtc *crtc);

	void (*disable_vblank)(struct drm_crtc *crtc);

	int (*set_interface_pix_fmt)(struct drm_crtc *crtc,

			u32 pix_fmt, int hsync_pin, int vsync_pin);

			u32 bus_format, int hsync_pin, int vsync_pin);

	const struct drm_crtc_helper_funcs *crtc_helper_funcs;

	const struct drm_crtc_funcs *crtc_funcs;

};
@@ -40,10 +40,10 @@ void imx_drm_mode_config_init(struct drm_device *drm); 


struct drm_gem_cma_object *imx_drm_fb_get_obj(struct drm_framebuffer *fb);



int imx_drm_panel_format_pins(struct drm_encoder *encoder,

		u32 interface_pix_fmt, int hsync_pin, int vsync_pin);

int imx_drm_panel_format(struct drm_encoder *encoder,

		u32 interface_pix_fmt);

int imx_drm_set_bus_format_pins(struct drm_encoder *encoder,

		u32 bus_format, int hsync_pin, int vsync_pin);

int imx_drm_set_bus_format(struct drm_encoder *encoder,

		u32 bus_format);



int imx_drm_encoder_get_mux_id(struct device_node *node,

		struct drm_encoder *encoder);

drivers/gpu/drm/imx/imx-ldb.c

+5 −5
Original line number Diff line number Diff line
@@ -163,24 +163,24 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder) 
{

	struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);

	struct imx_ldb *ldb = imx_ldb_ch->ldb;

	u32 pixel_fmt;

	u32 bus_format;



	switch (imx_ldb_ch->chno) {

	case 0:

		pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH0_24) ?

		bus_format = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH0_24) ?

			MEDIA_BUS_FMT_RGB888_1X24 : MEDIA_BUS_FMT_RGB666_1X18;

		break;

	case 1:

		pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH1_24) ?

		bus_format = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH1_24) ?

			MEDIA_BUS_FMT_RGB888_1X24 : MEDIA_BUS_FMT_RGB666_1X18;

		break;

	default:

		dev_err(ldb->dev, "unable to config di%d panel format\n",

			imx_ldb_ch->chno);

		pixel_fmt = MEDIA_BUS_FMT_RGB888_1X24;

		bus_format = MEDIA_BUS_FMT_RGB888_1X24;

	}



	imx_drm_panel_format(encoder, pixel_fmt);

	imx_drm_set_bus_format(encoder, bus_format);

}



static void imx_ldb_encoder_commit(struct drm_encoder *encoder)

drivers/gpu/drm/imx/imx-tve.c

+3 −3
Original line number Diff line number Diff line
@@ -301,11 +301,11 @@ static void imx_tve_encoder_prepare(struct drm_encoder *encoder) 


	switch (tve->mode) {

	case TVE_MODE_VGA:

		imx_drm_panel_format_pins(encoder, MEDIA_BUS_FMT_YUV8_1X24,

		imx_drm_set_bus_format_pins(encoder, MEDIA_BUS_FMT_YUV8_1X24,

					    tve->hsync_pin, tve->vsync_pin);

		break;

	case TVE_MODE_TVOUT:

		imx_drm_panel_format(encoder, MEDIA_BUS_FMT_YUV8_1X24);

		imx_drm_set_bus_format(encoder, MEDIA_BUS_FMT_YUV8_1X24);

		break;

	}

}