Skip to content

L
linux
Commit b75efff5 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files
Options

drm/panel: leadtek: 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: Thierry Reding <thierry.reding@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Guido Günther <agx@sigxcpu.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200815125406.1153224-3-sam@ravnborg.org
parent 5936b3bd
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 70 deletions
drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c
View file @ b75efff5
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <drm/drm_mipi_dsi.h> #include <drm/drm_mipi_dsi.h>
#include <drm/drm_modes.h> #include <drm/drm_modes.h>
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h>
struct ltk050h3146w_cmd { struct ltk050h3146w_cmd {
char cmd; char cmd;
...@@ -314,8 +313,7 @@ static int ltk050h3146w_init_sequence(struct ltk050h3146w *ctx) ...@@ -314,8 +313,7 @@ static int ltk050h3146w_init_sequence(struct ltk050h3146w *ctx)
ret = mipi_dsi_dcs_set_tear_on(dsi, 1); ret = mipi_dsi_dcs_set_tear_on(dsi, 1);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, "failed to set tear on: %d\n", dev_err(ctx->dev, "failed to set tear on: %d\n", ret);
ret);
return ret; return ret;
} }
...@@ -360,8 +358,7 @@ static int ltk050h3146w_a2_write_page(struct ltk050h3146w *ctx, int page, ...@@ -360,8 +358,7 @@ static int ltk050h3146w_a2_write_page(struct ltk050h3146w *ctx, int page,
ret = ltk050h3146w_a2_select_page(ctx, page); ret = ltk050h3146w_a2_select_page(ctx, page);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, "failed to select page %d: %d\n", dev_err(ctx->dev, "failed to select page %d: %d\n", page, ret);
page, ret);
return ret; return ret;
} }
...@@ -369,9 +366,7 @@ static int ltk050h3146w_a2_write_page(struct ltk050h3146w *ctx, int page, ...@@ -369,9 +366,7 @@ static int ltk050h3146w_a2_write_page(struct ltk050h3146w *ctx, int page,
ret = mipi_dsi_generic_write(dsi, &cmds[i], ret = mipi_dsi_generic_write(dsi, &cmds[i],
sizeof(struct ltk050h3146w_cmd)); sizeof(struct ltk050h3146w_cmd));
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, dev_err(ctx->dev, "failed to write page %d init cmds: %d\n", page, ret);
"failed to write page %d init cmds: %d\n",
page, ret);
return ret; return ret;
} }
} }
...@@ -405,15 +400,14 @@ static int ltk050h3146w_a2_init_sequence(struct ltk050h3146w *ctx) ...@@ -405,15 +400,14 @@ static int ltk050h3146w_a2_init_sequence(struct ltk050h3146w *ctx)
ret = ltk050h3146w_a2_select_page(ctx, 0); ret = ltk050h3146w_a2_select_page(ctx, 0);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, "failed to select page 0: %d\n", ret); dev_err(ctx->dev, "failed to select page 0: %d\n", ret);
return ret; return ret;
} }
/* vendor code called this without param, where there should be one */ /* vendor code called this without param, where there should be one */
ret = mipi_dsi_dcs_set_tear_on(dsi, 0); ret = mipi_dsi_dcs_set_tear_on(dsi, 0);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, "failed to set tear on: %d\n", dev_err(ctx->dev, "failed to set tear on: %d\n", ret);
ret);
return ret; return ret;
} }
...@@ -452,15 +446,13 @@ static int ltk050h3146w_unprepare(struct drm_panel *panel) ...@@ -452,15 +446,13 @@ static int ltk050h3146w_unprepare(struct drm_panel *panel)
ret = mipi_dsi_dcs_set_display_off(dsi); ret = mipi_dsi_dcs_set_display_off(dsi);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, "failed to set display off: %d\n", dev_err(ctx->dev, "failed to set display off: %d\n", ret);
ret);
return ret; return ret;
} }
mipi_dsi_dcs_enter_sleep_mode(dsi); mipi_dsi_dcs_enter_sleep_mode(dsi);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, "failed to enter sleep mode: %d\n", dev_err(ctx->dev, "failed to enter sleep mode: %d\n", ret);
ret);
return ret; return ret;
} }
...@@ -481,17 +473,15 @@ static int ltk050h3146w_prepare(struct drm_panel *panel) ...@@ -481,17 +473,15 @@ static int ltk050h3146w_prepare(struct drm_panel *panel)
if (ctx->prepared) if (ctx->prepared)
return 0; return 0;
DRM_DEV_DEBUG_DRIVER(ctx->dev, "Resetting the panel\n"); dev_dbg(ctx->dev, "Resetting the panel\n");
ret = regulator_enable(ctx->vci); ret = regulator_enable(ctx->vci);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, dev_err(ctx->dev, "Failed to enable vci supply: %d\n", ret);
"Failed to enable vci supply: %d\n", ret);
return ret; return ret;
} }
ret = regulator_enable(ctx->iovcc); ret = regulator_enable(ctx->iovcc);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, dev_err(ctx->dev, "Failed to enable iovcc supply: %d\n", ret);
"Failed to enable iovcc supply: %d\n", ret);
goto disable_vci; goto disable_vci;
} }
...@@ -502,14 +492,13 @@ static int ltk050h3146w_prepare(struct drm_panel *panel) ...@@ -502,14 +492,13 @@ static int ltk050h3146w_prepare(struct drm_panel *panel)
ret = ctx->panel_desc->init(ctx); ret = ctx->panel_desc->init(ctx);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n", dev_err(ctx->dev, "Panel init sequence failed: %d\n", ret);
ret);
goto disable_iovcc; goto disable_iovcc;
} }
ret = mipi_dsi_dcs_exit_sleep_mode(dsi); ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
if (ret < 0) { 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; goto disable_iovcc;
} }
...@@ -518,7 +507,7 @@ static int ltk050h3146w_prepare(struct drm_panel *panel) ...@@ -518,7 +507,7 @@ static int ltk050h3146w_prepare(struct drm_panel *panel)
ret = mipi_dsi_dcs_set_display_on(dsi); ret = mipi_dsi_dcs_set_display_on(dsi);
if (ret < 0) { 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; goto disable_iovcc;
} }
...@@ -577,7 +566,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi) ...@@ -577,7 +566,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi)
ctx->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); ctx->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(ctx->reset_gpio)) { 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); return PTR_ERR(ctx->reset_gpio);
} }
...@@ -585,9 +574,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi) ...@@ -585,9 +574,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi)
if (IS_ERR(ctx->vci)) { if (IS_ERR(ctx->vci)) {
ret = PTR_ERR(ctx->vci); ret = PTR_ERR(ctx->vci);
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev, dev_err(dev, "Failed to request vci regulator: %d\n", ret);
"Failed to request vci regulator: %d\n",
ret);
return ret; return ret;
} }
...@@ -595,9 +582,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi) ...@@ -595,9 +582,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi)
if (IS_ERR(ctx->iovcc)) { if (IS_ERR(ctx->iovcc)) {
ret = PTR_ERR(ctx->iovcc); ret = PTR_ERR(ctx->iovcc);
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev, dev_err(dev, "Failed to request iovcc regulator: %d\n", ret);
"Failed to request iovcc regulator: %d\n",
ret);
return ret; return ret;
} }
...@@ -621,7 +606,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi) ...@@ -621,7 +606,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi)
ret = mipi_dsi_attach(dsi); ret = mipi_dsi_attach(dsi);
if (ret < 0) { 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); drm_panel_remove(&ctx->panel);
return ret; return ret;
} }
...@@ -636,13 +621,11 @@ static void ltk050h3146w_shutdown(struct mipi_dsi_device *dsi) ...@@ -636,13 +621,11 @@ static void ltk050h3146w_shutdown(struct mipi_dsi_device *dsi)
ret = drm_panel_unprepare(&ctx->panel); ret = drm_panel_unprepare(&ctx->panel);
if (ret < 0) if (ret < 0)
DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n", dev_err(&dsi->dev, "Failed to unprepare panel: %d\n", ret);
ret);
ret = drm_panel_disable(&ctx->panel); ret = drm_panel_disable(&ctx->panel);
if (ret < 0) if (ret < 0)
DRM_DEV_ERROR(&dsi->dev, "Failed to disable panel: %d\n", dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);
ret);
} }
static int ltk050h3146w_remove(struct mipi_dsi_device *dsi) static int ltk050h3146w_remove(struct mipi_dsi_device *dsi)
...@@ -654,8 +637,7 @@ static int ltk050h3146w_remove(struct mipi_dsi_device *dsi) ...@@ -654,8 +637,7 @@ static int ltk050h3146w_remove(struct mipi_dsi_device *dsi)
ret = mipi_dsi_detach(dsi); ret = mipi_dsi_detach(dsi);
if (ret < 0) if (ret < 0)
DRM_DEV_ERROR(&dsi->dev, "Failed to detach from DSI host: %d\n", dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
ret);
drm_panel_remove(&ctx->panel); drm_panel_remove(&ctx->panel);
......
drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c
View file @ b75efff5
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <drm/drm_mipi_dsi.h> #include <drm/drm_mipi_dsi.h>
#include <drm/drm_modes.h> #include <drm/drm_modes.h>
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h>
struct ltk500hd1829 { struct ltk500hd1829 {
struct device *dev; struct device *dev;
...@@ -278,13 +277,11 @@ static int ltk500hd1829_unprepare(struct drm_panel *panel) ...@@ -278,13 +277,11 @@ static int ltk500hd1829_unprepare(struct drm_panel *panel)
ret = mipi_dsi_dcs_set_display_off(dsi); ret = mipi_dsi_dcs_set_display_off(dsi);
if (ret < 0) if (ret < 0)
DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n", dev_err(panel->dev, "failed to set display off: %d\n", ret);
ret);
ret = mipi_dsi_dcs_enter_sleep_mode(dsi); ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(panel->dev, "failed to enter sleep mode: %d\n", dev_err(panel->dev, "failed to enter sleep mode: %d\n", ret);
ret);
} }
/* 120ms to enter sleep mode */ /* 120ms to enter sleep mode */
...@@ -310,14 +307,12 @@ static int ltk500hd1829_prepare(struct drm_panel *panel) ...@@ -310,14 +307,12 @@ static int ltk500hd1829_prepare(struct drm_panel *panel)
ret = regulator_enable(ctx->vcc); ret = regulator_enable(ctx->vcc);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, dev_err(ctx->dev, "Failed to enable vci supply: %d\n", ret);
"Failed to enable vci supply: %d\n", ret);
return ret; return ret;
} }
ret = regulator_enable(ctx->iovcc); ret = regulator_enable(ctx->iovcc);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(ctx->dev, dev_err(ctx->dev, "Failed to enable iovcc supply: %d\n", ret);
"Failed to enable iovcc supply: %d\n", ret);
goto disable_vcc; goto disable_vcc;
} }
...@@ -333,16 +328,14 @@ static int ltk500hd1829_prepare(struct drm_panel *panel) ...@@ -333,16 +328,14 @@ static int ltk500hd1829_prepare(struct drm_panel *panel)
ret = mipi_dsi_generic_write(dsi, &init_code[i], ret = mipi_dsi_generic_write(dsi, &init_code[i],
sizeof(struct ltk500hd1829_cmd)); sizeof(struct ltk500hd1829_cmd));
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(panel->dev, dev_err(panel->dev, "failed to write init cmds: %d\n", ret);
"failed to write init cmds: %d\n", ret);
goto disable_iovcc; goto disable_iovcc;
} }
} }
ret = mipi_dsi_dcs_exit_sleep_mode(dsi); ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(panel->dev, "failed to exit sleep mode: %d\n", dev_err(panel->dev, "failed to exit sleep mode: %d\n", ret);
ret);
goto disable_iovcc; goto disable_iovcc;
} }
...@@ -351,8 +344,7 @@ static int ltk500hd1829_prepare(struct drm_panel *panel) ...@@ -351,8 +344,7 @@ static int ltk500hd1829_prepare(struct drm_panel *panel)
ret = mipi_dsi_dcs_set_display_on(dsi); ret = mipi_dsi_dcs_set_display_on(dsi);
if (ret < 0) { if (ret < 0) {
DRM_DEV_ERROR(panel->dev, "failed to set display on: %d\n", dev_err(panel->dev, "failed to set display on: %d\n", ret);
ret);
goto disable_iovcc; goto disable_iovcc;
} }
...@@ -389,9 +381,9 @@ static int ltk500hd1829_get_modes(struct drm_panel *panel, ...@@ -389,9 +381,9 @@ static int ltk500hd1829_get_modes(struct drm_panel *panel,
mode = drm_mode_duplicate(connector->dev, &default_mode); mode = drm_mode_duplicate(connector->dev, &default_mode);
if (!mode) { if (!mode) {
DRM_DEV_ERROR(ctx->dev, "failed to add mode %ux%ux@%u\n", dev_err(ctx->dev, "failed to add mode %ux%u@%u\n",
default_mode.hdisplay, default_mode.vdisplay, default_mode.hdisplay, default_mode.vdisplay,
drm_mode_vrefresh(&default_mode)); drm_mode_vrefresh(&default_mode));
return -ENOMEM; return -ENOMEM;
} }
...@@ -423,7 +415,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi) ...@@ -423,7 +415,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi)
ctx->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); ctx->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(ctx->reset_gpio)) { 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); return PTR_ERR(ctx->reset_gpio);
} }
...@@ -431,9 +423,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi) ...@@ -431,9 +423,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi)
if (IS_ERR(ctx->vcc)) { if (IS_ERR(ctx->vcc)) {
ret = PTR_ERR(ctx->vcc); ret = PTR_ERR(ctx->vcc);
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev, dev_err(dev, "Failed to request vcc regulator: %d\n", ret);
"Failed to request vcc regulator: %d\n",
ret);
return ret; return ret;
} }
...@@ -441,9 +431,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi) ...@@ -441,9 +431,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi)
if (IS_ERR(ctx->iovcc)) { if (IS_ERR(ctx->iovcc)) {
ret = PTR_ERR(ctx->iovcc); ret = PTR_ERR(ctx->iovcc);
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev, dev_err(dev, "Failed to request iovcc regulator: %d\n", ret);
"Failed to request iovcc regulator: %d\n",
ret);
return ret; return ret;
} }
...@@ -467,7 +455,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi) ...@@ -467,7 +455,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi)
ret = mipi_dsi_attach(dsi); ret = mipi_dsi_attach(dsi);
if (ret < 0) { 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); drm_panel_remove(&ctx->panel);
return ret; return ret;
} }
...@@ -482,13 +470,11 @@ static void ltk500hd1829_shutdown(struct mipi_dsi_device *dsi) ...@@ -482,13 +470,11 @@ static void ltk500hd1829_shutdown(struct mipi_dsi_device *dsi)
ret = drm_panel_unprepare(&ctx->panel); ret = drm_panel_unprepare(&ctx->panel);
if (ret < 0) if (ret < 0)
DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n", dev_err(&dsi->dev, "Failed to unprepare panel: %d\n", ret);
ret);
ret = drm_panel_disable(&ctx->panel); ret = drm_panel_disable(&ctx->panel);
if (ret < 0) if (ret < 0)
DRM_DEV_ERROR(&dsi->dev, "Failed to disable panel: %d\n", dev_err(&dsi->dev, "Failed to disable panel: %d\n", ret);
ret);
} }
static int ltk500hd1829_remove(struct mipi_dsi_device *dsi) static int ltk500hd1829_remove(struct mipi_dsi_device *dsi)
...@@ -500,8 +486,7 @@ static int ltk500hd1829_remove(struct mipi_dsi_device *dsi) ...@@ -500,8 +486,7 @@ static int ltk500hd1829_remove(struct mipi_dsi_device *dsi)
ret = mipi_dsi_detach(dsi); ret = mipi_dsi_detach(dsi);
if (ret < 0) if (ret < 0)
DRM_DEV_ERROR(&dsi->dev, "failed to detach from DSI host: %d\n", dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret);
ret);
drm_panel_remove(&ctx->panel); drm_panel_remove(&ctx->panel);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7