Introduce use of DRM_DEV* for logging.
This makes logging in the drm subsystem more consistent.
Signed-off-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Thierry Reding <thierry.red...@gmail.com>
Cc: David Airlie <airl...@linux.ie>
Cc: Daniel Vetter <dan...@ffwll.ch>
---
drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 93 +++++++++++++++------------
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 14 ++--
2 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
index 1ee8b2ccf718..e5e60347d3cf 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9322.c
@@ -302,7 +302,7 @@ static int ili9322_regmap_spi_write(void *context, const
void *data,
memcpy(buf, data, 2);
buf[0] &= ~0x80;
- dev_dbg(dev, "WRITE: %02x %02x\n", buf[0], buf[1]);
+ DRM_DEV_DEBUG(dev, "WRITE: %02x %02x\n", buf[0], buf[1]);
return spi_write_then_read(spi, buf, 2, NULL, 0);
}
@@ -315,8 +315,8 @@ static int ili9322_regmap_spi_read(void *context, const
void *reg,
/* Set bit 7 to 1 to read */
memcpy(buf, reg, 1);
- dev_dbg(dev, "READ: %02x reg size = %zu, val size = %zu\n",
- buf[0], reg_size, val_size);
+ DRM_DEV_DEBUG(dev, "READ: %02x reg size = %zu, val size = %zu\n",
+ buf[0], reg_size, val_size);
buf[0] |= 0x80;
return spi_write_then_read(spi, buf, 1, val, 1);
@@ -362,7 +362,7 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
ret = regmap_write(ili->regmap, ILI9322_GLOBAL_RESET,
ILI9322_GLOBAL_RESET_ASSERT);
if (ret) {
- dev_err(ili->dev, "can't issue GRESET (%d)\n", ret);
+ DRM_DEV_ERROR(ili->dev, "can't issue GRESET (%d)\n", ret);
return ret;
}
@@ -371,7 +371,8 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
ret = regmap_write(ili->regmap, ILI9322_VREG1_VOLTAGE,
ili->vreg1out);
if (ret) {
- dev_err(ili->dev, "can't set up VREG1OUT (%d)\n", ret);
+ DRM_DEV_ERROR(ili->dev,
+ "can't set up VREG1OUT (%d)\n", ret);
return ret;
}
}
@@ -380,8 +381,9 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
ret = regmap_write(ili->regmap, ILI9322_VCOM_AMP,
ili->vcom_amplitude);
if (ret) {
- dev_err(ili->dev,
- "can't set up VCOM amplitude (%d)\n", ret);
+ DRM_DEV_ERROR(ili->dev,
+ "can't set up VCOM amplitude (%d)\n",
+ ret);
return ret;
}
};
@@ -390,7 +392,8 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
ret = regmap_write(ili->regmap, ILI9322_VCOM_HIGH,
ili->vcom_high);
if (ret) {
- dev_err(ili->dev, "can't set up VCOM high (%d)\n", ret);
+ DRM_DEV_ERROR(ili->dev,
+ "can't set up VCOM high (%d)\n", ret);
return ret;
}
};
@@ -400,9 +403,9 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
ret = regmap_write(ili->regmap, ILI9322_GAMMA_1 + i,
ili->gamma[i]);
if (ret) {
- dev_err(ili->dev,
- "can't write gamma V%d to 0x%02x (%d)\n",
- i + 1, ILI9322_GAMMA_1 + i, ret);
+ DRM_DEV_ERROR(ili->dev,
+ "can't write gamma V%d to 0x%02x (%d)\n",
+ i + 1, ILI9322_GAMMA_1 + i, ret);
return ret;
}
}
@@ -434,7 +437,8 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
reg |= ILI9322_POL_VSYNC;
ret = regmap_write(ili->regmap, ILI9322_POL, reg);
if (ret) {
- dev_err(ili->dev, "can't write POL register (%d)\n", ret);
+ DRM_DEV_ERROR(ili->dev,
+ "can't write POL register (%d)\n", ret);
return ret;
}
@@ -446,7 +450,8 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
reg |= ILI9322_IF_CTRL_LINE_INVERSION;
ret = regmap_write(ili->regmap, ILI9322_IF_CTRL, reg);
if (ret) {
- dev_err(ili->dev, "can't write IF CTRL register (%d)\n", ret);
+ DRM_DEV_ERROR(ili->dev,
+ "can't write IF CTRL register (%d)\n", ret);
return ret;
}
@@ -460,14 +465,14 @@ static int ili9322_init(struct drm_panel *panel, struct
ili9322 *ili)
reg |= ILI9322_ENTRY_AUTODETECT;
ret = regmap_write(ili->regmap, ILI9322_ENTRY, reg);
if (ret) {
- dev_err(ili->dev, "can't write ENTRY reg (%d)\n", ret);
+ DRM_DEV_ERROR(ili->dev, "can't write ENTRY reg (%d)\n", ret);
return ret;
}
- dev_info(ili->dev, "display is in %s mode, syncmode %02x\n",
- ili9322_inputs[ili->input],
+ DRM_DEV_INFO(ili->dev, "display is in %s mode, syncmode %02x\n",
+ ili9322_inputs[ili->input],
ili->conf->syncmode);
- dev_info(ili->dev, "initialized display\n");
+ DRM_DEV_INFO(ili->dev, "initialized display\n");
return 0;
}
@@ -484,7 +489,7 @@ static int ili9322_power_on(struct ili9322 *ili)
ret = regulator_bulk_enable(ARRAY_SIZE(ili->supplies), ili->supplies);
if (ret < 0) {
- dev_err(ili->dev, "unable to enable regulators\n");
+ DRM_DEV_ERROR(ili->dev, "unable to enable regulators\n");
return ret;
}
msleep(20);
@@ -510,7 +515,7 @@ static int ili9322_disable(struct drm_panel *panel)
ret = regmap_write(ili->regmap, ILI9322_POW_CTRL,
ILI9322_POW_CTRL_STANDBY);
if (ret) {
- dev_err(ili->dev, "unable to go to standby mode\n");
+ DRM_DEV_ERROR(ili->dev, "unable to go to standby mode\n");
return ret;
}
@@ -548,7 +553,7 @@ static int ili9322_enable(struct drm_panel *panel)
ret = regmap_write(ili->regmap, ILI9322_POW_CTRL,
ILI9322_POW_CTRL_DEFAULT);
if (ret) {
- dev_err(ili->dev, "unable to enable panel\n");
+ DRM_DEV_ERROR(ili->dev, "unable to enable panel\n");
return ret;
}
@@ -756,7 +761,7 @@ static int ili9322_probe(struct spi_device *spi)
*/
ili->conf = of_device_get_match_data(dev);
if (!ili->conf) {
- dev_err(dev, "missing device configuration\n");
+ DRM_DEV_ERROR(dev, "missing device configuration\n");
return -ENODEV;
}
@@ -766,20 +771,21 @@ static int ili9322_probe(struct spi_device *spi)
ili->vreg1out = U8_MAX;
} else {
if (val < 3600) {
- dev_err(dev, "too low VREG1OUT\n");
+ DRM_DEV_ERROR(dev, "too low VREG1OUT\n");
return -EINVAL;
}
if (val > 6000) {
- dev_err(dev, "too high VREG1OUT\n");
+ DRM_DEV_ERROR(dev, "too high VREG1OUT\n");
return -EINVAL;
}
if ((val % 100) != 0) {
- dev_err(dev, "VREG1OUT is no even 100 microvolt\n");
+ DRM_DEV_ERROR(dev,
+ "VREG1OUT is no even 100 microvolt\n");
return -EINVAL;
}
val -= 3600;
val /= 100;
- dev_dbg(dev, "VREG1OUT = 0x%02x\n", val);
+ DRM_DEV_DEBUG(dev, "VREG1OUT = 0x%02x\n", val);
ili->vreg1out = val;
}
@@ -789,15 +795,15 @@ static int ili9322_probe(struct spi_device *spi)
ili->vcom_high = U8_MAX;
} else {
if (val < 37) {
- dev_err(dev, "too low VCOM high\n");
+ DRM_DEV_ERROR(dev, "too low VCOM high\n");
return -EINVAL;
}
if (val > 100) {
- dev_err(dev, "too high VCOM high\n");
+ DRM_DEV_ERROR(dev, "too high VCOM high\n");
return -EINVAL;
}
val -= 37;
- dev_dbg(dev, "VCOM high = 0x%02x\n", val);
+ DRM_DEV_DEBUG(dev, "VCOM high = 0x%02x\n", val);
ili->vcom_high = val;
}
@@ -807,34 +813,38 @@ static int ili9322_probe(struct spi_device *spi)
ili->vcom_high = U8_MAX;
} else {
if (val < 70) {
- dev_err(dev, "too low VCOM amplitude\n");
+ DRM_DEV_ERROR(dev, "too low VCOM amplitude\n");
return -EINVAL;
}
if (val > 132) {
- dev_err(dev, "too high VCOM amplitude\n");
+ DRM_DEV_ERROR(dev, "too high VCOM amplitude\n");
return -EINVAL;
}
val -= 70;
val >>= 1; /* Increments of 2% */
- dev_dbg(dev, "VCOM amplitude = 0x%02x\n", val);
+ DRM_DEV_DEBUG(dev, "VCOM amplitude = 0x%02x\n", val);
ili->vcom_amplitude = val;
}
for (i = 0; i < ARRAY_SIZE(ili->gamma); i++) {
val = ili->conf->gamma_corr_neg[i];
if (val > 15) {
- dev_err(dev, "negative gamma %u > 15, capping\n", val);
+ DRM_DEV_ERROR(dev,
+ "negative gamma %u > 15, capping\n",
+ val);
val = 15;
}
gamma = val << 4;
val = ili->conf->gamma_corr_pos[i];
if (val > 15) {
- dev_err(dev, "positive gamma %u > 15, capping\n", val);
+ DRM_DEV_ERROR(dev,
+ "positive gamma %u > 15, capping\n",
+ val);
val = 15;
}
gamma |= val;
ili->gamma[i] = gamma;
- dev_dbg(dev, "gamma V%d: 0x%02x\n", i + 1, gamma);
+ DRM_DEV_DEBUG(dev, "gamma V%d: 0x%02x\n", i + 1, gamma);
}
ili->supplies[0].supply = "vcc"; /* 2.7-3.6 V */
@@ -859,32 +869,32 @@ static int ili9322_probe(struct spi_device *spi)
ili->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(ili->reset_gpio)) {
- dev_err(dev, "failed to get RESET GPIO\n");
+ DRM_DEV_ERROR(dev, "failed to get RESET GPIO\n");
return PTR_ERR(ili->reset_gpio);
}
spi->bits_per_word = 8;
ret = spi_setup(spi);
if (ret < 0) {
- dev_err(dev, "spi setup failed.\n");
+ DRM_DEV_ERROR(dev, "spi setup failed.\n");
return ret;
}
regmap_config = &ili9322_regmap_config;
ili->regmap = devm_regmap_init(dev, &ili9322_regmap_bus, dev,
regmap_config);
if (IS_ERR(ili->regmap)) {
- dev_err(dev, "failed to allocate register map\n");
+ DRM_DEV_ERROR(dev, "failed to allocate register map\n");
return PTR_ERR(ili->regmap);
}
ret = regmap_read(ili->regmap, ILI9322_CHIP_ID, &val);
if (ret) {
- dev_err(dev, "can't get chip ID (%d)\n", ret);
+ DRM_DEV_ERROR(dev, "can't get chip ID (%d)\n", ret);
return ret;
}
if (val != ILI9322_CHIP_ID_MAGIC) {
- dev_err(dev, "chip ID 0x%0x2, expected 0x%02x\n", val,
- ILI9322_CHIP_ID_MAGIC);
+ DRM_DEV_ERROR(dev, "chip ID 0x%0x2, expected 0x%02x\n", val,
+ ILI9322_CHIP_ID_MAGIC);
return -ENODEV;
}
@@ -892,7 +902,8 @@ static int ili9322_probe(struct spi_device *spi)
if (ili->conf->input == ILI9322_INPUT_UNKNOWN) {
ret = regmap_read(ili->regmap, ILI9322_ENTRY, &val);
if (ret) {
- dev_err(dev, "can't get entry setting (%d)\n", ret);
+ DRM_DEV_ERROR(dev,
+ "can't get entry setting (%d)\n", ret);
return ret;
}
/* Input enum corresponds to HW setting */
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
index 3ad4a46c4e94..f72059578c74 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
@@ -18,6 +18,7 @@
#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>
@@ -395,10 +396,11 @@ static int ili9881c_get_modes(struct drm_panel *panel)
mode = drm_mode_duplicate(panel->drm, &bananapi_default_mode);
if (!mode) {
- dev_err(&ctx->dsi->dev, "failed to add mode %ux%ux@%u\n",
- bananapi_default_mode.hdisplay,
- bananapi_default_mode.vdisplay,
- bananapi_default_mode.vrefresh);
+ DRM_DEV_ERROR(&ctx->dsi->dev,
+ "failed to add mode %ux%ux@%u\n",
+ bananapi_default_mode.hdisplay,
+ bananapi_default_mode.vdisplay,
+ bananapi_default_mode.vrefresh);
return -ENOMEM;
}
@@ -439,13 +441,13 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)
ctx->power = devm_regulator_get(&dsi->dev, "power");
if (IS_ERR(ctx->power)) {
- dev_err(&dsi->dev, "Couldn't get our power regulator\n");
+ DRM_DEV_ERROR(&dsi->dev, "Couldn't get our power regulator\n");
return PTR_ERR(ctx->power);
}
ctx->reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(ctx->reset)) {
- dev_err(&dsi->dev, "Couldn't get our reset GPIO\n");
+ DRM_DEV_ERROR(&dsi->dev, "Couldn't get our reset GPIO\n");
return PTR_ERR(ctx->reset);
}
--
2.12.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
