Unverified Commit 1b633553 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas
Browse files

drm/panel-jdi-fhd-r63452: Drop custom DSI write macros 



There are macros for these already in the <drm/drm_mipi_dsi.h> header, use
that instead and delete the custom DSI write macros defined in the driver.

Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230107191822.3787147-8-javierm@redhat.com
parent b541a6d5

drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c

+21 −37
Original line number Diff line number Diff line
@@ -29,22 +29,6 @@ static inline struct jdi_fhd_r63452 *to_jdi_fhd_r63452(struct drm_panel *panel) 
	return container_of(panel, struct jdi_fhd_r63452, panel);

}



#define dsi_generic_write_seq(dsi, seq...) do {				\

		static const u8 d[] = { seq };				\

		int ret;						\

		ret = mipi_dsi_generic_write(dsi, d, ARRAY_SIZE(d));	\

		if (ret < 0)						\

			return ret;					\

	} while (0)



#define dsi_dcs_write_seq(dsi, seq...) do {				\

		static const u8 d[] = { seq };				\

		int ret;						\

		ret = mipi_dsi_dcs_write_buffer(dsi, d, ARRAY_SIZE(d));	\

		if (ret < 0)						\

			return ret;					\

	} while (0)



static void jdi_fhd_r63452_reset(struct jdi_fhd_r63452 *ctx)

{

	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
@@ -63,12 +47,12 @@ static int jdi_fhd_r63452_on(struct jdi_fhd_r63452 *ctx) 


	dsi->mode_flags |= MIPI_DSI_MODE_LPM;



	dsi_generic_write_seq(dsi, 0xb0, 0x00);

	dsi_generic_write_seq(dsi, 0xd6, 0x01);

	dsi_generic_write_seq(dsi, 0xec,

	mipi_dsi_generic_write_seq(dsi, 0xb0, 0x00);

	mipi_dsi_generic_write_seq(dsi, 0xd6, 0x01);

	mipi_dsi_generic_write_seq(dsi, 0xec,

				   0x64, 0xdc, 0xec, 0x3b, 0x52, 0x00, 0x0b, 0x0b,

				   0x13, 0x15, 0x68, 0x0b, 0xb5);

	dsi_generic_write_seq(dsi, 0xb0, 0x03);

	mipi_dsi_generic_write_seq(dsi, 0xb0, 0x03);



	ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);

	if (ret < 0) {
@@ -76,7 +60,7 @@ static int jdi_fhd_r63452_on(struct jdi_fhd_r63452 *ctx) 
		return ret;

	}



	dsi_dcs_write_seq(dsi, MIPI_DCS_SET_ADDRESS_MODE, 0x00);

	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_SET_ADDRESS_MODE, 0x00);



	ret = mipi_dsi_dcs_set_pixel_format(dsi, 0x77);

	if (ret < 0) {
@@ -108,10 +92,10 @@ static int jdi_fhd_r63452_on(struct jdi_fhd_r63452 *ctx) 
		return ret;

	}



	dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x24);

	dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_POWER_SAVE, 0x00);

	dsi_dcs_write_seq(dsi, MIPI_DCS_SET_CABC_MIN_BRIGHTNESS, 0x00);

	dsi_dcs_write_seq(dsi, 0x84, 0x00);

	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x24);

	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_POWER_SAVE, 0x00);

	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_SET_CABC_MIN_BRIGHTNESS, 0x00);

	mipi_dsi_dcs_write_seq(dsi, 0x84, 0x00);



	ret = mipi_dsi_dcs_set_display_on(dsi);

	if (ret < 0) {
@@ -127,10 +111,10 @@ static int jdi_fhd_r63452_on(struct jdi_fhd_r63452 *ctx) 
	}

	msleep(80);



	dsi_generic_write_seq(dsi, 0xb0, 0x04);

	dsi_dcs_write_seq(dsi, 0x84, 0x00);

	dsi_generic_write_seq(dsi, 0xc8, 0x11);

	dsi_generic_write_seq(dsi, 0xb0, 0x03);

	mipi_dsi_generic_write_seq(dsi, 0xb0, 0x04);

	mipi_dsi_dcs_write_seq(dsi, 0x84, 0x00);

	mipi_dsi_generic_write_seq(dsi, 0xc8, 0x11);

	mipi_dsi_generic_write_seq(dsi, 0xb0, 0x03);



	return 0;

}
@@ -143,12 +127,12 @@ static int jdi_fhd_r63452_off(struct jdi_fhd_r63452 *ctx) 


	dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;



	dsi_generic_write_seq(dsi, 0xb0, 0x00);

	dsi_generic_write_seq(dsi, 0xd6, 0x01);

	dsi_generic_write_seq(dsi, 0xec,

	mipi_dsi_generic_write_seq(dsi, 0xb0, 0x00);

	mipi_dsi_generic_write_seq(dsi, 0xd6, 0x01);

	mipi_dsi_generic_write_seq(dsi, 0xec,

				   0x64, 0xdc, 0xec, 0x3b, 0x52, 0x00, 0x0b, 0x0b,

				   0x13, 0x15, 0x68, 0x0b, 0x95);

	dsi_generic_write_seq(dsi, 0xb0, 0x03);

	mipi_dsi_generic_write_seq(dsi, 0xb0, 0x03);



	ret = mipi_dsi_dcs_set_display_off(dsi);

	if (ret < 0) {