github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm: pl111: replace dev_* print functions with drm_* variants

Browse Source 
Update the PL111 CLCD driver to use DRM print macros drm_*() instead of
dev_*(). This change ensures consistency with DRM subsystem
logging conventions [1].

[1]
Link: https://docs.kernel.org/gpu/todo.html#convert-logging-to-drm-functions-with-drm-device-parameter

Signed-off-by: Eslam Khafagy <eslam.medhat1993@gmail.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>
Link: https://patch.msgid.link/20251125193845.425416-1-eslam.medhat1993@gmail.com
This commit is contained in:
Eslam Khafagy 2025-11-25 21:38:45 +02:00 committed by Linus Walleij
parent 3d32eb7a5e
commit a1542b8ca6
6 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/pl111/pl111_display.c
View File

@ -138,7 +138,7 @@ static void pl111_display_enable(struct drm_simple_display_pipe *pipe,
ret = clk_set_rate(priv->clk, mode->clock * 1000); ret = clk_set_rate(priv->clk, mode->clock * 1000);
if (ret) { if (ret) {
dev_err(drm->dev, drm_err(drm,
"Failed to set pixel clock rate to %d: %d\n", "Failed to set pixel clock rate to %d: %d\n",
mode->clock * 1000, ret); mode->clock * 1000, ret);
} }
@ -553,7 +553,7 @@ pl111_init_clock_divider(struct drm_device *drm)
int ret; int ret;
if (IS_ERR(parent)) { if (IS_ERR(parent)) {
dev_err(drm->dev, "CLCD: unable to get clcdclk.\n"); drm_err(drm, "CLCD: unable to get clcdclk.\n");
return PTR_ERR(parent); return PTR_ERR(parent);
} }

29
drivers/gpu/drm/pl111/pl111_drv.c
View File

@ -55,6 +55,7 @@
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_of.h> #include <drm/drm_of.h>
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_vblank.h> #include <drm/drm_vblank.h>
@ -98,7 +99,7 @@ static int pl111_modeset_init(struct drm_device *dev)
struct drm_panel *tmp_panel; struct drm_panel *tmp_panel;
struct drm_bridge *tmp_bridge; struct drm_bridge *tmp_bridge;
dev_dbg(dev->dev, "checking endpoint %d\n", i); drm_dbg(dev, "checking endpoint %d\n", i);
ret = drm_of_find_panel_or_bridge(dev->dev->of_node, ret = drm_of_find_panel_or_bridge(dev->dev->of_node,
0, i, 0, i,
@ -114,18 +115,18 @@ static int pl111_modeset_init(struct drm_device *dev)
defer = true; defer = true;
} else if (ret != -ENODEV) { } else if (ret != -ENODEV) {
/* Continue, maybe something else is working */ /* Continue, maybe something else is working */
dev_err(dev->dev, drm_err(dev,
"endpoint %d returns %d\n", i, ret); "endpoint %d returns %d\n", i, ret);
} }
} }
if (tmp_panel) { if (tmp_panel) {
dev_info(dev->dev, drm_info(dev,
"found panel on endpoint %d\n", i); "found panel on endpoint %d\n", i);
panel = tmp_panel; panel = tmp_panel;
} }
if (tmp_bridge) { if (tmp_bridge) {
dev_info(dev->dev, drm_info(dev,
"found bridge on endpoint %d\n", i); "found bridge on endpoint %d\n", i);
bridge = tmp_bridge; bridge = tmp_bridge;
} }
@ -149,9 +150,9 @@ static int pl111_modeset_init(struct drm_device *dev)
goto finish; goto finish;
} }
} else if (bridge) { } else if (bridge) {
dev_info(dev->dev, "Using non-panel bridge\n"); drm_info(dev, "Using non-panel bridge\n");
} else { } else {
dev_err(dev->dev, "No bridge, exiting\n"); drm_err(dev, "No bridge, exiting\n");
return -ENODEV; return -ENODEV;
} }
@ -163,7 +164,7 @@ static int pl111_modeset_init(struct drm_device *dev)
ret = pl111_display_init(dev); ret = pl111_display_init(dev);
if (ret != 0) { if (ret != 0) {
dev_err(dev->dev, "Failed to init display\n"); drm_err(dev, "Failed to init display\n");
goto out_bridge; goto out_bridge;
} }
@ -175,7 +176,7 @@ static int pl111_modeset_init(struct drm_device *dev)
if (!priv->variant->broken_vblank) { if (!priv->variant->broken_vblank) {
ret = drm_vblank_init(dev, 1); ret = drm_vblank_init(dev, 1);
if (ret != 0) { if (ret != 0) {
dev_err(dev->dev, "Failed to init vblank\n"); drm_err(dev, "Failed to init vblank\n");
goto out_bridge; goto out_bridge;
} }
} }
@ -255,13 +256,13 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
ret = of_reserved_mem_device_init(dev); ret = of_reserved_mem_device_init(dev);
if (!ret) { if (!ret) {
dev_info(dev, "using device-specific reserved memory\n"); drm_info(drm, "using device-specific reserved memory\n");
priv->use_device_memory = true; priv->use_device_memory = true;
} }
if (of_property_read_u32(dev->of_node, "max-memory-bandwidth", if (of_property_read_u32(dev->of_node, "max-memory-bandwidth",
&priv->memory_bw)) { &priv->memory_bw)) {
dev_info(dev, "no max memory bandwidth specified, assume unlimited\n"); drm_info(drm, "no max memory bandwidth specified, assume unlimited\n");
priv->memory_bw = 0; priv->memory_bw = 0;
} }
@ -276,17 +277,17 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
priv->regs = devm_ioremap_resource(dev, &amba_dev->res); priv->regs = devm_ioremap_resource(dev, &amba_dev->res);
if (IS_ERR(priv->regs)) { if (IS_ERR(priv->regs)) {
dev_err(dev, "%s failed mmio\n", __func__); drm_err(drm, "%s failed mmio\n", __func__);
ret = PTR_ERR(priv->regs); ret = PTR_ERR(priv->regs);
goto dev_put; goto dev_put;
} }
/* This may override some variant settings */ /* This may override some variant settings */
ret = pl111_versatile_init(dev, priv); ret = pl111_versatile_init(drm, priv);
if (ret) if (ret)
goto dev_put; goto dev_put;
pl111_nomadik_init(dev); pl111_nomadik_init(drm);
/* turn off interrupts before requesting the irq */ /* turn off interrupts before requesting the irq */
writel(0, priv->regs + priv->ienb); writel(0, priv->regs + priv->ienb);
@ -294,7 +295,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
ret = devm_request_irq(dev, amba_dev->irq[0], pl111_irq, 0, ret = devm_request_irq(dev, amba_dev->irq[0], pl111_irq, 0,
variant->name, priv); variant->name, priv);
if (ret != 0) { if (ret != 0) {
dev_err(dev, "%s failed irq %d\n", __func__, ret); drm_err(drm, "%s failed irq %d\n", __func__, ret);
return ret; return ret;
} }

4
drivers/gpu/drm/pl111/pl111_nomadik.c
View File

@ -9,7 +9,7 @@
#define PMU_CTRL_OFFSET 0x0000 #define PMU_CTRL_OFFSET 0x0000
#define PMU_CTRL_LCDNDIF BIT(26) #define PMU_CTRL_LCDNDIF BIT(26)
void pl111_nomadik_init(struct device *dev) void pl111_nomadik_init(struct drm_device *dev)
{ {
struct regmap *pmu_regmap; struct regmap *pmu_regmap;
@ -31,6 +31,6 @@ void pl111_nomadik_init(struct device *dev)
PMU_CTRL_OFFSET, PMU_CTRL_OFFSET,
PMU_CTRL_LCDNDIF, PMU_CTRL_LCDNDIF,
0); 0);
dev_info(dev, "set Nomadik PMU mux to CLCD mode\n"); drm_info(dev, "set Nomadik PMU mux to CLCD mode\n");
} }
EXPORT_SYMBOL_GPL(pl111_nomadik_init); EXPORT_SYMBOL_GPL(pl111_nomadik_init);

4
drivers/gpu/drm/pl111/pl111_nomadik.h
View File

@ -8,11 +8,11 @@ struct device;
#ifdef CONFIG_ARCH_NOMADIK #ifdef CONFIG_ARCH_NOMADIK
void pl111_nomadik_init(struct device *dev); void pl111_nomadik_init(struct drm_device *dev);
#else #else
static inline void pl111_nomadik_init(struct device *dev) static inline void pl111_nomadik_init(struct drm_device *dev)
{ {
} }

53
drivers/gpu/drm/pl111/pl111_versatile.c
View File

@ -20,6 +20,7 @@
#include <linux/vexpress.h> #include <linux/vexpress.h>
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>
#include <drm/drm_print.h>
#include "pl111_versatile.h" #include "pl111_versatile.h"
#include "pl111_drm.h" #include "pl111_drm.h"
@ -116,7 +117,7 @@ static void pl111_integrator_enable(struct drm_device *drm, u32 format)
{ {
u32 val; u32 val;
dev_info(drm->dev, "enable Integrator CLCD connectors\n"); drm_info(drm, "enable Integrator CLCD connectors\n");
/* FIXME: really needed? */ /* FIXME: really needed? */
val = INTEGRATOR_CLCD_LCD_STATIC1 | INTEGRATOR_CLCD_LCD_STATIC2 | val = INTEGRATOR_CLCD_LCD_STATIC1 | INTEGRATOR_CLCD_LCD_STATIC2 |
@ -134,7 +135,7 @@ static void pl111_integrator_enable(struct drm_device *drm, u32 format)
val |= INTEGRATOR_CLCD_LCDMUX_VGA555; val |= INTEGRATOR_CLCD_LCDMUX_VGA555;
break; break;
default: default:
dev_err(drm->dev, "unhandled format on Integrator 0x%08x\n", drm_err(drm, "unhandled format on Integrator 0x%08x\n",
format); format);
break; break;
} }
@ -156,7 +157,7 @@ static void pl111_impd1_enable(struct drm_device *drm, u32 format)
{ {
u32 val; u32 val;
dev_info(drm->dev, "enable IM-PD1 CLCD connectors\n"); drm_info(drm, "enable IM-PD1 CLCD connectors\n");
val = IMPD1_CTRL_DISP_VGA | IMPD1_CTRL_DISP_ENABLE; val = IMPD1_CTRL_DISP_VGA | IMPD1_CTRL_DISP_ENABLE;
regmap_update_bits(versatile_syscon_map, regmap_update_bits(versatile_syscon_map,
@ -167,7 +168,7 @@ static void pl111_impd1_enable(struct drm_device *drm, u32 format)
static void pl111_impd1_disable(struct drm_device *drm) static void pl111_impd1_disable(struct drm_device *drm)
{ {
dev_info(drm->dev, "disable IM-PD1 CLCD connectors\n"); drm_info(drm, "disable IM-PD1 CLCD connectors\n");
regmap_update_bits(versatile_syscon_map, regmap_update_bits(versatile_syscon_map,
IMPD1_CTRL_OFFSET, IMPD1_CTRL_OFFSET,
@ -194,7 +195,7 @@ static void pl111_impd1_disable(struct drm_device *drm)
static void pl111_versatile_disable(struct drm_device *drm) static void pl111_versatile_disable(struct drm_device *drm)
{ {
dev_info(drm->dev, "disable Versatile CLCD connectors\n"); drm_info(drm, "disable Versatile CLCD connectors\n");
regmap_update_bits(versatile_syscon_map, regmap_update_bits(versatile_syscon_map,
SYS_CLCD, SYS_CLCD,
SYS_CLCD_CONNECTOR_MASK, SYS_CLCD_CONNECTOR_MASK,
@ -205,7 +206,7 @@ static void pl111_versatile_enable(struct drm_device *drm, u32 format)
{ {
u32 val = 0; u32 val = 0;
dev_info(drm->dev, "enable Versatile CLCD connectors\n"); drm_info(drm, "enable Versatile CLCD connectors\n");
switch (format) { switch (format) {
case DRM_FORMAT_ABGR8888: case DRM_FORMAT_ABGR8888:
@ -227,7 +228,7 @@ static void pl111_versatile_enable(struct drm_device *drm, u32 format)
val |= SYS_CLCD_MODE_5551; val |= SYS_CLCD_MODE_5551;
break; break;
default: default:
dev_err(drm->dev, "unhandled format on Versatile 0x%08x\n", drm_err(drm, "unhandled format on Versatile 0x%08x\n",
format); format);
break; break;
} }
@ -247,7 +248,7 @@ static void pl111_versatile_enable(struct drm_device *drm, u32 format)
static void pl111_realview_clcd_disable(struct drm_device *drm) static void pl111_realview_clcd_disable(struct drm_device *drm)
{ {
dev_info(drm->dev, "disable RealView CLCD connectors\n"); drm_info(drm, "disable RealView CLCD connectors\n");
regmap_update_bits(versatile_syscon_map, regmap_update_bits(versatile_syscon_map,
SYS_CLCD, SYS_CLCD,
SYS_CLCD_CONNECTOR_MASK, SYS_CLCD_CONNECTOR_MASK,
@ -256,7 +257,7 @@ static void pl111_realview_clcd_disable(struct drm_device *drm)
static void pl111_realview_clcd_enable(struct drm_device *drm, u32 format) static void pl111_realview_clcd_enable(struct drm_device *drm, u32 format)
{ {
dev_info(drm->dev, "enable RealView CLCD connectors\n"); drm_info(drm, "enable RealView CLCD connectors\n");
regmap_update_bits(versatile_syscon_map, regmap_update_bits(versatile_syscon_map,
SYS_CLCD, SYS_CLCD,
SYS_CLCD_CONNECTOR_MASK, SYS_CLCD_CONNECTOR_MASK,
@ -376,7 +377,7 @@ static const struct pl111_variant_data pl111_vexpress = {
#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01 #define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01
#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02 #define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02
static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np, static int pl111_vexpress_clcd_init(struct drm_device *dev, struct device_node *np,
struct pl111_drm_dev_private *priv) struct pl111_drm_dev_private *priv)
{ {
struct platform_device *pdev; struct platform_device *pdev;
@ -433,22 +434,22 @@ static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np,
mux_motherboard = false; mux_motherboard = false;
if (mux_motherboard) { if (mux_motherboard) {
dev_info(dev, "DVI muxed to motherboard CLCD\n"); drm_info(dev, "DVI muxed to motherboard CLCD\n");
val = VEXPRESS_FPGAMUX_MOTHERBOARD; val = VEXPRESS_FPGAMUX_MOTHERBOARD;
} else if (ct_clcd == dev->of_node) { } else if (ct_clcd == dev->dev->of_node) {
dev_info(dev, drm_info(dev,
"DVI muxed to daughterboard 1 (core tile) CLCD\n"); "DVI muxed to daughterboard 1 (core tile) CLCD\n");
val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1; val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1;
} else { } else {
dev_info(dev, "core tile graphics present\n"); drm_info(dev, "core tile graphics present\n");
dev_info(dev, "this device will be deactivated\n"); drm_info(dev, "this device will be deactivated\n");
return -ENODEV; return -ENODEV;
} }
/* Call into deep Vexpress configuration API */ /* Call into deep Vexpress configuration API */
pdev = of_find_device_by_node(np); pdev = of_find_device_by_node(np);
if (!pdev) { if (!pdev) {
dev_err(dev, "can't find the sysreg device, deferring\n"); drm_err(dev, "can't find the sysreg device, deferring\n");
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
@ -461,17 +462,17 @@ static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np,
ret = regmap_write(map, 0, val); ret = regmap_write(map, 0, val);
platform_device_put(pdev); platform_device_put(pdev);
if (ret) { if (ret) {
dev_err(dev, "error setting DVI muxmode\n"); drm_err(dev, "error setting DVI muxmode\n");
return -ENODEV; return -ENODEV;
} }
priv->variant = &pl111_vexpress; priv->variant = &pl111_vexpress;
dev_info(dev, "initializing Versatile Express PL111\n"); drm_info(dev, "initializing Versatile Express PL111\n");
return 0; return 0;
} }
int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) int pl111_versatile_init(struct drm_device *dev, struct pl111_drm_dev_private *priv)
{ {
const struct of_device_id *clcd_id; const struct of_device_id *clcd_id;
enum versatile_clcd versatile_clcd_type; enum versatile_clcd versatile_clcd_type;
@ -492,7 +493,7 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
int ret = pl111_vexpress_clcd_init(dev, np, priv); int ret = pl111_vexpress_clcd_init(dev, np, priv);
of_node_put(np); of_node_put(np);
if (ret) if (ret)
dev_err(dev, "Versatile Express init failed - %d", ret); drm_err(dev, "Versatile Express init failed - %d", ret);
return ret; return ret;
} }
@ -511,7 +512,7 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
map = syscon_node_to_regmap(np); map = syscon_node_to_regmap(np);
of_node_put(np); of_node_put(np);
if (IS_ERR(map)) { if (IS_ERR(map)) {
dev_err(dev, "no Versatile syscon regmap\n"); drm_err(dev, "no Versatile syscon regmap\n");
return PTR_ERR(map); return PTR_ERR(map);
} }
@ -520,14 +521,14 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
versatile_syscon_map = map; versatile_syscon_map = map;
priv->variant = &pl110_integrator; priv->variant = &pl110_integrator;
priv->variant_display_enable = pl111_integrator_enable; priv->variant_display_enable = pl111_integrator_enable;
dev_info(dev, "set up callbacks for Integrator PL110\n"); drm_info(dev, "set up callbacks for Integrator PL110\n");
break; break;
case INTEGRATOR_IMPD1: case INTEGRATOR_IMPD1:
versatile_syscon_map = map; versatile_syscon_map = map;
priv->variant = &pl110_impd1; priv->variant = &pl110_impd1;
priv->variant_display_enable = pl111_impd1_enable; priv->variant_display_enable = pl111_impd1_enable;
priv->variant_display_disable = pl111_impd1_disable; priv->variant_display_disable = pl111_impd1_disable;
dev_info(dev, "set up callbacks for IM-PD1 PL110\n"); drm_info(dev, "set up callbacks for IM-PD1 PL110\n");
break; break;
case VERSATILE_CLCD: case VERSATILE_CLCD:
versatile_syscon_map = map; versatile_syscon_map = map;
@ -542,7 +543,7 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
*/ */
priv->ienb = CLCD_PL111_IENB; priv->ienb = CLCD_PL111_IENB;
priv->ctrl = CLCD_PL111_CNTL; priv->ctrl = CLCD_PL111_CNTL;
dev_info(dev, "set up callbacks for Versatile PL110\n"); drm_info(dev, "set up callbacks for Versatile PL110\n");
break; break;
case REALVIEW_CLCD_EB: case REALVIEW_CLCD_EB:
case REALVIEW_CLCD_PB1176: case REALVIEW_CLCD_PB1176:
@ -553,10 +554,10 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
priv->variant = &pl111_realview; priv->variant = &pl111_realview;
priv->variant_display_enable = pl111_realview_clcd_enable; priv->variant_display_enable = pl111_realview_clcd_enable;
priv->variant_display_disable = pl111_realview_clcd_disable; priv->variant_display_disable = pl111_realview_clcd_disable;
dev_info(dev, "set up callbacks for RealView PL111\n"); drm_info(dev, "set up callbacks for RealView PL111\n");
break; break;
default: default:
dev_info(dev, "unknown Versatile system controller\n"); drm_info(dev, "unknown Versatile system controller\n");
break; break;
} }

2
drivers/gpu/drm/pl111/pl111_versatile.h
View File

@ -7,6 +7,6 @@
struct device; struct device;
struct pl111_drm_dev_private; struct pl111_drm_dev_private;
int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv); int pl111_versatile_init(struct drm_device *dev, struct pl111_drm_dev_private *priv);
#endif #endif