mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drm/panel: s6e63m0: Fix up DRM_DEV* regression 

Ooops the panel drivers stopped to use DRM_DEV* messages
and we predictably create errors by merging code that
still use it.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: David Airlie <airlied@linux.ie>
Link: https://patchwork.freedesktop.org/patch/msgid/20200906132903.5739-1-linus.walleij@linaro.org
This commit is contained in:
Linus Walleij 2020-09-06 15:29:03 +02:00
parent ec219f1ba2
commit d2024cdf0f
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
View File

@ -23,11 +23,11 @@ static int s6e63m0_dsi_dcs_read(struct device *dev, const u8 cmd, u8 *data)
ret = mipi_dsi_dcs_read(dsi, cmd, data, 1);
if (ret < 0) {
DRM_DEV_ERROR(dev, "could not read DCS CMD %02x\n", cmd);
dev_err(dev, "could not read DCS CMD %02x\n", cmd);
return ret;
}
DRM_DEV_INFO(dev, "DSI read CMD %02x = %02x\n", cmd, *data);
dev_info(dev, "DSI read CMD %02x = %02x\n", cmd, *data);
return 0;
}
@ -42,7 +42,7 @@ static int s6e63m0_dsi_dcs_write(struct device *dev, const u8 *data, size_t len)
int chunk;
int ret;
DRM_DEV_INFO(dev, "DSI writing dcs seq: %*ph\n", (int)len, data);
dev_info(dev, "DSI writing dcs seq: %*ph\n", (int)len, data);
/* Pick out and skip past the DCS command */
cmd = *seqp;
@ -56,9 +56,7 @@ static int s6e63m0_dsi_dcs_write(struct device *dev, const u8 *data, size_t len)
chunk = S6E63M0_DSI_MAX_CHUNK;
ret = mipi_dsi_dcs_write(dsi, cmd, seqp, chunk);
if (ret < 0) {
DRM_DEV_ERROR(dev,
"error sending DCS command seq cmd %02x\n",
cmd);
dev_err(dev, "error sending DCS command seq cmd %02x\n", cmd);
return ret;
}
cmdwritten += chunk;
@ -70,23 +68,19 @@ static int s6e63m0_dsi_dcs_write(struct device *dev, const u8 *data, size_t len)
chunk = S6E63M0_DSI_MAX_CHUNK;
ret = mipi_dsi_dcs_write(dsi, MCS_GLOBAL_PARAM, &cmdwritten, 1);
if (ret < 0) {
DRM_DEV_ERROR(dev,
"error sending CMD %02x global param %02x\n",
cmd, cmdwritten);
dev_err(dev, "error sending CMD %02x global param %02x\n",
cmd, cmdwritten);
return ret;
}
ret = mipi_dsi_dcs_write(dsi, cmd, seqp, chunk);
if (ret < 0) {
DRM_DEV_ERROR(dev,
"error sending CMD %02x chunk\n",
cmd);
dev_err(dev, "error sending CMD %02x chunk\n", cmd);
return ret;
}
cmdwritten += chunk;
seqp += chunk;
}
DRM_DEV_INFO(dev, "sent command %02x %02x bytes\n",
cmd, cmdwritten);
dev_info(dev, "sent command %02x %02x bytes\n", cmd, cmdwritten);
usleep_range(8000, 9000);

8
drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c
View File

@ -41,7 +41,7 @@ static int s6e63m0_spi_dcs_write(struct device *dev, const u8 *data, size_t len)
{
int ret = 0;
DRM_DEV_DEBUG(dev, "SPI writing dcs seq: %*ph\n", (int)len, data);
dev_dbg(dev, "SPI writing dcs seq: %*ph\n", (int)len, data);
ret = s6e63m0_spi_write_word(dev, *data);
while (!ret && --len) {
@ -50,8 +50,8 @@ static int s6e63m0_spi_dcs_write(struct device *dev, const u8 *data, size_t len)
}
if (ret) {
DRM_DEV_ERROR(dev, "SPI error %d writing dcs seq: %*ph\n", ret,
(int)len, data);
dev_err(dev, "SPI error %d writing dcs seq: %*ph\n", ret,
(int)len, data);
}
usleep_range(300, 310);
@ -68,7 +68,7 @@ static int s6e63m0_spi_probe(struct spi_device *spi)
spi->mode = SPI_MODE_3;
ret = spi_setup(spi);
if (ret < 0) {
DRM_DEV_ERROR(dev, "spi setup failed.\n");
dev_err(dev, "spi setup failed.\n");
return ret;
}
return s6e63m0_probe(dev, s6e63m0_spi_dcs_read, s6e63m0_spi_dcs_write,

14
drivers/gpu/drm/panel/panel-samsung-s6e63m0.c
View File

@ -179,28 +179,24 @@ static int s6e63m0_check_lcd_type(struct s6e63m0 *ctx)
ret = s6e63m0_clear_error(ctx);
if (ret) {
DRM_DEV_ERROR(ctx->dev, "error checking LCD type (%d)\n",
ret);
dev_err(ctx->dev, "error checking LCD type (%d)\n", ret);
ctx->lcd_type = 0x00;
return ret;
}
DRM_DEV_INFO(ctx->dev, "MTP ID: %02x %02x %02x\n", id1, id2, id3);
dev_info(ctx->dev, "MTP ID: %02x %02x %02x\n", id1, id2, id3);
/* We attempt to detect what panel is mounted on the controller */
switch (id2) {
case S6E63M0_LCD_ID_VALUE_M2:
DRM_DEV_INFO(ctx->dev,
"detected LCD panel AMS397GE MIPI M2\n");
dev_info(ctx->dev, "detected LCD panel AMS397GE MIPI M2\n");
break;
case S6E63M0_LCD_ID_VALUE_SM2:
case S6E63M0_LCD_ID_VALUE_SM2_1:
DRM_DEV_INFO(ctx->dev,
"detected LCD panel AMS397GE MIPI SM2\n");
dev_info(ctx->dev, "detected LCD panel AMS397GE MIPI SM2\n");
break;
default:
DRM_DEV_INFO(ctx->dev,
"unknown LCD panel type %02x\n", id2);
dev_info(ctx->dev, "unknown LCD panel type %02x\n", id2);
break;
}