patch #1 is using the drm_err instead of DRM_ERROR in hibmc_ttm.c
patch #2 is using the drm_err instead of DRM_ERROR in hibmc_drm_vdac.c
patch #3 is using the drm_err and drm_dbg_atomic instead of DRM_ERROR
and DRM_DEBUG_ATOMIC in hibmc_drm_de.c
patch #4 is using the drm_err and drm_warn instead of DRM_ERROR and
DRM_WARN in hibmc_drm_drv.c
Changes since v1:
-Fixed spelling errors in patch name.
Tian Tao (4):
drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_ttm
drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_drm_vdac
drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_drm_de
drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_drm_drv
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +++++++-------
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 24 ++++++++++++------------
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 4 ++--
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
4 files changed, 22 insertions(+), 22 deletions(-)
--
2.7.4
Use drm_err instead of DRM_ERROR in hibmc_drm_de
Signed-off-by: Tian Tao <[email protected]>
---
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
index d9062a3..4d57ec6 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
@@ -71,12 +71,12 @@ static int hibmc_plane_atomic_check(struct drm_plane *plane,
return PTR_ERR(crtc_state);
if (src_w != state->crtc_w || src_h != state->crtc_h) {
- DRM_DEBUG_ATOMIC("scale not support\n");
+ drm_dbg_atomic(plane->dev, "scale not support\n");
return -EINVAL;
}
if (state->crtc_x < 0 || state->crtc_y < 0) {
- DRM_DEBUG_ATOMIC("crtc_x/y of drm_plane state is invalid\n");
+ drm_dbg_atomic(plane->dev, "crtc_x/y of drm_plane state is invalid\n");
return -EINVAL;
}
@@ -87,12 +87,12 @@ static int hibmc_plane_atomic_check(struct drm_plane *plane,
crtc_state->adjusted_mode.hdisplay ||
state->crtc_y + state->crtc_h >
crtc_state->adjusted_mode.vdisplay) {
- DRM_DEBUG_ATOMIC("visible portion of plane is invalid\n");
+ drm_dbg_atomic(plane->dev, "visible portion of plane is invalid\n");
return -EINVAL;
}
if (state->fb->pitches[0] % 128 != 0) {
- DRM_DEBUG_ATOMIC("wrong stride with 128-byte aligned\n");
+ drm_dbg_atomic(plane->dev, "wrong stride with 128-byte aligned\n");
return -EINVAL;
}
return 0;
@@ -515,7 +515,7 @@ int hibmc_de_init(struct hibmc_drm_private *priv)
NULL);
if (ret) {
- DRM_ERROR("failed to init plane: %d\n", ret);
+ drm_err(dev, "failed to init plane: %d\n", ret);
return ret;
}
@@ -524,13 +524,13 @@ int hibmc_de_init(struct hibmc_drm_private *priv)
ret = drm_crtc_init_with_planes(dev, crtc, plane,
NULL, &hibmc_crtc_funcs, NULL);
if (ret) {
- DRM_ERROR("failed to init crtc: %d\n", ret);
+ drm_err(dev, "failed to init crtc: %d\n", ret);
return ret;
}
ret = drm_mode_crtc_set_gamma_size(crtc, 256);
if (ret) {
- DRM_ERROR("failed to set gamma size: %d\n", ret);
+ drm_err(dev, "failed to set gamma size: %d\n", ret);
return ret;
}
drm_crtc_helper_add(crtc, &hibmc_crtc_helper_funcs);
--
2.7.4
Hi
Am 19.08.20 um 11:23 schrieb Tian Tao:
> patch #1 is using the drm_err instead of DRM_ERROR in hibmc_ttm.c
> patch #2 is using the drm_err instead of DRM_ERROR in hibmc_drm_vdac.c
> patch #3 is using the drm_err and drm_dbg_atomic instead of DRM_ERROR
> and DRM_DEBUG_ATOMIC in hibmc_drm_de.c
> patch #4 is using the drm_err and drm_warn instead of DRM_ERROR and
> DRM_WARN in hibmc_drm_drv.c
>
> Changes since v1:
> -Fixed spelling errors in patch name.
Just a few formal nits: it's common to also log the changes in the
patches themselves. And as I already R-b'ed the patchset, the patches
should contain the tag.
So
Reviewed-by: Thomas Zimmermann <[email protected]>
for the whole series. If no one else has comments, it should be fine to
merge the patches by the end of the week.
Best regards
Thomas
>
> Tian Tao (4):
> drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_ttm
> drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_drm_vdac
> drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_drm_de
> drm/hisilicon: Use drm_err instead of DRM_ERROR in hibmc_drm_drv
>
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +++++++-------
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 24 ++++++++++++------------
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 4 ++--
> drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
> 4 files changed, 22 insertions(+), 22 deletions(-)
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer