From 8d7e60f3192a3274e9a457c8868528da5fe5aa01 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 13 Aug 2020 17:13:18 +0800 Subject: [PATCH] drm/rockchip: update iommu pagefault debug log style Change-Id: Ifda2f19f2ce2d2051996de846ffac1bc1c851fa1 Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 1a0691c245ec..8fa6546825e5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -1188,6 +1188,7 @@ static int rockchip_drm_fault_handler(struct iommu_domain *iommu, struct rockchip_drm_private *priv = drm_dev->dev_private; struct drm_crtc *crtc; + DRM_ERROR("iommu fault handler flags: 0x%x\n", flags); drm_for_each_crtc(crtc, drm_dev) { int pipe = drm_crtc_index(crtc); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index d00a5818f91f..36378cb1d619 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -2388,10 +2388,10 @@ static void vop_crtc_regs_dump(struct drm_crtc *crtc, struct seq_file *s) if (!crtc_state->active) return; - for (i = 0; i < dump_len; i += 4) { - if (i % 16 == 0) - DEBUG_PRINT("\n0x%08x: ", i); - DEBUG_PRINT("%08x ", vop_readl(vop, i)); + for (i = 0; i < dump_len; i += 16) { + DEBUG_PRINT("0x%08x: %08x %08x %08x %08x\n", i, + vop_readl(vop, i), vop_readl(vop, i + 4), + vop_readl(vop, i + 8), vop_readl(vop, i + 12)); } }