Skip to content

Commit 2e8d999

Browse files
bivvyZhengShunQian
authored andcommitted
drm/rockchip: vop: Silence debug messages
[ 0.543299] rockchip-vop ff460000.vop: invalid resource [ 0.543346] rockchip-vop ff460000.vop: failed to get vop cabc lut registers [ 0.543686] rockchip-vop ff460000.vop: unable to request PWM [ 0.543717] [drm] no mcu-timing node found in /vop@ff460000 [ 0.543762] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops) This makes all of these messages dev_dbg. They are still useful to debug, but we do not need them filling up the kernel logs in normal operation. Change-Id: I134585323b477c23a8085042602f5df592e619cb Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
1 parent 0b62f17 commit 2e8d999

2 files changed

Lines changed: 13 additions & 16 deletions

File tree

drivers/gpu/drm/rockchip/rockchip_drm_backlight.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ int of_rockchip_drm_sub_backlight_register(struct device *dev,
250250

251251
pwm = devm_pwm_get(dev, NULL);
252252
if (IS_ERR(pwm)) {
253-
dev_err(dev, "unable to request PWM\n");
253+
dev_dbg(dev, "unable to request PWM\n");
254254
return PTR_ERR(pwm);
255255
}
256256

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4380,34 +4380,31 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
43804380
return -ENOMEM;
43814381

43824382
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gamma_lut");
4383-
vop->lut_regs = devm_ioremap_resource(dev, res);
4384-
if (IS_ERR(vop->lut_regs)) {
4385-
dev_warn(vop->dev, "failed to get vop lut registers\n");
4386-
vop->lut_regs = NULL;
4387-
}
4388-
if (vop->lut_regs) {
4383+
if (res) {
43894384
vop->lut_len = resource_size(res) / sizeof(*vop->lut);
43904385
if (vop->lut_len != 256 && vop->lut_len != 1024) {
43914386
dev_err(vop->dev, "unsupport lut sizes %d\n",
43924387
vop->lut_len);
43934388
return -EINVAL;
43944389
}
4395-
}
43964390

4397-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cabc_lut");
4398-
vop->cabc_lut_regs = devm_ioremap_resource(dev, res);
4399-
if (IS_ERR(vop->cabc_lut_regs)) {
4400-
dev_warn(vop->dev, "failed to get vop cabc lut registers\n");
4401-
vop->cabc_lut_regs = NULL;
4391+
vop->lut_regs = devm_ioremap_resource(dev, res);
4392+
if (IS_ERR(vop->lut_regs))
4393+
return PTR_ERR(vop->lut_regs);
44024394
}
44034395

4404-
if (vop->cabc_lut_regs) {
4396+
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cabc_lut");
4397+
if (res) {
44054398
vop->cabc_lut_len = resource_size(res) >> 2;
44064399
if (vop->cabc_lut_len != 128) {
44074400
dev_err(vop->dev, "unsupport cabc lut sizes %d\n",
44084401
vop->cabc_lut_len);
44094402
return -EINVAL;
44104403
}
4404+
4405+
vop->cabc_lut_regs = devm_ioremap_resource(dev, res);
4406+
if (IS_ERR(vop->cabc_lut_regs))
4407+
return PTR_ERR(vop->cabc_lut_regs);
44114408
}
44124409

44134410
vop->grf = syscon_regmap_lookup_by_phandle(dev->of_node,
@@ -4473,8 +4470,8 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
44734470

44744471
mcu = of_get_child_by_name(dev->of_node, "mcu-timing");
44754472
if (!mcu) {
4476-
DRM_INFO("no mcu-timing node found in %s\n",
4477-
dev->of_node->full_name);
4473+
dev_dbg(dev, "no mcu-timing node found in %s\n",
4474+
dev->of_node->full_name);
44784475
} else {
44794476
u32 val;
44804477

0 commit comments

Comments
 (0)