Skip to content

Commit 59ac702

Browse files
lategoodbyemairacanal
lategoodbye
authored and
mairacanal
committed
drm/vc4: Get the rid of DRM_ERROR()
DRM_ERROR() has been deprecated in favor of pr_err(). However, we should prefer to use drm_err() whenever possible so we get device- specific output with the error message. In error case of kcalloc, we can simply drop DRM_ERROR(), because kcalloc already logs errors. Suggested-by: Maíra Canal <[email protected]> Signed-off-by: Stefan Wahren <[email protected]> Reviewed-by: Maxime Ripard <[email protected]> Reviewed-by: Maíra Canal <[email protected]> Signed-off-by: Maíra Canal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent f1a54e8 commit 59ac702

File tree

10 files changed

+70
-67
lines changed

10 files changed

+70
-67
lines changed

‎drivers/gpu/drm/vc4/vc4_bo.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size,
469469

470470
if (IS_ERR(dma_obj)) {
471471
struct drm_printer p = drm_info_printer(vc4->base.dev);
472-
DRM_ERROR("Failed to allocate from GEM DMA helper:\n");
472+
drm_err(dev, "Failed to allocate from GEM DMA helper:\n");
473473
vc4_bo_stats_print(&p, vc4);
474474
return ERR_PTR(-ENOMEM);
475475
}
@@ -702,7 +702,7 @@ static struct dma_buf *vc4_prime_export(struct drm_gem_object *obj, int flags)
702702
*/
703703
ret = vc4_bo_inc_usecnt(bo);
704704
if (ret) {
705-
DRM_ERROR("Failed to increment BO usecnt\n");
705+
drm_err(obj->dev, "Failed to increment BO usecnt\n");
706706
return ERR_PTR(ret);
707707
}
708708

@@ -1050,10 +1050,10 @@ static void vc4_bo_cache_destroy(struct drm_device *dev, void *unused)
10501050

10511051
for (i = 0; i < vc4->num_labels; i++) {
10521052
if (vc4->bo_labels[i].num_allocated) {
1053-
DRM_ERROR("Destroying BO cache with %d %s "
1054-
"BOs still allocated\n",
1055-
vc4->bo_labels[i].num_allocated,
1056-
vc4->bo_labels[i].name);
1053+
drm_err(dev, "Destroying BO cache with %d %s "
1054+
"BOs still allocated\n",
1055+
vc4->bo_labels[i].num_allocated,
1056+
vc4->bo_labels[i].name);
10571057
}
10581058

10591059
if (is_user_label(i))
@@ -1083,7 +1083,7 @@ int vc4_label_bo_ioctl(struct drm_device *dev, void *data,
10831083

10841084
gem_obj = drm_gem_object_lookup(file_priv, args->handle);
10851085
if (!gem_obj) {
1086-
DRM_ERROR("Failed to look up GEM BO %d\n", args->handle);
1086+
drm_err(dev, "Failed to look up GEM BO %d\n", args->handle);
10871087
kfree(name);
10881088
return -ENOENT;
10891089
}

‎drivers/gpu/drm/vc4/vc4_dpi.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder)
199199
DPI_FORMAT);
200200
break;
201201
default:
202-
DRM_ERROR("Unknown media bus format %d\n",
203-
bus_format);
202+
drm_err(dev, "Unknown media bus format %d\n",
203+
bus_format);
204204
break;
205205
}
206206
}
@@ -236,11 +236,11 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder)
236236

237237
ret = clk_set_rate(dpi->pixel_clock, mode->clock * 1000);
238238
if (ret)
239-
DRM_ERROR("Failed to set clock rate: %d\n", ret);
239+
drm_err(dev, "Failed to set clock rate: %d\n", ret);
240240

241241
ret = clk_prepare_enable(dpi->pixel_clock);
242242
if (ret)
243-
DRM_ERROR("Failed to set clock rate: %d\n", ret);
243+
drm_err(dev, "Failed to set clock rate: %d\n", ret);
244244

245245
drm_dev_exit(idx);
246246
}
@@ -339,21 +339,21 @@ static int vc4_dpi_bind(struct device *dev, struct device *master, void *data)
339339
if (IS_ERR(dpi->core_clock)) {
340340
ret = PTR_ERR(dpi->core_clock);
341341
if (ret != -EPROBE_DEFER)
342-
DRM_ERROR("Failed to get core clock: %d\n", ret);
342+
drm_err(drm, "Failed to get core clock: %d\n", ret);
343343
return ret;
344344
}
345345

346346
dpi->pixel_clock = devm_clk_get(dev, "pixel");
347347
if (IS_ERR(dpi->pixel_clock)) {
348348
ret = PTR_ERR(dpi->pixel_clock);
349349
if (ret != -EPROBE_DEFER)
350-
DRM_ERROR("Failed to get pixel clock: %d\n", ret);
350+
drm_err(drm, "Failed to get pixel clock: %d\n", ret);
351351
return ret;
352352
}
353353

354354
ret = clk_prepare_enable(dpi->core_clock);
355355
if (ret) {
356-
DRM_ERROR("Failed to turn on core clock: %d\n", ret);
356+
drm_err(drm, "Failed to turn on core clock: %d\n", ret);
357357
return ret;
358358
}
359359

‎drivers/gpu/drm/vc4/vc4_dsi.c‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ struct vc4_dsi {
613613
static inline void
614614
dsi_dma_workaround_write(struct vc4_dsi *dsi, u32 offset, u32 val)
615615
{
616+
struct drm_device *drm = dsi->bridge.dev;
616617
struct dma_chan *chan = dsi->reg_dma_chan;
617618
struct dma_async_tx_descriptor *tx;
618619
dma_cookie_t cookie;
@@ -633,19 +634,19 @@ dsi_dma_workaround_write(struct vc4_dsi *dsi, u32 offset, u32 val)
633634
dsi->reg_dma_paddr,
634635
4, 0);
635636
if (!tx) {
636-
DRM_ERROR("Failed to set up DMA register write\n");
637+
drm_err(drm, "Failed to set up DMA register write\n");
637638
return;
638639
}
639640

640641
cookie = tx->tx_submit(tx);
641642
ret = dma_submit_error(cookie);
642643
if (ret) {
643-
DRM_ERROR("Failed to submit DMA: %d\n", ret);
644+
drm_err(drm, "Failed to submit DMA: %d\n", ret);
644645
return;
645646
}
646647
ret = dma_sync_wait(chan, cookie);
647648
if (ret)
648-
DRM_ERROR("Failed to wait for DMA: %d\n", ret);
649+
drm_err(drm, "Failed to wait for DMA: %d\n", ret);
649650
}
650651

651652
#define DSI_READ(offset) \
@@ -893,7 +894,7 @@ static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
893894

894895
ret = pm_runtime_resume_and_get(dev);
895896
if (ret) {
896-
DRM_ERROR("Failed to runtime PM enable on DSI%d\n", dsi->variant->port);
897+
drm_err(bridge->dev, "Failed to runtime PM enable on DSI%d\n", dsi->variant->port);
897898
return;
898899
}
899900

@@ -986,13 +987,14 @@ static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
986987

987988
ret = clk_prepare_enable(dsi->escape_clock);
988989
if (ret) {
989-
DRM_ERROR("Failed to turn on DSI escape clock: %d\n", ret);
990+
drm_err(bridge->dev, "Failed to turn on DSI escape clock: %d\n",
991+
ret);
990992
return;
991993
}
992994

993995
ret = clk_prepare_enable(dsi->pll_phy_clock);
994996
if (ret) {
995-
DRM_ERROR("Failed to turn on DSI PLL: %d\n", ret);
997+
drm_err(bridge->dev, "Failed to turn on DSI PLL: %d\n", ret);
996998
return;
997999
}
9981000

@@ -1014,7 +1016,7 @@ static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
10141016

10151017
ret = clk_prepare_enable(dsi->pixel_clock);
10161018
if (ret) {
1017-
DRM_ERROR("Failed to turn on DSI pixel clock: %d\n", ret);
1019+
drm_err(bridge->dev, "Failed to turn on DSI pixel clock: %d\n", ret);
10181020
return;
10191021
}
10201022

@@ -1172,6 +1174,7 @@ static ssize_t vc4_dsi_host_transfer(struct mipi_dsi_host *host,
11721174
const struct mipi_dsi_msg *msg)
11731175
{
11741176
struct vc4_dsi *dsi = host_to_dsi(host);
1177+
struct drm_device *drm = dsi->bridge.dev;
11751178
struct mipi_dsi_packet packet;
11761179
u32 pkth = 0, pktc = 0;
11771180
int i, ret;
@@ -1303,8 +1306,8 @@ static ssize_t vc4_dsi_host_transfer(struct mipi_dsi_host *host,
13031306
DSI_RXPKT1H_BC_PARAM);
13041307

13051308
if (rxlen != msg->rx_len) {
1306-
DRM_ERROR("DSI returned %db, expecting %db\n",
1307-
rxlen, (int)msg->rx_len);
1309+
drm_err(drm, "DSI returned %db, expecting %db\n",
1310+
rxlen, (int)msg->rx_len);
13081311
ret = -ENXIO;
13091312
goto reset_fifo_and_return;
13101313
}
@@ -1326,7 +1329,7 @@ static ssize_t vc4_dsi_host_transfer(struct mipi_dsi_host *host,
13261329
return ret;
13271330

13281331
reset_fifo_and_return:
1329-
DRM_ERROR("DSI transfer failed, resetting: %d\n", ret);
1332+
drm_err(drm, "DSI transfer failed, resetting: %d\n", ret);
13301333

13311334
DSI_PORT_WRITE(TXPKT1C, DSI_PORT_READ(TXPKT1C) & ~DSI_TXPKT1C_CMD_EN);
13321335
udelay(1);
@@ -1468,7 +1471,8 @@ static void dsi_handle_error(struct vc4_dsi *dsi,
14681471
if (!(stat & bit))
14691472
return;
14701473

1471-
DRM_ERROR("DSI%d: %s error\n", dsi->variant->port, type);
1474+
drm_err(dsi->bridge.dev, "DSI%d: %s error\n", dsi->variant->port,
1475+
type);
14721476
*ret = IRQ_HANDLED;
14731477
}
14741478

@@ -1687,7 +1691,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
16871691
&dsi->reg_dma_paddr,
16881692
GFP_KERNEL);
16891693
if (!dsi->reg_dma_mem) {
1690-
DRM_ERROR("Failed to get DMA memory\n");
1694+
drm_err(drm, "Failed to get DMA memory\n");
16911695
return -ENOMEM;
16921696
}
16931697

@@ -1702,8 +1706,8 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
17021706
if (IS_ERR(dsi->reg_dma_chan)) {
17031707
ret = PTR_ERR(dsi->reg_dma_chan);
17041708
if (ret != -EPROBE_DEFER)
1705-
DRM_ERROR("Failed to get DMA channel: %d\n",
1706-
ret);
1709+
drm_err(drm, "Failed to get DMA channel: %d\n",
1710+
ret);
17071711
return ret;
17081712
}
17091713

‎drivers/gpu/drm/vc4/vc4_gem.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,8 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec)
832832
*/
833833
temp = kvmalloc_array(temp_size, 1, GFP_KERNEL);
834834
if (!temp) {
835-
DRM_ERROR("Failed to allocate storage for copying "
836-
"in bin/render CLs.\n");
835+
drm_err(dev, "Failed to allocate storage for copying "
836+
"in bin/render CLs.\n");
837837
ret = -ENOMEM;
838838
goto fail;
839839
}
@@ -866,7 +866,7 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec)
866866

867867
bo = vc4_bo_create(dev, exec_size, true, VC4_BO_TYPE_BCL);
868868
if (IS_ERR(bo)) {
869-
DRM_ERROR("Couldn't allocate BO for binning\n");
869+
drm_err(dev, "Couldn't allocate BO for binning\n");
870870
ret = PTR_ERR(bo);
871871
goto fail;
872872
}
@@ -1153,10 +1153,9 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
11531153
}
11541154

11551155
exec = kcalloc(1, sizeof(*exec), GFP_KERNEL);
1156-
if (!exec) {
1157-
DRM_ERROR("malloc failure on exec struct\n");
1156+
if (!exec)
11581157
return -ENOMEM;
1159-
}
1158+
11601159
exec->dev = vc4;
11611160

11621161
ret = vc4_v3d_pm_get(vc4);

‎drivers/gpu/drm/vc4/vc4_hdmi.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ static int vc4_hdmi_write_infoframe(struct drm_connector *connector,
704704

705705
ret = vc4_hdmi_stop_packet(vc4_hdmi, type, true);
706706
if (ret) {
707-
DRM_ERROR("Failed to wait for infoframe to go idle: %d\n", ret);
707+
drm_err(drm, "Failed to wait for infoframe to go idle: %d\n", ret);
708708
goto out;
709709
}
710710

@@ -740,7 +740,7 @@ static int vc4_hdmi_write_infoframe(struct drm_connector *connector,
740740
ret = wait_for((HDMI_READ(HDMI_RAM_PACKET_STATUS) &
741741
BIT(packet_id)), 100);
742742
if (ret)
743-
DRM_ERROR("Failed to wait for infoframe to start: %d\n", ret);
743+
drm_err(drm, "Failed to wait for infoframe to start: %d\n", ret);
744744

745745
out:
746746
drm_dev_exit(idx);
@@ -901,7 +901,7 @@ static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder,
901901

902902
ret = pm_runtime_put(&vc4_hdmi->pdev->dev);
903903
if (ret < 0)
904-
DRM_ERROR("Failed to release power domain: %d\n", ret);
904+
drm_err(drm, "Failed to release power domain: %d\n", ret);
905905

906906
drm_dev_exit(idx);
907907

@@ -1443,7 +1443,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
14431443

14441444
ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
14451445
if (ret < 0) {
1446-
DRM_ERROR("Failed to retain power domain: %d\n", ret);
1446+
drm_err(drm, "Failed to retain power domain: %d\n", ret);
14471447
goto err_dev_exit;
14481448
}
14491449

@@ -1468,19 +1468,19 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
14681468
div_u64(tmds_char_rate, 100) * 101);
14691469
ret = clk_set_min_rate(vc4_hdmi->hsm_clock, hsm_rate);
14701470
if (ret) {
1471-
DRM_ERROR("Failed to set HSM clock rate: %d\n", ret);
1471+
drm_err(drm, "Failed to set HSM clock rate: %d\n", ret);
14721472
goto err_put_runtime_pm;
14731473
}
14741474

14751475
ret = clk_set_rate(vc4_hdmi->pixel_clock, tmds_char_rate);
14761476
if (ret) {
1477-
DRM_ERROR("Failed to set pixel clock rate: %d\n", ret);
1477+
drm_err(drm, "Failed to set pixel clock rate: %d\n", ret);
14781478
goto err_put_runtime_pm;
14791479
}
14801480

14811481
ret = clk_prepare_enable(vc4_hdmi->pixel_clock);
14821482
if (ret) {
1483-
DRM_ERROR("Failed to turn on pixel clock: %d\n", ret);
1483+
drm_err(drm, "Failed to turn on pixel clock: %d\n", ret);
14841484
goto err_put_runtime_pm;
14851485
}
14861486

@@ -1496,13 +1496,13 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
14961496

14971497
ret = clk_set_min_rate(vc4_hdmi->pixel_bvb_clock, bvb_rate);
14981498
if (ret) {
1499-
DRM_ERROR("Failed to set pixel bvb clock rate: %d\n", ret);
1499+
drm_err(drm, "Failed to set pixel bvb clock rate: %d\n", ret);
15001500
goto err_disable_pixel_clock;
15011501
}
15021502

15031503
ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
15041504
if (ret) {
1505-
DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret);
1505+
drm_err(drm, "Failed to turn on pixel bvb clock: %d\n", ret);
15061506
goto err_disable_pixel_clock;
15071507
}
15081508

@@ -2951,13 +2951,13 @@ static int vc4_hdmi_init_resources(struct drm_device *drm,
29512951
if (IS_ERR(vc4_hdmi->pixel_clock)) {
29522952
ret = PTR_ERR(vc4_hdmi->pixel_clock);
29532953
if (ret != -EPROBE_DEFER)
2954-
DRM_ERROR("Failed to get pixel clock\n");
2954+
drm_err(drm, "Failed to get pixel clock\n");
29552955
return ret;
29562956
}
29572957

29582958
vc4_hdmi->hsm_clock = devm_clk_get(dev, "hdmi");
29592959
if (IS_ERR(vc4_hdmi->hsm_clock)) {
2960-
DRM_ERROR("Failed to get HDMI state machine clock\n");
2960+
drm_err(drm, "Failed to get HDMI state machine clock\n");
29612961
return PTR_ERR(vc4_hdmi->hsm_clock);
29622962
}
29632963
vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock;
@@ -3041,31 +3041,31 @@ static int vc5_hdmi_init_resources(struct drm_device *drm,
30413041

30423042
vc4_hdmi->hsm_clock = devm_clk_get(dev, "hdmi");
30433043
if (IS_ERR(vc4_hdmi->hsm_clock)) {
3044-
DRM_ERROR("Failed to get HDMI state machine clock\n");
3044+
drm_err(drm, "Failed to get HDMI state machine clock\n");
30453045
return PTR_ERR(vc4_hdmi->hsm_clock);
30463046
}
30473047

30483048
vc4_hdmi->pixel_bvb_clock = devm_clk_get(dev, "bvb");
30493049
if (IS_ERR(vc4_hdmi->pixel_bvb_clock)) {
3050-
DRM_ERROR("Failed to get pixel bvb clock\n");
3050+
drm_err(drm, "Failed to get pixel bvb clock\n");
30513051
return PTR_ERR(vc4_hdmi->pixel_bvb_clock);
30523052
}
30533053

30543054
vc4_hdmi->audio_clock = devm_clk_get(dev, "audio");
30553055
if (IS_ERR(vc4_hdmi->audio_clock)) {
3056-
DRM_ERROR("Failed to get audio clock\n");
3056+
drm_err(drm, "Failed to get audio clock\n");
30573057
return PTR_ERR(vc4_hdmi->audio_clock);
30583058
}
30593059

30603060
vc4_hdmi->cec_clock = devm_clk_get(dev, "cec");
30613061
if (IS_ERR(vc4_hdmi->cec_clock)) {
3062-
DRM_ERROR("Failed to get CEC clock\n");
3062+
drm_err(drm, "Failed to get CEC clock\n");
30633063
return PTR_ERR(vc4_hdmi->cec_clock);
30643064
}
30653065

30663066
vc4_hdmi->reset = devm_reset_control_get(dev, NULL);
30673067
if (IS_ERR(vc4_hdmi->reset)) {
3068-
DRM_ERROR("Failed to get HDMI reset line\n");
3068+
drm_err(drm, "Failed to get HDMI reset line\n");
30693069
return PTR_ERR(vc4_hdmi->reset);
30703070
}
30713071

@@ -3221,14 +3221,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
32213221

32223222
ddc_node = of_parse_phandle(dev->of_node, "ddc", 0);
32233223
if (!ddc_node) {
3224-
DRM_ERROR("Failed to find ddc node in device tree\n");
3224+
drm_err(drm, "Failed to find ddc node in device tree\n");
32253225
return -ENODEV;
32263226
}
32273227

32283228
vc4_hdmi->ddc = of_find_i2c_adapter_by_node(ddc_node);
32293229
of_node_put(ddc_node);
32303230
if (!vc4_hdmi->ddc) {
3231-
DRM_DEBUG("Failed to get ddc i2c adapter by node\n");
3231+
drm_err(drm, "Failed to get ddc i2c adapter by node\n");
32323232
return -EPROBE_DEFER;
32333233
}
32343234

0 commit comments

Comments
 (0)