Commit a25b6b27 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/panel: Use dev_ based logging 



Standardize on the dev_ based logging and drop the include of drm_print.h.
Fix a few cases where "x@" was used when printing the mode.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarGuido Günther <agx@sigxcpu.org>
Cc: Jerry Han <hanxu5@huaqin.corp-partner.google.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Icenowy Zheng <icenowy@aosc.io>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Guido Günther <agx@sigxcpu.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200815125406.1153224-6-sam@ravnborg.org
parent 65d5c86f

drivers/gpu/drm/panel/panel-boe-himax8279d.c

+15 −29
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <drm/drm_mipi_dsi.h>

#include <drm/drm_modes.h>

#include <drm/drm_panel.h>

#include <drm/drm_print.h>



#include <video/mipi_display.h>
@@ -93,8 +92,7 @@ static int boe_panel_disable(struct drm_panel *panel) 


	err = mipi_dsi_dcs_set_display_off(pinfo->link);

	if (err < 0) {

		DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",

			      err);

		dev_err(panel->dev, "failed to set display off: %d\n", err);

		return err;

	}
@@ -113,13 +111,11 @@ static int boe_panel_unprepare(struct drm_panel *panel) 


	err = mipi_dsi_dcs_set_display_off(pinfo->link);

	if (err < 0)

		DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",

			      err);

		dev_err(panel->dev, "failed to set display off: %d\n", err);



	err = mipi_dsi_dcs_enter_sleep_mode(pinfo->link);

	if (err < 0)

		DRM_DEV_ERROR(panel->dev, "failed to enter sleep mode: %d\n",

			      err);

		dev_err(panel->dev, "failed to enter sleep mode: %d\n", err);



	/* sleep_mode_delay: 1ms - 2ms */

	usleep_range(1000, 2000);
@@ -163,15 +159,13 @@ static int boe_panel_prepare(struct drm_panel *panel) 
	/* send init code */

	err = send_mipi_cmds(panel, pinfo->desc->on_cmds);

	if (err < 0) {

		DRM_DEV_ERROR(panel->dev, "failed to send DCS Init Code: %d\n",

			      err);

		dev_err(panel->dev, "failed to send DCS Init Code: %d\n", err);

		goto poweroff;

	}



	err = mipi_dsi_dcs_exit_sleep_mode(pinfo->link);

	if (err < 0) {

		DRM_DEV_ERROR(panel->dev, "failed to exit sleep mode: %d\n",

			      err);

		dev_err(panel->dev, "failed to exit sleep mode: %d\n", err);

		goto poweroff;

	}
@@ -180,8 +174,7 @@ static int boe_panel_prepare(struct drm_panel *panel) 


	err = mipi_dsi_dcs_set_display_on(pinfo->link);

	if (err < 0) {

		DRM_DEV_ERROR(panel->dev, "failed to set display on: %d\n",

			      err);

		dev_err(panel->dev, "failed to set display on: %d\n", err);

		goto poweroff;

	}
@@ -209,8 +202,7 @@ static int boe_panel_enable(struct drm_panel *panel) 


	ret = mipi_dsi_dcs_set_display_on(pinfo->link);

	if (ret < 0) {

		DRM_DEV_ERROR(panel->dev, "failed to set display on: %d\n",

			      ret);

		dev_err(panel->dev, "failed to set display on: %d\n", ret);

		return ret;

	}
@@ -228,7 +220,7 @@ static int boe_panel_get_modes(struct drm_panel *panel, 


	mode = drm_mode_duplicate(connector->dev, m);

	if (!mode) {

		DRM_DEV_ERROR(pinfo->base.dev, "failed to add mode %ux%u@%u\n",

		dev_err(pinfo->base.dev, "failed to add mode %ux%u@%u\n",

			m->hdisplay, m->vdisplay, drm_mode_vrefresh(m));

		return -ENOMEM;

	}
@@ -865,8 +857,7 @@ static int panel_add(struct panel_info *pinfo) 
	if (IS_ERR(pinfo->pp18_gpio)) {

		ret = PTR_ERR(pinfo->pp18_gpio);

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev, "failed to get pp18 gpio: %d\n",

				      ret);

			dev_err(dev, "failed to get pp18 gpio: %d\n", ret);

		return ret;

	}
@@ -874,8 +865,7 @@ static int panel_add(struct panel_info *pinfo) 
	if (IS_ERR(pinfo->pp33_gpio)) {

		ret = PTR_ERR(pinfo->pp33_gpio);

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev, "failed to get pp33 gpio: %d\n",

				      ret);

			dev_err(dev, "failed to get pp33 gpio: %d\n", ret);

		return ret;

	}
@@ -883,8 +873,7 @@ static int panel_add(struct panel_info *pinfo) 
	if (IS_ERR(pinfo->enable_gpio)) {

		ret = PTR_ERR(pinfo->enable_gpio);

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev, "failed to get enable gpio: %d\n",

				      ret);

			dev_err(dev, "failed to get enable gpio: %d\n", ret);

		return ret;

	}
@@ -937,18 +926,15 @@ static int panel_remove(struct mipi_dsi_device *dsi) 


	err = boe_panel_disable(&pinfo->base);

	if (err < 0)

		DRM_DEV_ERROR(&dsi->dev, "failed to disable panel: %d\n",

			      err);

		dev_err(&dsi->dev, "failed to disable panel: %d\n", err);



	err = boe_panel_unprepare(&pinfo->base);

	if (err < 0)

		DRM_DEV_ERROR(&dsi->dev, "failed to unprepare panel: %d\n",

			      err);

		dev_err(&dsi->dev, "failed to unprepare panel: %d\n", err);



	err = mipi_dsi_detach(dsi);

	if (err < 0)

		DRM_DEV_ERROR(&dsi->dev, "failed to detach from DSI host: %d\n",

			      err);

		dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", err);



	drm_panel_remove(&pinfo->base);

drivers/gpu/drm/panel/panel-elida-kd35t133.c

+19 −32
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <drm/drm_mipi_dsi.h>

#include <drm/drm_modes.h>

#include <drm/drm_panel.h>

#include <drm/drm_print.h>



/* Manufacturer specific Commands send via DSI */

#define KD35T133_CMD_INTERFACEMODECTRL		0xb0
@@ -89,7 +88,7 @@ static int kd35t133_init_sequence(struct kd35t133 *ctx) 
			  0xa9, 0x51, 0x2c, 0x82);

	mipi_dsi_dcs_write(dsi, MIPI_DCS_ENTER_INVERT_MODE, NULL, 0);



	DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n");

	dev_dbg(dev, "Panel init sequence done\n");

	return 0;

}
@@ -104,13 +103,11 @@ static int kd35t133_unprepare(struct drm_panel *panel) 


	ret = mipi_dsi_dcs_set_display_off(dsi);

	if (ret < 0)

		DRM_DEV_ERROR(ctx->dev, "failed to set display off: %d\n",

			      ret);

		dev_err(ctx->dev, "failed to set display off: %d\n", ret);



	ret = mipi_dsi_dcs_enter_sleep_mode(dsi);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev, "failed to enter sleep mode: %d\n",

			      ret);

		dev_err(ctx->dev, "failed to enter sleep mode: %d\n", ret);

		return ret;

	}
@@ -131,18 +128,16 @@ static int kd35t133_prepare(struct drm_panel *panel) 
	if (ctx->prepared)

		return 0;



	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Resetting the panel\n");

	dev_dbg(ctx->dev, "Resetting the panel\n");

	ret = regulator_enable(ctx->vdd);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev,

			      "Failed to enable vdd supply: %d\n", ret);

		dev_err(ctx->dev, "Failed to enable vdd supply: %d\n", ret);

		return ret;

	}



	ret = regulator_enable(ctx->iovcc);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev,

			      "Failed to enable iovcc supply: %d\n", ret);

		dev_err(ctx->dev, "Failed to enable iovcc supply: %d\n", ret);

		goto disable_vdd;

	}
@@ -156,7 +151,7 @@ static int kd35t133_prepare(struct drm_panel *panel) 


	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev, "Failed to exit sleep mode: %d\n", ret);

		dev_err(ctx->dev, "Failed to exit sleep mode: %d\n", ret);

		goto disable_iovcc;

	}
@@ -164,14 +159,13 @@ static int kd35t133_prepare(struct drm_panel *panel) 


	ret = kd35t133_init_sequence(ctx);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n",

			      ret);

		dev_err(ctx->dev, "Panel init sequence failed: %d\n", ret);

		goto disable_iovcc;

	}



	ret = mipi_dsi_dcs_set_display_on(dsi);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev, "Failed to set display on: %d\n", ret);

		dev_err(ctx->dev, "Failed to set display on: %d\n", ret);

		goto disable_iovcc;

	}
@@ -210,7 +204,7 @@ static int kd35t133_get_modes(struct drm_panel *panel, 


	mode = drm_mode_duplicate(connector->dev, &default_mode);

	if (!mode) {

		DRM_DEV_ERROR(ctx->dev, "Failed to add mode %ux%u@%u\n",

		dev_err(ctx->dev, "Failed to add mode %ux%u@%u\n",

			default_mode.hdisplay, default_mode.vdisplay,

			drm_mode_vrefresh(&default_mode));

		return -ENOMEM;
@@ -244,7 +238,7 @@ static int kd35t133_probe(struct mipi_dsi_device *dsi) 


	ctx->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(ctx->reset_gpio)) {

		DRM_DEV_ERROR(dev, "cannot get reset gpio\n");

		dev_err(dev, "cannot get reset gpio\n");

		return PTR_ERR(ctx->reset_gpio);

	}
@@ -252,9 +246,7 @@ static int kd35t133_probe(struct mipi_dsi_device *dsi) 
	if (IS_ERR(ctx->vdd)) {

		ret = PTR_ERR(ctx->vdd);

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev,

				      "Failed to request vdd regulator: %d\n",

				      ret);

			dev_err(dev, "Failed to request vdd regulator: %d\n", ret);

		return ret;

	}
@@ -262,9 +254,7 @@ static int kd35t133_probe(struct mipi_dsi_device *dsi) 
	if (IS_ERR(ctx->iovcc)) {

		ret = PTR_ERR(ctx->iovcc);

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev,

				      "Failed to request iovcc regulator: %d\n",

				      ret);

			dev_err(dev, "Failed to request iovcc regulator: %d\n", ret);

		return ret;

	}
@@ -288,7 +278,7 @@ static int kd35t133_probe(struct mipi_dsi_device *dsi) 


	ret = mipi_dsi_attach(dsi);

	if (ret < 0) {

		DRM_DEV_ERROR(dev, "mipi_dsi_attach failed: %d\n", ret);

		dev_err(dev, "mipi_dsi_attach failed: %d\n", ret);

		drm_panel_remove(&ctx->panel);

		return ret;

	}
@@ -303,13 +293,11 @@ static void kd35t133_shutdown(struct mipi_dsi_device *dsi) 


	ret = drm_panel_unprepare(&ctx->panel);

	if (ret < 0)

		DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n",

			      ret);

		dev_err(&dsi->dev, "Failed to unprepare panel: %d\n", ret);



	ret = drm_panel_disable(&ctx->panel);

	if (ret < 0)

		DRM_DEV_ERROR(&dsi->dev, "Failed to disable panel: %d\n",

			      ret);

		dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);

}



static int kd35t133_remove(struct mipi_dsi_device *dsi)
@@ -321,8 +309,7 @@ static int kd35t133_remove(struct mipi_dsi_device *dsi) 


	ret = mipi_dsi_detach(dsi);

	if (ret < 0)

		DRM_DEV_ERROR(&dsi->dev, "Failed to detach from DSI host: %d\n",

			      ret);

		dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);



	drm_panel_remove(&ctx->panel);

drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c

+8 −11
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <drm/drm_mipi_dsi.h>

#include <drm/drm_modes.h>

#include <drm/drm_panel.h>

#include <drm/drm_print.h>



#define K101_IM2BA02_INIT_CMD_LEN	2
@@ -374,13 +373,11 @@ static int k101_im2ba02_unprepare(struct drm_panel *panel) 


	ret = mipi_dsi_dcs_set_display_off(ctx->dsi);

	if (ret < 0)

		DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",

			      ret);

		dev_err(panel->dev, "failed to set display off: %d\n", ret);



	ret = mipi_dsi_dcs_enter_sleep_mode(ctx->dsi);

	if (ret < 0)

		DRM_DEV_ERROR(panel->dev, "failed to enter sleep mode: %d\n",

			      ret);

		dev_err(panel->dev, "failed to enter sleep mode: %d\n", ret);



	msleep(200);
@@ -416,7 +413,7 @@ static int k101_im2ba02_get_modes(struct drm_panel *panel, 


	mode = drm_mode_duplicate(connector->dev, &k101_im2ba02_default_mode);

	if (!mode) {

		DRM_DEV_ERROR(&ctx->dsi->dev, "failed to add mode %ux%ux@%u\n",

		dev_err(&ctx->dsi->dev, "failed to add mode %ux%u@%u\n",

			k101_im2ba02_default_mode.hdisplay,

			k101_im2ba02_default_mode.vdisplay,

			drm_mode_vrefresh(&k101_im2ba02_default_mode));
@@ -460,13 +457,13 @@ static int k101_im2ba02_dsi_probe(struct mipi_dsi_device *dsi) 
	ret = devm_regulator_bulk_get(&dsi->dev, ARRAY_SIZE(ctx->supplies),

				      ctx->supplies);

	if (ret < 0) {

		DRM_DEV_ERROR(&dsi->dev, "Couldn't get regulators\n");

		dev_err(&dsi->dev, "Couldn't get regulators\n");

		return ret;

	}



	ctx->reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(ctx->reset)) {

		DRM_DEV_ERROR(&dsi->dev, "Couldn't get our reset GPIO\n");

		dev_err(&dsi->dev, "Couldn't get our reset GPIO\n");

		return PTR_ERR(ctx->reset);

	}

drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c

+9 −12
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <drm/drm_mipi_dsi.h>

#include <drm/drm_modes.h>

#include <drm/drm_panel.h>

#include <drm/drm_print.h>



#include <linux/gpio/consumer.h>

#include <linux/delay.h>
@@ -118,13 +117,11 @@ static int feiyang_unprepare(struct drm_panel *panel) 


	ret = mipi_dsi_dcs_set_display_off(ctx->dsi);

	if (ret < 0)

		DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",

			      ret);

		dev_err(panel->dev, "failed to set display off: %d\n", ret);



	ret = mipi_dsi_dcs_enter_sleep_mode(ctx->dsi);

	if (ret < 0)

		DRM_DEV_ERROR(panel->dev, "failed to enter sleep mode: %d\n",

			      ret);

		dev_err(panel->dev, "failed to enter sleep mode: %d\n", ret);



	/* T13 (backlight fall + video & logic signal fall) T13 >= 200ms */

	msleep(200);
@@ -165,7 +162,7 @@ static int feiyang_get_modes(struct drm_panel *panel, 


	mode = drm_mode_duplicate(connector->dev, &feiyang_default_mode);

	if (!mode) {

		DRM_DEV_ERROR(&ctx->dsi->dev, "failed to add mode %ux%ux@%u\n",

		dev_err(&ctx->dsi->dev, "failed to add mode %ux%u@%u\n",

			feiyang_default_mode.hdisplay,

			feiyang_default_mode.vdisplay,

			drm_mode_vrefresh(&feiyang_default_mode));
@@ -204,19 +201,19 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi) 


	ctx->dvdd = devm_regulator_get(&dsi->dev, "dvdd");

	if (IS_ERR(ctx->dvdd)) {

		DRM_DEV_ERROR(&dsi->dev, "Couldn't get dvdd regulator\n");

		dev_err(&dsi->dev, "Couldn't get dvdd regulator\n");

		return PTR_ERR(ctx->dvdd);

	}



	ctx->avdd = devm_regulator_get(&dsi->dev, "avdd");

	if (IS_ERR(ctx->avdd)) {

		DRM_DEV_ERROR(&dsi->dev, "Couldn't get avdd regulator\n");

		dev_err(&dsi->dev, "Couldn't get avdd regulator\n");

		return PTR_ERR(ctx->avdd);

	}



	ctx->reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(ctx->reset)) {

		DRM_DEV_ERROR(&dsi->dev, "Couldn't get our reset GPIO\n");

		dev_err(&dsi->dev, "Couldn't get our reset GPIO\n");

		return PTR_ERR(ctx->reset);

	}

drivers/gpu/drm/panel/panel-ilitek-ili9322.c

+1 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


#include <drm/drm_modes.h>

#include <drm/drm_panel.h>

#include <drm/drm_print.h>



#define ILI9322_CHIP_ID			0x00

#define ILI9322_CHIP_ID_MAGIC		0x96
@@ -683,7 +682,7 @@ static int ili9322_get_modes(struct drm_panel *panel, 
		break;

	}

	if (!mode) {

		DRM_ERROR("bad mode or failed to add mode\n");

		dev_err(panel->dev, "bad mode or failed to add mode\n");

		return -EINVAL;

	}

	drm_mode_set_name(mode);