AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/exynos: use DRM_DEV_DEBUG* instead of DRM_DEBUG macro

Browse Source 
Use DRM_DEV_DEBUG* instead of DRM_DEBUG macro to print out
debug messages.

This patch just cleans up the use of debug log macro, which changes
the log macro to DRM_DEV_DEBUG*.

Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Inki Dae 2019-04-15 16:25:12 +09:00
parent 6f83d20838
commit 6be900563a
13 changed files with 191 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/exynos/exynos5433_drm_decon.c
View File

@ -356,7 +356,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
break; break;
} }
DRM_DEBUG_KMS("cpp = %u\n", fb->format->cpp[0]); DRM_DEV_DEBUG_KMS(ctx->dev, "cpp = %u\n", fb->format->cpp[0]);
/* /*
* In case of exynos, setting dma-burst to 16Word causes permanent * In case of exynos, setting dma-burst to 16Word causes permanent

10
drivers/gpu/drm/exynos/exynos7_drm_decon.c
View File

@ -99,7 +99,7 @@ static void decon_wait_for_vblank(struct exynos_drm_crtc *crtc)
if (!wait_event_timeout(ctx->wait_vsync_queue, if (!wait_event_timeout(ctx->wait_vsync_queue,
!atomic_read(&ctx->wait_vsync_event), !atomic_read(&ctx->wait_vsync_event),
HZ/20)) HZ/20))
DRM_DEBUG_KMS("vblank wait timed out.\n"); DRM_DEV_DEBUG_KMS(ctx->dev, "vblank wait timed out.\n");
} }
static void decon_clear_channels(struct exynos_drm_crtc *crtc) static void decon_clear_channels(struct exynos_drm_crtc *crtc)
@ -313,7 +313,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
break; break;
} }
DRM_DEBUG_KMS("cpp = %d\n", fb->format->cpp[0]); DRM_DEV_DEBUG_KMS(ctx->dev, "cpp = %d\n", fb->format->cpp[0]);
/* /*
* In case of exynos, setting dma-burst to 16Word causes permanent * In case of exynos, setting dma-burst to 16Word causes permanent
@ -420,9 +420,9 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
writel(state->src.x, ctx->regs + VIDW_OFFSET_X(win)); writel(state->src.x, ctx->regs + VIDW_OFFSET_X(win));
writel(state->src.y, ctx->regs + VIDW_OFFSET_Y(win)); writel(state->src.y, ctx->regs + VIDW_OFFSET_Y(win));
DRM_DEBUG_KMS("start addr = 0x%lx\n", DRM_DEV_DEBUG_KMS(ctx->dev, "start addr = 0x%lx\n",
(unsigned long)val); (unsigned long)val);
DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n", DRM_DEV_DEBUG_KMS(ctx->dev, "ovl_width = %d, ovl_height = %d\n",
state->crtc.w, state->crtc.h); state->crtc.w, state->crtc.h);
val = VIDOSDxA_TOPLEFT_X(state->crtc.x) | val = VIDOSDxA_TOPLEFT_X(state->crtc.x) |
@ -440,7 +440,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
writel(val, ctx->regs + VIDOSD_B(win)); writel(val, ctx->regs + VIDOSD_B(win));
DRM_DEBUG_KMS("osd pos: tx = %d, ty = %d, bx = %d, by = %d\n", DRM_DEV_DEBUG_KMS(ctx->dev, "osd pos: tx = %d, ty = %d, bx = %d, by = %d\n",
state->crtc.x, state->crtc.y, last_x, last_y); state->crtc.x, state->crtc.y, last_x, last_y);
/* OSD alpha */ /* OSD alpha */

7
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
View File

@ -122,9 +122,10 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
unsigned long size; unsigned long size;
int ret; int ret;
DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d\n", DRM_DEV_DEBUG_KMS(dev->dev,
sizes->surface_width, sizes->surface_height, "surface width(%d), height(%d) and bpp(%d\n",
sizes->surface_bpp); sizes->surface_width, sizes->surface_height,
sizes->surface_bpp);
mode_cmd.width = sizes->surface_width; mode_cmd.width = sizes->surface_width;
mode_cmd.height = sizes->surface_height; mode_cmd.height = sizes->surface_height;

85
drivers/gpu/drm/exynos/exynos_drm_fimc.c
View File

@ -186,7 +186,7 @@ static void fimc_handle_jpeg(struct fimc_context *ctx, bool enable)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("enable[%d]\n", enable); DRM_DEV_DEBUG_KMS(ctx->dev, "enable[%d]\n", enable);
cfg = fimc_read(ctx, EXYNOS_CIGCTRL); cfg = fimc_read(ctx, EXYNOS_CIGCTRL);
if (enable) if (enable)
@ -201,7 +201,7 @@ static void fimc_mask_irq(struct fimc_context *ctx, bool enable)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("enable[%d]\n", enable); DRM_DEV_DEBUG_KMS(ctx->dev, "enable[%d]\n", enable);
cfg = fimc_read(ctx, EXYNOS_CIGCTRL); cfg = fimc_read(ctx, EXYNOS_CIGCTRL);
if (enable) { if (enable) {
@ -225,7 +225,7 @@ static bool fimc_check_ovf(struct fimc_context *ctx)
flag = EXYNOS_CISTATUS_OVFIY | EXYNOS_CISTATUS_OVFICB | flag = EXYNOS_CISTATUS_OVFIY | EXYNOS_CISTATUS_OVFICB |
EXYNOS_CISTATUS_OVFICR; EXYNOS_CISTATUS_OVFICR;
DRM_DEBUG_KMS("flag[0x%x]\n", flag); DRM_DEV_DEBUG_KMS(ctx->dev, "flag[0x%x]\n", flag);
if (status & flag) { if (status & flag) {
fimc_set_bits(ctx, EXYNOS_CIWDOFST, fimc_set_bits(ctx, EXYNOS_CIWDOFST,
@ -247,7 +247,7 @@ static bool fimc_check_frame_end(struct fimc_context *ctx)
cfg = fimc_read(ctx, EXYNOS_CISTATUS); cfg = fimc_read(ctx, EXYNOS_CISTATUS);
DRM_DEBUG_KMS("cfg[0x%x]\n", cfg); DRM_DEV_DEBUG_KMS(ctx->dev, "cfg[0x%x]\n", cfg);
if (!(cfg & EXYNOS_CISTATUS_FRAMEEND)) if (!(cfg & EXYNOS_CISTATUS_FRAMEEND))
return false; return false;
@ -269,9 +269,9 @@ static int fimc_get_buf_id(struct fimc_context *ctx)
if (frame_cnt == 0) if (frame_cnt == 0)
frame_cnt = EXYNOS_CISTATUS2_GET_FRAMECOUNT_PRESENT(cfg); frame_cnt = EXYNOS_CISTATUS2_GET_FRAMECOUNT_PRESENT(cfg);
DRM_DEBUG_KMS("present[%d]before[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "present[%d]before[%d]\n",
EXYNOS_CISTATUS2_GET_FRAMECOUNT_PRESENT(cfg), EXYNOS_CISTATUS2_GET_FRAMECOUNT_PRESENT(cfg),
EXYNOS_CISTATUS2_GET_FRAMECOUNT_BEFORE(cfg)); EXYNOS_CISTATUS2_GET_FRAMECOUNT_BEFORE(cfg));
if (frame_cnt == 0) { if (frame_cnt == 0) {
DRM_DEV_ERROR(ctx->dev, "failed to get frame count.\n"); DRM_DEV_ERROR(ctx->dev, "failed to get frame count.\n");
@ -279,7 +279,7 @@ static int fimc_get_buf_id(struct fimc_context *ctx)
} }
buf_id = frame_cnt - 1; buf_id = frame_cnt - 1;
DRM_DEBUG_KMS("buf_id[%d]\n", buf_id); DRM_DEV_DEBUG_KMS(ctx->dev, "buf_id[%d]\n", buf_id);
return buf_id; return buf_id;
} }
@ -288,7 +288,7 @@ static void fimc_handle_lastend(struct fimc_context *ctx, bool enable)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("enable[%d]\n", enable); DRM_DEV_DEBUG_KMS(ctx->dev, "enable[%d]\n", enable);
cfg = fimc_read(ctx, EXYNOS_CIOCTRL); cfg = fimc_read(ctx, EXYNOS_CIOCTRL);
if (enable) if (enable)
@ -303,7 +303,7 @@ static void fimc_src_set_fmt_order(struct fimc_context *ctx, u32 fmt)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("fmt[0x%x]\n", fmt); DRM_DEV_DEBUG_KMS(ctx->dev, "fmt[0x%x]\n", fmt);
/* RGB */ /* RGB */
cfg = fimc_read(ctx, EXYNOS_CISCCTRL); cfg = fimc_read(ctx, EXYNOS_CISCCTRL);
@ -368,7 +368,7 @@ static void fimc_src_set_fmt(struct fimc_context *ctx, u32 fmt, bool tiled)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("fmt[0x%x]\n", fmt); DRM_DEV_DEBUG_KMS(ctx->dev, "fmt[0x%x]\n", fmt);
cfg = fimc_read(ctx, EXYNOS_MSCTRL); cfg = fimc_read(ctx, EXYNOS_MSCTRL);
cfg &= ~EXYNOS_MSCTRL_INFORMAT_RGB; cfg &= ~EXYNOS_MSCTRL_INFORMAT_RGB;
@ -421,7 +421,7 @@ static void fimc_src_set_transf(struct fimc_context *ctx, unsigned int rotation)
unsigned int degree = rotation & DRM_MODE_ROTATE_MASK; unsigned int degree = rotation & DRM_MODE_ROTATE_MASK;
u32 cfg1, cfg2; u32 cfg1, cfg2;
DRM_DEBUG_KMS("rotation[%x]\n", rotation); DRM_DEV_DEBUG_KMS(ctx->dev, "rotation[%x]\n", rotation);
cfg1 = fimc_read(ctx, EXYNOS_MSCTRL); cfg1 = fimc_read(ctx, EXYNOS_MSCTRL);
cfg1 &= ~(EXYNOS_MSCTRL_FLIP_X_MIRROR | cfg1 &= ~(EXYNOS_MSCTRL_FLIP_X_MIRROR |
@ -479,10 +479,11 @@ static void fimc_set_window(struct fimc_context *ctx,
v1 = buf->rect.y; v1 = buf->rect.y;
v2 = buf->buf.height - buf->rect.h - buf->rect.y; v2 = buf->buf.height - buf->rect.h - buf->rect.y;
DRM_DEBUG_KMS("x[%d]y[%d]w[%d]h[%d]hsize[%d]vsize[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "x[%d]y[%d]w[%d]h[%d]hsize[%d]vsize[%d]\n",
buf->rect.x, buf->rect.y, buf->rect.w, buf->rect.h, buf->rect.x, buf->rect.y, buf->rect.w, buf->rect.h,
real_width, buf->buf.height); real_width, buf->buf.height);
DRM_DEBUG_KMS("h1[%d]h2[%d]v1[%d]v2[%d]\n", h1, h2, v1, v2); DRM_DEV_DEBUG_KMS(ctx->dev, "h1[%d]h2[%d]v1[%d]v2[%d]\n", h1, h2, v1,
v2);
/* /*
* set window offset 1, 2 size * set window offset 1, 2 size
@ -507,7 +508,8 @@ static void fimc_src_set_size(struct fimc_context *ctx,
unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0]; unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height); DRM_DEV_DEBUG_KMS(ctx->dev, "hsize[%d]vsize[%d]\n", real_width,
buf->buf.height);
/* original size */ /* original size */
cfg = (EXYNOS_ORGISIZE_HORIZONTAL(real_width) | cfg = (EXYNOS_ORGISIZE_HORIZONTAL(real_width) |
@ -515,8 +517,8 @@ static void fimc_src_set_size(struct fimc_context *ctx,
fimc_write(ctx, cfg, EXYNOS_ORGISIZE); fimc_write(ctx, cfg, EXYNOS_ORGISIZE);
DRM_DEBUG_KMS("x[%d]y[%d]w[%d]h[%d]\n", buf->rect.x, buf->rect.y, DRM_DEV_DEBUG_KMS(ctx->dev, "x[%d]y[%d]w[%d]h[%d]\n", buf->rect.x,
buf->rect.w, buf->rect.h); buf->rect.y, buf->rect.w, buf->rect.h);
/* set input DMA image size */ /* set input DMA image size */
cfg = fimc_read(ctx, EXYNOS_CIREAL_ISIZE); cfg = fimc_read(ctx, EXYNOS_CIREAL_ISIZE);
@ -561,7 +563,7 @@ static void fimc_dst_set_fmt_order(struct fimc_context *ctx, u32 fmt)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("fmt[0x%x]\n", fmt); DRM_DEV_DEBUG_KMS(ctx->dev, "fmt[0x%x]\n", fmt);
/* RGB */ /* RGB */
cfg = fimc_read(ctx, EXYNOS_CISCCTRL); cfg = fimc_read(ctx, EXYNOS_CISCCTRL);
@ -632,7 +634,7 @@ static void fimc_dst_set_fmt(struct fimc_context *ctx, u32 fmt, bool tiled)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("fmt[0x%x]\n", fmt); DRM_DEV_DEBUG_KMS(ctx->dev, "fmt[0x%x]\n", fmt);
cfg = fimc_read(ctx, EXYNOS_CIEXTEN); cfg = fimc_read(ctx, EXYNOS_CIEXTEN);
@ -692,7 +694,7 @@ static void fimc_dst_set_transf(struct fimc_context *ctx, unsigned int rotation)
unsigned int degree = rotation & DRM_MODE_ROTATE_MASK; unsigned int degree = rotation & DRM_MODE_ROTATE_MASK;
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("rotation[0x%x]\n", rotation); DRM_DEV_DEBUG_KMS(ctx->dev, "rotation[0x%x]\n", rotation);
cfg = fimc_read(ctx, EXYNOS_CITRGFMT); cfg = fimc_read(ctx, EXYNOS_CITRGFMT);
cfg &= ~EXYNOS_CITRGFMT_FLIP_MASK; cfg &= ~EXYNOS_CITRGFMT_FLIP_MASK;
@ -776,19 +778,20 @@ static int fimc_set_prescaler(struct fimc_context *ctx, struct fimc_scaler *sc,
pre_dst_width = src_w >> hfactor; pre_dst_width = src_w >> hfactor;
pre_dst_height = src_h >> vfactor; pre_dst_height = src_h >> vfactor;
DRM_DEBUG_KMS("pre_dst_width[%d]pre_dst_height[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "pre_dst_width[%d]pre_dst_height[%d]\n",
pre_dst_width, pre_dst_height); pre_dst_width, pre_dst_height);
DRM_DEBUG_KMS("hfactor[%d]vfactor[%d]\n", hfactor, vfactor); DRM_DEV_DEBUG_KMS(ctx->dev, "hfactor[%d]vfactor[%d]\n", hfactor,
vfactor);
sc->hratio = (src_w << 14) / (dst_w << hfactor); sc->hratio = (src_w << 14) / (dst_w << hfactor);
sc->vratio = (src_h << 14) / (dst_h << vfactor); sc->vratio = (src_h << 14) / (dst_h << vfactor);
sc->up_h = (dst_w >= src_w) ? true : false; sc->up_h = (dst_w >= src_w) ? true : false;
sc->up_v = (dst_h >= src_h) ? true : false; sc->up_v = (dst_h >= src_h) ? true : false;
DRM_DEBUG_KMS("hratio[%d]vratio[%d]up_h[%d]up_v[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "hratio[%d]vratio[%d]up_h[%d]up_v[%d]\n",
sc->hratio, sc->vratio, sc->up_h, sc->up_v); sc->hratio, sc->vratio, sc->up_h, sc->up_v);
shfactor = FIMC_SHFACTOR - (hfactor + vfactor); shfactor = FIMC_SHFACTOR - (hfactor + vfactor);
DRM_DEBUG_KMS("shfactor[%d]\n", shfactor); DRM_DEV_DEBUG_KMS(ctx->dev, "shfactor[%d]\n", shfactor);
cfg = (EXYNOS_CISCPRERATIO_SHFACTOR(shfactor) | cfg = (EXYNOS_CISCPRERATIO_SHFACTOR(shfactor) |
EXYNOS_CISCPRERATIO_PREHORRATIO(1 << hfactor) | EXYNOS_CISCPRERATIO_PREHORRATIO(1 << hfactor) |
@ -806,10 +809,10 @@ static void fimc_set_scaler(struct fimc_context *ctx, struct fimc_scaler *sc)
{ {
u32 cfg, cfg_ext; u32 cfg, cfg_ext;
DRM_DEBUG_KMS("range[%d]bypass[%d]up_h[%d]up_v[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "range[%d]bypass[%d]up_h[%d]up_v[%d]\n",
sc->range, sc->bypass, sc->up_h, sc->up_v); sc->range, sc->bypass, sc->up_h, sc->up_v);
DRM_DEBUG_KMS("hratio[%d]vratio[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "hratio[%d]vratio[%d]\n",
sc->hratio, sc->vratio); sc->hratio, sc->vratio);
cfg = fimc_read(ctx, EXYNOS_CISCCTRL); cfg = fimc_read(ctx, EXYNOS_CISCCTRL);
cfg &= ~(EXYNOS_CISCCTRL_SCALERBYPASS | cfg &= ~(EXYNOS_CISCCTRL_SCALERBYPASS |
@ -847,7 +850,8 @@ static void fimc_dst_set_size(struct fimc_context *ctx,
unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0]; unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
u32 cfg, cfg_ext; u32 cfg, cfg_ext;
DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height); DRM_DEV_DEBUG_KMS(ctx->dev, "hsize[%d]vsize[%d]\n", real_width,
buf->buf.height);
/* original size */ /* original size */
cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(real_width) | cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(real_width) |
@ -855,8 +859,9 @@ static void fimc_dst_set_size(struct fimc_context *ctx,
fimc_write(ctx, cfg, EXYNOS_ORGOSIZE); fimc_write(ctx, cfg, EXYNOS_ORGOSIZE);
DRM_DEBUG_KMS("x[%d]y[%d]w[%d]h[%d]\n", buf->rect.x, buf->rect.y, DRM_DEV_DEBUG_KMS(ctx->dev, "x[%d]y[%d]w[%d]h[%d]\n", buf->rect.x,
buf->rect.w, buf->rect.h); buf->rect.y,
buf->rect.w, buf->rect.h);
/* CSC ITU */ /* CSC ITU */
cfg = fimc_read(ctx, EXYNOS_CIGCTRL); cfg = fimc_read(ctx, EXYNOS_CIGCTRL);
@ -906,7 +911,7 @@ static void fimc_dst_set_buf_seq(struct fimc_context *ctx, u32 buf_id,
u32 buf_num; u32 buf_num;
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("buf_id[%d]enqueu[%d]\n", buf_id, enqueue); DRM_DEV_DEBUG_KMS(ctx->dev, "buf_id[%d]enqueu[%d]\n", buf_id, enqueue);
spin_lock_irqsave(&ctx->lock, flags); spin_lock_irqsave(&ctx->lock, flags);
@ -946,7 +951,7 @@ static irqreturn_t fimc_irq_handler(int irq, void *dev_id)
struct fimc_context *ctx = dev_id; struct fimc_context *ctx = dev_id;
int buf_id; int buf_id;
DRM_DEBUG_KMS("fimc id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(ctx->dev, "fimc id[%d]\n", ctx->id);
fimc_clear_irq(ctx); fimc_clear_irq(ctx);
if (fimc_check_ovf(ctx)) if (fimc_check_ovf(ctx))
@ -959,7 +964,7 @@ static irqreturn_t fimc_irq_handler(int irq, void *dev_id)
if (buf_id < 0) if (buf_id < 0)
return IRQ_HANDLED; return IRQ_HANDLED;
DRM_DEBUG_KMS("buf_id[%d]\n", buf_id); DRM_DEV_DEBUG_KMS(ctx->dev, "buf_id[%d]\n", buf_id);
if (ctx->task) { if (ctx->task) {
struct exynos_drm_ipp_task *task = ctx->task; struct exynos_drm_ipp_task *task = ctx->task;
@ -1381,7 +1386,7 @@ static int fimc_runtime_suspend(struct device *dev)
{ {
struct fimc_context *ctx = get_fimc_context(dev); struct fimc_context *ctx = get_fimc_context(dev);
DRM_DEBUG_KMS("id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(dev, "id[%d]\n", ctx->id);
clk_disable_unprepare(ctx->clocks[FIMC_CLK_GATE]); clk_disable_unprepare(ctx->clocks[FIMC_CLK_GATE]);
return 0; return 0;
} }
@ -1390,7 +1395,7 @@ static int fimc_runtime_resume(struct device *dev)
{ {
struct fimc_context *ctx = get_fimc_context(dev); struct fimc_context *ctx = get_fimc_context(dev);
DRM_DEBUG_KMS("id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(dev, "id[%d]\n", ctx->id);
return clk_prepare_enable(ctx->clocks[FIMC_CLK_GATE]); return clk_prepare_enable(ctx->clocks[FIMC_CLK_GATE]);
} }
#endif #endif

19
drivers/gpu/drm/exynos/exynos_drm_fimd.c
View File

@ -315,7 +315,7 @@ static void fimd_wait_for_vblank(struct exynos_drm_crtc *crtc)
if (!wait_event_timeout(ctx->wait_vsync_queue, if (!wait_event_timeout(ctx->wait_vsync_queue,
!atomic_read(&ctx->wait_vsync_event), !atomic_read(&ctx->wait_vsync_event),
HZ/20)) HZ/20))
DRM_DEBUG_KMS("vblank wait timed out.\n"); DRM_DEV_DEBUG_KMS(ctx->dev, "vblank wait timed out.\n");
} }
static void fimd_enable_video_output(struct fimd_context *ctx, unsigned int win, static void fimd_enable_video_output(struct fimd_context *ctx, unsigned int win,
@ -817,10 +817,11 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc,
val = (unsigned long)(dma_addr + size); val = (unsigned long)(dma_addr + size);
writel(val, ctx->regs + VIDWx_BUF_END(win, 0)); writel(val, ctx->regs + VIDWx_BUF_END(win, 0));
DRM_DEBUG_KMS("start addr = 0x%lx, end addr = 0x%lx, size = 0x%lx\n", DRM_DEV_DEBUG_KMS(ctx->dev,
(unsigned long)dma_addr, val, size); "start addr = 0x%lx, end addr = 0x%lx, size = 0x%lx\n",
DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n", (unsigned long)dma_addr, val, size);
state->crtc.w, state->crtc.h); DRM_DEV_DEBUG_KMS(ctx->dev, "ovl_width = %d, ovl_height = %d\n",
state->crtc.w, state->crtc.h);
/* buffer size */ /* buffer size */
buf_offsize = pitch - (state->crtc.w * cpp); buf_offsize = pitch - (state->crtc.w * cpp);
@ -850,8 +851,9 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc,
writel(val, ctx->regs + VIDOSD_B(win)); writel(val, ctx->regs + VIDOSD_B(win));
DRM_DEBUG_KMS("osd pos: tx = %d, ty = %d, bx = %d, by = %d\n", DRM_DEV_DEBUG_KMS(ctx->dev,
state->crtc.x, state->crtc.y, last_x, last_y); "osd pos: tx = %d, ty = %d, bx = %d, by = %d\n",
state->crtc.x, state->crtc.y, last_x, last_y);
/* OSD size */ /* OSD size */
if (win != 3 && win != 4) { if (win != 3 && win != 4) {
@ -861,7 +863,8 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc,
val = state->crtc.w * state->crtc.h; val = state->crtc.w * state->crtc.h;
writel(val, ctx->regs + offset); writel(val, ctx->regs + offset);
DRM_DEBUG_KMS("osd size = 0x%x\n", (unsigned int)val); DRM_DEV_DEBUG_KMS(ctx->dev, "osd size = 0x%x\n",
(unsigned int)val);
} }
fimd_win_set_pixfmt(ctx, win, fb, state->src.w); fimd_win_set_pixfmt(ctx, win, fb, state->src.w);

18
drivers/gpu/drm/exynos/exynos_drm_gem.c
View File

@ -29,7 +29,7 @@ static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem)
int ret = -ENOMEM; int ret = -ENOMEM;
if (exynos_gem->dma_addr) { if (exynos_gem->dma_addr) {
DRM_DEBUG_KMS("already allocated.\n"); DRM_DEV_DEBUG_KMS(to_dma_dev(dev), "already allocated.\n");
return 0; return 0;
} }
@ -90,7 +90,7 @@ static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem)
sg_free_table(&sgt); sg_free_table(&sgt);
DRM_DEBUG_KMS("dma_addr(0x%lx), size(0x%lx)\n", DRM_DEV_DEBUG_KMS(to_dma_dev(dev), "dma_addr(0x%lx), size(0x%lx)\n",
(unsigned long)exynos_gem->dma_addr, exynos_gem->size); (unsigned long)exynos_gem->dma_addr, exynos_gem->size);
return 0; return 0;
@ -111,11 +111,11 @@ static void exynos_drm_free_buf(struct exynos_drm_gem *exynos_gem)
struct drm_device *dev = exynos_gem->base.dev; struct drm_device *dev = exynos_gem->base.dev;
if (!exynos_gem->dma_addr) { if (!exynos_gem->dma_addr) {
DRM_DEBUG_KMS("dma_addr is invalid.\n"); DRM_DEV_DEBUG_KMS(dev->dev, "dma_addr is invalid.\n");
return; return;
} }
DRM_DEBUG_KMS("dma_addr(0x%lx), size(0x%lx)\n", DRM_DEV_DEBUG_KMS(dev->dev, "dma_addr(0x%lx), size(0x%lx)\n",
(unsigned long)exynos_gem->dma_addr, exynos_gem->size); (unsigned long)exynos_gem->dma_addr, exynos_gem->size);
dma_free_attrs(to_dma_dev(dev), exynos_gem->size, exynos_gem->cookie, dma_free_attrs(to_dma_dev(dev), exynos_gem->size, exynos_gem->cookie,
@ -139,7 +139,7 @@ static int exynos_drm_gem_handle_create(struct drm_gem_object *obj,
if (ret) if (ret)
return ret; return ret;
DRM_DEBUG_KMS("gem handle = 0x%x\n", *handle); DRM_DEV_DEBUG_KMS(to_dma_dev(obj->dev), "gem handle = 0x%x\n", *handle);
/* drop reference from allocate - handle holds it now. */ /* drop reference from allocate - handle holds it now. */
drm_gem_object_put_unlocked(obj); drm_gem_object_put_unlocked(obj);
@ -151,7 +151,8 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem)
{ {
struct drm_gem_object *obj = &exynos_gem->base; struct drm_gem_object *obj = &exynos_gem->base;
DRM_DEBUG_KMS("handle count = %d\n", obj->handle_count); DRM_DEV_DEBUG_KMS(to_dma_dev(obj->dev), "handle count = %d\n",
obj->handle_count);
/* /*
* do not release memory region from exporter. * do not release memory region from exporter.
@ -198,7 +199,7 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev,
return ERR_PTR(ret); return ERR_PTR(ret);
} }
DRM_DEBUG_KMS("created file object = %pK\n", obj->filp); DRM_DEV_DEBUG_KMS(dev->dev, "created file object = %pK\n", obj->filp);
return exynos_gem; return exynos_gem;
} }
@ -409,7 +410,8 @@ static int exynos_drm_gem_mmap_obj(struct drm_gem_object *obj,
struct exynos_drm_gem *exynos_gem = to_exynos_gem(obj); struct exynos_drm_gem *exynos_gem = to_exynos_gem(obj);
int ret; int ret;
DRM_DEBUG_KMS("flags = 0x%x\n", exynos_gem->flags); DRM_DEV_DEBUG_KMS(to_dma_dev(obj->dev), "flags = 0x%x\n",
exynos_gem->flags);
/* non-cachable as default. */ /* non-cachable as default. */
if (exynos_gem->flags & EXYNOS_BO_CACHABLE) if (exynos_gem->flags & EXYNOS_BO_CACHABLE)

48
drivers/gpu/drm/exynos/exynos_drm_gsc.c
View File

@ -422,8 +422,8 @@ static void gsc_handle_irq(struct gsc_context *ctx, bool enable,
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("enable[%d]overflow[%d]level[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "enable[%d]overflow[%d]level[%d]\n",
enable, overflow, done); enable, overflow, done);
cfg = gsc_read(GSC_IRQ); cfg = gsc_read(GSC_IRQ);
cfg |= (GSC_IRQ_OR_MASK | GSC_IRQ_FRMDONE_MASK); cfg |= (GSC_IRQ_OR_MASK | GSC_IRQ_FRMDONE_MASK);
@ -451,7 +451,7 @@ static void gsc_src_set_fmt(struct gsc_context *ctx, u32 fmt, bool tiled)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("fmt[0x%x]\n", fmt); DRM_DEV_DEBUG_KMS(ctx->dev, "fmt[0x%x]\n", fmt);
cfg = gsc_read(GSC_IN_CON); cfg = gsc_read(GSC_IN_CON);
cfg &= ~(GSC_IN_RGB_TYPE_MASK | GSC_IN_YUV422_1P_ORDER_MASK | cfg &= ~(GSC_IN_RGB_TYPE_MASK | GSC_IN_YUV422_1P_ORDER_MASK |
@ -638,7 +638,7 @@ static void gsc_dst_set_fmt(struct gsc_context *ctx, u32 fmt, bool tiled)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("fmt[0x%x]\n", fmt); DRM_DEV_DEBUG_KMS(ctx->dev, "fmt[0x%x]\n", fmt);
cfg = gsc_read(GSC_OUT_CON); cfg = gsc_read(GSC_OUT_CON);
cfg &= ~(GSC_OUT_RGB_TYPE_MASK | GSC_OUT_YUV422_1P_ORDER_MASK | cfg &= ~(GSC_OUT_RGB_TYPE_MASK | GSC_OUT_YUV422_1P_ORDER_MASK |
@ -709,7 +709,7 @@ static void gsc_dst_set_fmt(struct gsc_context *ctx, u32 fmt, bool tiled)
static int gsc_get_ratio_shift(struct gsc_context *ctx, u32 src, u32 dst, static int gsc_get_ratio_shift(struct gsc_context *ctx, u32 src, u32 dst,
u32 *ratio) u32 *ratio)
{ {
DRM_DEBUG_KMS("src[%d]dst[%d]\n", src, dst); DRM_DEV_DEBUG_KMS(ctx->dev, "src[%d]dst[%d]\n", src, dst);
if (src >= dst * 8) { if (src >= dst * 8) {
DRM_DEV_ERROR(ctx->dev, "failed to make ratio and shift.\n"); DRM_DEV_ERROR(ctx->dev, "failed to make ratio and shift.\n");
@ -772,19 +772,19 @@ static int gsc_set_prescaler(struct gsc_context *ctx, struct gsc_scaler *sc,
return ret; return ret;
} }
DRM_DEBUG_KMS("pre_hratio[%d]pre_vratio[%d]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "pre_hratio[%d]pre_vratio[%d]\n",
sc->pre_hratio, sc->pre_vratio); sc->pre_hratio, sc->pre_vratio);
sc->main_hratio = (src_w << 16) / dst_w; sc->main_hratio = (src_w << 16) / dst_w;
sc->main_vratio = (src_h << 16) / dst_h; sc->main_vratio = (src_h << 16) / dst_h;
DRM_DEBUG_KMS("main_hratio[%ld]main_vratio[%ld]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "main_hratio[%ld]main_vratio[%ld]\n",
sc->main_hratio, sc->main_vratio); sc->main_hratio, sc->main_vratio);
gsc_get_prescaler_shfactor(sc->pre_hratio, sc->pre_vratio, gsc_get_prescaler_shfactor(sc->pre_hratio, sc->pre_vratio,
&sc->pre_shfactor); &sc->pre_shfactor);
DRM_DEBUG_KMS("pre_shfactor[%d]\n", sc->pre_shfactor); DRM_DEV_DEBUG_KMS(ctx->dev, "pre_shfactor[%d]\n", sc->pre_shfactor);
cfg = (GSC_PRESC_SHFACTOR(sc->pre_shfactor) | cfg = (GSC_PRESC_SHFACTOR(sc->pre_shfactor) |
GSC_PRESC_H_RATIO(sc->pre_hratio) | GSC_PRESC_H_RATIO(sc->pre_hratio) |
@ -850,8 +850,8 @@ static void gsc_set_scaler(struct gsc_context *ctx, struct gsc_scaler *sc)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("main_hratio[%ld]main_vratio[%ld]\n", DRM_DEV_DEBUG_KMS(ctx->dev, "main_hratio[%ld]main_vratio[%ld]\n",
sc->main_hratio, sc->main_vratio); sc->main_hratio, sc->main_vratio);
gsc_set_h_coef(ctx, sc->main_hratio); gsc_set_h_coef(ctx, sc->main_hratio);
cfg = GSC_MAIN_H_RATIO_VALUE(sc->main_hratio); cfg = GSC_MAIN_H_RATIO_VALUE(sc->main_hratio);
@ -917,7 +917,7 @@ static int gsc_dst_get_buf_seq(struct gsc_context *ctx)
if (cfg & (mask << i)) if (cfg & (mask << i))
buf_num--; buf_num--;
DRM_DEBUG_KMS("buf_num[%d]\n", buf_num); DRM_DEV_DEBUG_KMS(ctx->dev, "buf_num[%d]\n", buf_num);
return buf_num; return buf_num;
} }
@ -964,7 +964,7 @@ static int gsc_get_src_buf_index(struct gsc_context *ctx)
u32 cfg, curr_index, i; u32 cfg, curr_index, i;
u32 buf_id = GSC_MAX_SRC; u32 buf_id = GSC_MAX_SRC;
DRM_DEBUG_KMS("gsc id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(ctx->dev, "gsc id[%d]\n", ctx->id);
cfg = gsc_read(GSC_IN_BASE_ADDR_Y_MASK); cfg = gsc_read(GSC_IN_BASE_ADDR_Y_MASK);
curr_index = GSC_IN_CURR_GET_INDEX(cfg); curr_index = GSC_IN_CURR_GET_INDEX(cfg);
@ -976,8 +976,8 @@ static int gsc_get_src_buf_index(struct gsc_context *ctx)
} }
} }
DRM_DEBUG_KMS("cfg[0x%x]curr_index[%d]buf_id[%d]\n", cfg, DRM_DEV_DEBUG_KMS(ctx->dev, "cfg[0x%x]curr_index[%d]buf_id[%d]\n", cfg,
curr_index, buf_id); curr_index, buf_id);
if (buf_id == GSC_MAX_SRC) { if (buf_id == GSC_MAX_SRC) {
DRM_DEV_ERROR(ctx->dev, "failed to get in buffer index.\n"); DRM_DEV_ERROR(ctx->dev, "failed to get in buffer index.\n");
@ -994,7 +994,7 @@ static int gsc_get_dst_buf_index(struct gsc_context *ctx)
u32 cfg, curr_index, i; u32 cfg, curr_index, i;
u32 buf_id = GSC_MAX_DST; u32 buf_id = GSC_MAX_DST;
DRM_DEBUG_KMS("gsc id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(ctx->dev, "gsc id[%d]\n", ctx->id);
cfg = gsc_read(GSC_OUT_BASE_ADDR_Y_MASK); cfg = gsc_read(GSC_OUT_BASE_ADDR_Y_MASK);
curr_index = GSC_OUT_CURR_GET_INDEX(cfg); curr_index = GSC_OUT_CURR_GET_INDEX(cfg);
@ -1013,8 +1013,8 @@ static int gsc_get_dst_buf_index(struct gsc_context *ctx)
gsc_dst_set_buf_seq(ctx, buf_id, false); gsc_dst_set_buf_seq(ctx, buf_id, false);
DRM_DEBUG_KMS("cfg[0x%x]curr_index[%d]buf_id[%d]\n", cfg, DRM_DEV_DEBUG_KMS(ctx->dev, "cfg[0x%x]curr_index[%d]buf_id[%d]\n", cfg,
curr_index, buf_id); curr_index, buf_id);
return buf_id; return buf_id;
} }
@ -1025,7 +1025,7 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id)
u32 status; u32 status;
int err = 0; int err = 0;
DRM_DEBUG_KMS("gsc id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(ctx->dev, "gsc id[%d]\n", ctx->id);
status = gsc_read(GSC_IRQ); status = gsc_read(GSC_IRQ);
if (status & GSC_IRQ_STATUS_OR_IRQ) { if (status & GSC_IRQ_STATUS_OR_IRQ) {
@ -1043,8 +1043,8 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id)
src_buf_id = gsc_get_src_buf_index(ctx); src_buf_id = gsc_get_src_buf_index(ctx);
dst_buf_id = gsc_get_dst_buf_index(ctx); dst_buf_id = gsc_get_dst_buf_index(ctx);
DRM_DEBUG_KMS("buf_id_src[%d]buf_id_dst[%d]\n", src_buf_id, DRM_DEV_DEBUG_KMS(ctx->dev, "buf_id_src[%d]buf_id_dst[%d]\n",
dst_buf_id); src_buf_id, dst_buf_id);
if (src_buf_id < 0 || dst_buf_id < 0) if (src_buf_id < 0 || dst_buf_id < 0)
err = -EINVAL; err = -EINVAL;
@ -1325,7 +1325,7 @@ static int __maybe_unused gsc_runtime_suspend(struct device *dev)
struct gsc_context *ctx = get_gsc_context(dev); struct gsc_context *ctx = get_gsc_context(dev);
int i; int i;
DRM_DEBUG_KMS("id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(dev, "id[%d]\n", ctx->id);
for (i = ctx->num_clocks - 1; i >= 0; i--) for (i = ctx->num_clocks - 1; i >= 0; i--)
clk_disable_unprepare(ctx->clocks[i]); clk_disable_unprepare(ctx->clocks[i]);
@ -1338,7 +1338,7 @@ static int __maybe_unused gsc_runtime_resume(struct device *dev)
struct gsc_context *ctx = get_gsc_context(dev); struct gsc_context *ctx = get_gsc_context(dev);
int i, ret; int i, ret;
DRM_DEBUG_KMS("id[%d]\n", ctx->id); DRM_DEV_DEBUG_KMS(dev, "id[%d]\n", ctx->id);
for (i = 0; i < ctx->num_clocks; i++) { for (i = 0; i < ctx->num_clocks; i++) {
ret = clk_prepare_enable(ctx->clocks[i]); ret = clk_prepare_enable(ctx->clocks[i]);

61
drivers/gpu/drm/exynos/exynos_drm_ipp.c
View File

@ -67,7 +67,7 @@ int exynos_drm_ipp_register(struct drm_device *dev, struct exynos_drm_ipp *ipp,
list_add_tail(&ipp->head, &ipp_list); list_add_tail(&ipp->head, &ipp_list);
ipp->id = num_ipp++; ipp->id = num_ipp++;
DRM_DEBUG_DRIVER("Registered ipp %d\n", ipp->id); DRM_DEV_DEBUG_DRIVER(dev->dev, "Registered ipp %d\n", ipp->id);
return 0; return 0;
} }
@ -268,7 +268,7 @@ static inline struct exynos_drm_ipp_task *
task->src.rect.h = task->dst.rect.h = UINT_MAX; task->src.rect.h = task->dst.rect.h = UINT_MAX;
task->transform.rotation = DRM_MODE_ROTATE_0; task->transform.rotation = DRM_MODE_ROTATE_0;
DRM_DEBUG_DRIVER("Allocated task %pK\n", task); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Allocated task %pK\n", task);
return task; return task;
} }
@ -335,7 +335,9 @@ static int exynos_drm_ipp_task_set(struct exynos_drm_ipp_task *task,
size -= map[i].size; size -= map[i].size;
} }
DRM_DEBUG_DRIVER("Got task %pK configuration from userspace\n", task); DRM_DEV_DEBUG_DRIVER(task->dev->dev,
"Got task %pK configuration from userspace\n",
task);
return 0; return 0;
} }
@ -389,7 +391,7 @@ static void exynos_drm_ipp_task_release_buf(struct exynos_drm_ipp_buffer *buf)
static void exynos_drm_ipp_task_free(struct exynos_drm_ipp *ipp, static void exynos_drm_ipp_task_free(struct exynos_drm_ipp *ipp,
struct exynos_drm_ipp_task *task) struct exynos_drm_ipp_task *task)
{ {
DRM_DEBUG_DRIVER("Freeing task %pK\n", task); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Freeing task %pK\n", task);
exynos_drm_ipp_task_release_buf(&task->src); exynos_drm_ipp_task_release_buf(&task->src);
exynos_drm_ipp_task_release_buf(&task->dst); exynos_drm_ipp_task_release_buf(&task->dst);
@ -553,8 +555,9 @@ static int exynos_drm_ipp_check_format(struct exynos_drm_ipp_task *task,
buf == src ? DRM_EXYNOS_IPP_FORMAT_SOURCE : buf == src ? DRM_EXYNOS_IPP_FORMAT_SOURCE :
DRM_EXYNOS_IPP_FORMAT_DESTINATION); DRM_EXYNOS_IPP_FORMAT_DESTINATION);
if (!fmt) { if (!fmt) {
DRM_DEBUG_DRIVER("Task %pK: %s format not supported\n", task, DRM_DEV_DEBUG_DRIVER(task->dev->dev,
buf == src ? "src" : "dst"); "Task %pK: %s format not supported\n",
task, buf == src ? "src" : "dst");
return -EINVAL; return -EINVAL;
} }
@ -603,7 +606,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
bool rotate = (rotation != DRM_MODE_ROTATE_0); bool rotate = (rotation != DRM_MODE_ROTATE_0);
bool scale = false; bool scale = false;
DRM_DEBUG_DRIVER("Checking task %pK\n", task); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Checking task %pK\n", task);
if (src->rect.w == UINT_MAX) if (src->rect.w == UINT_MAX)
src->rect.w = src->buf.width; src->rect.w = src->buf.width;
@ -618,8 +621,9 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
src->rect.y + src->rect.h > (src->buf.height) || src->rect.y + src->rect.h > (src->buf.height) ||
dst->rect.x + dst->rect.w > (dst->buf.width) || dst->rect.x + dst->rect.w > (dst->buf.width) ||
dst->rect.y + dst->rect.h > (dst->buf.height)) { dst->rect.y + dst->rect.h > (dst->buf.height)) {
DRM_DEBUG_DRIVER("Task %pK: defined area is outside provided buffers\n", DRM_DEV_DEBUG_DRIVER(ipp->dev->dev,
task); "Task %pK: defined area is outside provided buffers\n",
task);
return -EINVAL; return -EINVAL;
} }
@ -635,7 +639,8 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
(!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_SCALE) && scale) || (!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_SCALE) && scale) ||
(!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_CONVERT) && (!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_CONVERT) &&
src->buf.fourcc != dst->buf.fourcc)) { src->buf.fourcc != dst->buf.fourcc)) {
DRM_DEBUG_DRIVER("Task %pK: hw capabilities exceeded\n", task); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Task %pK: hw capabilities exceeded\n",
task);
return -EINVAL; return -EINVAL;
} }
@ -647,7 +652,8 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
if (ret) if (ret)
return ret; return ret;
DRM_DEBUG_DRIVER("Task %pK: all checks done.\n", task); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "Task %pK: all checks done.\n",
task);
return ret; return ret;
} }
@ -658,20 +664,26 @@ static int exynos_drm_ipp_task_setup_buffers(struct exynos_drm_ipp_task *task,
struct exynos_drm_ipp_buffer *src = &task->src, *dst = &task->dst; struct exynos_drm_ipp_buffer *src = &task->src, *dst = &task->dst;
int ret = 0; int ret = 0;
DRM_DEBUG_DRIVER("Setting buffer for task %pK\n", task); DRM_DEV_DEBUG_DRIVER(task->dev->dev, "Setting buffer for task %pK\n",
task);
ret = exynos_drm_ipp_task_setup_buffer(src, filp); ret = exynos_drm_ipp_task_setup_buffer(src, filp);
if (ret) { if (ret) {
DRM_DEBUG_DRIVER("Task %pK: src buffer setup failed\n", task); DRM_DEV_DEBUG_DRIVER(task->dev->dev,
"Task %pK: src buffer setup failed\n",
task);
return ret; return ret;
} }
ret = exynos_drm_ipp_task_setup_buffer(dst, filp); ret = exynos_drm_ipp_task_setup_buffer(dst, filp);
if (ret) { if (ret) {
DRM_DEBUG_DRIVER("Task %pK: dst buffer setup failed\n", task); DRM_DEV_DEBUG_DRIVER(task->dev->dev,
"Task %pK: dst buffer setup failed\n",
task);
return ret; return ret;
} }
DRM_DEBUG_DRIVER("Task %pK: buffers prepared.\n", task); DRM_DEV_DEBUG_DRIVER(task->dev->dev, "Task %pK: buffers prepared.\n",
task);
return ret; return ret;
} }
@ -749,7 +761,8 @@ void exynos_drm_ipp_task_done(struct exynos_drm_ipp_task *task, int ret)
struct exynos_drm_ipp *ipp = task->ipp; struct exynos_drm_ipp *ipp = task->ipp;
unsigned long flags; unsigned long flags;
DRM_DEBUG_DRIVER("ipp: %d, task %pK done: %d\n", ipp->id, task, ret); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "ipp: %d, task %pK done: %d\n",
ipp->id, task, ret);
spin_lock_irqsave(&ipp->lock, flags); spin_lock_irqsave(&ipp->lock, flags);
if (ipp->task == task) if (ipp->task == task)
@ -773,7 +786,8 @@ static void exynos_drm_ipp_next_task(struct exynos_drm_ipp *ipp)
unsigned long flags; unsigned long flags;
int ret; int ret;
DRM_DEBUG_DRIVER("ipp: %d, try to run new task\n", ipp->id); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev, "ipp: %d, try to run new task\n",
ipp->id);
spin_lock_irqsave(&ipp->lock, flags); spin_lock_irqsave(&ipp->lock, flags);
@ -789,7 +803,9 @@ static void exynos_drm_ipp_next_task(struct exynos_drm_ipp *ipp)
spin_unlock_irqrestore(&ipp->lock, flags); spin_unlock_irqrestore(&ipp->lock, flags);
DRM_DEBUG_DRIVER("ipp: %d, selected task %pK to run\n", ipp->id, task); DRM_DEV_DEBUG_DRIVER(ipp->dev->dev,
"ipp: %d, selected task %pK to run\n", ipp->id,
task);
ret = ipp->funcs->commit(ipp, task); ret = ipp->funcs->commit(ipp, task);
if (ret) if (ret)
@ -897,15 +913,16 @@ int exynos_drm_ipp_commit_ioctl(struct drm_device *dev, void *data,
* then freed after exynos_drm_ipp_task_done() * then freed after exynos_drm_ipp_task_done()
*/ */
if (arg->flags & DRM_EXYNOS_IPP_FLAG_NONBLOCK) { if (arg->flags & DRM_EXYNOS_IPP_FLAG_NONBLOCK) {
DRM_DEBUG_DRIVER("ipp: %d, nonblocking processing task %pK\n", DRM_DEV_DEBUG_DRIVER(dev->dev,
ipp->id, task); "ipp: %d, nonblocking processing task %pK\n",
ipp->id, task);
task->flags |= DRM_EXYNOS_IPP_TASK_ASYNC; task->flags |= DRM_EXYNOS_IPP_TASK_ASYNC;
exynos_drm_ipp_schedule_task(task->ipp, task); exynos_drm_ipp_schedule_task(task->ipp, task);
ret = 0; ret = 0;
} else { } else {
DRM_DEBUG_DRIVER("ipp: %d, processing task %pK\n", ipp->id, DRM_DEV_DEBUG_DRIVER(dev->dev, "ipp: %d, processing task %pK\n",
task); ipp->id, task);
exynos_drm_ipp_schedule_task(ipp, task); exynos_drm_ipp_schedule_task(ipp, task);
ret = wait_event_interruptible(ipp->done_wq, ret = wait_event_interruptible(ipp->done_wq,
task->flags & DRM_EXYNOS_IPP_TASK_DONE); task->flags & DRM_EXYNOS_IPP_TASK_DONE);

4
drivers/gpu/drm/exynos/exynos_drm_mic.c
View File

@ -192,7 +192,7 @@ static void mic_set_output_timing(struct exynos_mic *mic)
struct videomode vm = mic->vm; struct videomode vm = mic->vm;
u32 reg, bs_size_2d; u32 reg, bs_size_2d;
DRM_DEBUG("w: %u, h: %u\n", vm.hactive, vm.vactive); DRM_DEV_DEBUG(mic->dev, "w: %u, h: %u\n", vm.hactive, vm.vactive);
bs_size_2d = ((vm.hactive >> 2) << 1) + (vm.vactive % 4); bs_size_2d = ((vm.hactive >> 2) << 1) + (vm.vactive % 4);
reg = MIC_BS_SIZE_2D(bs_size_2d); reg = MIC_BS_SIZE_2D(bs_size_2d);
writel(reg, mic->reg + MIC_2D_OUTPUT_TIMING_2); writel(reg, mic->reg + MIC_2D_OUTPUT_TIMING_2);
@ -433,7 +433,7 @@ static int exynos_mic_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_pm; goto err_pm;
DRM_DEBUG_KMS("MIC has been probed\n"); DRM_DEV_DEBUG_KMS(dev, "MIC has been probed\n");
return 0; return 0;

10
drivers/gpu/drm/exynos/exynos_drm_plane.c
View File

@ -119,9 +119,10 @@ static void exynos_plane_mode_set(struct exynos_drm_plane_state *exynos_state)
exynos_state->crtc.w = actual_w; exynos_state->crtc.w = actual_w;
exynos_state->crtc.h = actual_h; exynos_state->crtc.h = actual_h;
DRM_DEBUG_KMS("plane : offset_x/y(%d,%d), width/height(%d,%d)", DRM_DEV_DEBUG_KMS(crtc->dev->dev,
exynos_state->crtc.x, exynos_state->crtc.y, "plane : offset_x/y(%d,%d), width/height(%d,%d)",
exynos_state->crtc.w, exynos_state->crtc.h); exynos_state->crtc.x, exynos_state->crtc.y,
exynos_state->crtc.w, exynos_state->crtc.h);
} }
static void exynos_drm_plane_reset(struct drm_plane *plane) static void exynos_drm_plane_reset(struct drm_plane *plane)
@ -204,6 +205,7 @@ static int
exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config, exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
struct exynos_drm_plane_state *state) struct exynos_drm_plane_state *state)
{ {
struct drm_crtc *crtc = state->base.crtc;
bool width_ok = false, height_ok = false; bool width_ok = false, height_ok = false;
if (config->capabilities & EXYNOS_DRM_PLANE_CAP_SCALE) if (config->capabilities & EXYNOS_DRM_PLANE_CAP_SCALE)
@ -226,7 +228,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
if (width_ok && height_ok) if (width_ok && height_ok)
return 0; return 0;
DRM_DEBUG_KMS("scaling mode is not supported"); DRM_DEV_DEBUG_KMS(crtc->dev->dev, "scaling mode is not supported");
return -ENOTSUPP; return -ENOTSUPP;
} }

25
drivers/gpu/drm/exynos/exynos_drm_vidi.c
View File

@ -123,7 +123,7 @@ static void vidi_update_plane(struct exynos_drm_crtc *crtc,
return; return;
addr = exynos_drm_fb_dma_addr(state->fb, 0); addr = exynos_drm_fb_dma_addr(state->fb, 0);
DRM_DEBUG_KMS("dma_addr = %pad\n", &addr); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev, "dma_addr = %pad\n", &addr);
} }
static void vidi_enable(struct exynos_drm_crtc *crtc) static void vidi_enable(struct exynos_drm_crtc *crtc)
@ -205,11 +205,11 @@ static ssize_t vidi_store_connection(struct device *dev,
/* if raw_edid isn't same as fake data then it can't be tested. */ /* if raw_edid isn't same as fake data then it can't be tested. */
if (ctx->raw_edid != (struct edid *)fake_edid_info) { if (ctx->raw_edid != (struct edid *)fake_edid_info) {
DRM_DEBUG_KMS("edid data is not fake data.\n"); DRM_DEV_DEBUG_KMS(dev, "edid data is not fake data.\n");
return -EINVAL; return -EINVAL;
} }
DRM_DEBUG_KMS("requested connection.\n"); DRM_DEV_DEBUG_KMS(dev, "requested connection.\n");
drm_helper_hpd_irq_event(ctx->drm_dev); drm_helper_hpd_irq_event(ctx->drm_dev);
@ -226,17 +226,20 @@ int vidi_connection_ioctl(struct drm_device *drm_dev, void *data,
struct drm_exynos_vidi_connection *vidi = data; struct drm_exynos_vidi_connection *vidi = data;
if (!vidi) { if (!vidi) {
DRM_DEBUG_KMS("user data for vidi is null.\n"); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev,
"user data for vidi is null.\n");
return -EINVAL; return -EINVAL;
} }
if (vidi->connection > 1) { if (vidi->connection > 1) {
DRM_DEBUG_KMS("connection should be 0 or 1.\n"); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev,
"connection should be 0 or 1.\n");
return -EINVAL; return -EINVAL;
} }
if (ctx->connected == vidi->connection) { if (ctx->connected == vidi->connection) {
DRM_DEBUG_KMS("same connection request.\n"); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev,
"same connection request.\n");
return -EINVAL; return -EINVAL;
} }
@ -245,12 +248,14 @@ int vidi_connection_ioctl(struct drm_device *drm_dev, void *data,
raw_edid = (struct edid *)(unsigned long)vidi->edid; raw_edid = (struct edid *)(unsigned long)vidi->edid;
if (!drm_edid_is_valid(raw_edid)) { if (!drm_edid_is_valid(raw_edid)) {
DRM_DEBUG_KMS("edid data is invalid.\n"); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev,
"edid data is invalid.\n");
return -EINVAL; return -EINVAL;
} }
ctx->raw_edid = drm_edid_duplicate(raw_edid); ctx->raw_edid = drm_edid_duplicate(raw_edid);
if (!ctx->raw_edid) { if (!ctx->raw_edid) {
DRM_DEBUG_KMS("failed to allocate raw_edid.\n"); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev,
"failed to allocate raw_edid.\n");
return -ENOMEM; return -ENOMEM;
} }
} else { } else {
@ -308,14 +313,14 @@ static int vidi_get_modes(struct drm_connector *connector)
* to ctx->raw_edid through specific ioctl. * to ctx->raw_edid through specific ioctl.
*/ */
if (!ctx->raw_edid) { if (!ctx->raw_edid) {
DRM_DEBUG_KMS("raw_edid is null.\n"); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev, "raw_edid is null.\n");
return -EFAULT; return -EFAULT;
} }
edid_len = (1 + ctx->raw_edid->extensions) * EDID_LENGTH; edid_len = (1 + ctx->raw_edid->extensions) * EDID_LENGTH;
edid = kmemdup(ctx->raw_edid, edid_len, GFP_KERNEL); edid = kmemdup(ctx->raw_edid, edid_len, GFP_KERNEL);
if (!edid) { if (!edid) {
DRM_DEBUG_KMS("failed to allocate edid\n"); DRM_DEV_DEBUG_KMS(&ctx->pdev->dev, "failed to allocate edid\n");
return -ENOMEM; return -ENOMEM;
} }

33
drivers/gpu/drm/exynos/exynos_hdmi.c
View File

@ -885,9 +885,9 @@ static int hdmi_get_modes(struct drm_connector *connector)
return -ENODEV; return -ENODEV;
hdata->dvi_mode = !drm_detect_hdmi_monitor(edid); hdata->dvi_mode = !drm_detect_hdmi_monitor(edid);
DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n", DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n",
(hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
edid->width_cm, edid->height_cm); edid->width_cm, edid->height_cm);
drm_connector_update_edid_property(connector, edid); drm_connector_update_edid_property(connector, edid);
cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid); cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
@ -908,7 +908,8 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
if (confs->data[i].pixel_clock == pixel_clock) if (confs->data[i].pixel_clock == pixel_clock)
return i; return i;
DRM_DEBUG_KMS("Could not find phy config for %d\n", pixel_clock); DRM_DEV_DEBUG_KMS(hdata->dev, "Could not find phy config for %d\n",
pixel_clock);
return -EINVAL; return -EINVAL;
} }
@ -918,10 +919,11 @@ static int hdmi_mode_valid(struct drm_connector *connector,
struct hdmi_context *hdata = connector_to_hdmi(connector); struct hdmi_context *hdata = connector_to_hdmi(connector);
int ret; int ret;
DRM_DEBUG_KMS("xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n", DRM_DEV_DEBUG_KMS(hdata->dev,
mode->hdisplay, mode->vdisplay, mode->vrefresh, "xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n",
(mode->flags & DRM_MODE_FLAG_INTERLACE) ? true : mode->hdisplay, mode->vdisplay, mode->vrefresh,
false, mode->clock * 1000); (mode->flags & DRM_MODE_FLAG_INTERLACE) ? true :
false, mode->clock * 1000);
ret = hdmi_find_phy_conf(hdata, mode->clock * 1000); ret = hdmi_find_phy_conf(hdata, mode->clock * 1000);
if (ret < 0) if (ret < 0)
@ -1003,8 +1005,10 @@ static bool hdmi_mode_fixup(struct drm_encoder *encoder,
DRM_INFO("desired mode doesn't exist so\n"); DRM_INFO("desired mode doesn't exist so\n");
DRM_INFO("use the most suitable mode among modes.\n"); DRM_INFO("use the most suitable mode among modes.\n");
DRM_DEBUG_KMS("Adjusted Mode: [%d]x[%d] [%d]Hz\n", DRM_DEV_DEBUG_KMS(dev->dev,
m->hdisplay, m->vdisplay, m->vrefresh); "Adjusted Mode: [%d]x[%d] [%d]Hz\n",
m->hdisplay, m->vdisplay,
m->vrefresh);
drm_mode_copy(adjusted_mode, m); drm_mode_copy(adjusted_mode, m);
break; break;
@ -1170,7 +1174,9 @@ static void hdmiphy_wait_for_pll(struct hdmi_context *hdata)
u32 val = hdmi_reg_read(hdata, HDMI_PHY_STATUS); u32 val = hdmi_reg_read(hdata, HDMI_PHY_STATUS);
if (val & HDMI_PHY_STATUS_READY) { if (val & HDMI_PHY_STATUS_READY) {
DRM_DEBUG_KMS("PLL stabilized after %d tries\n", tries); DRM_DEV_DEBUG_KMS(hdata->dev,
"PLL stabilized after %d tries\n",
tries);
return; return;
} }
usleep_range(10, 20); usleep_range(10, 20);
@ -1461,7 +1467,8 @@ static void hdmiphy_enable(struct hdmi_context *hdata)
pm_runtime_get_sync(hdata->dev); pm_runtime_get_sync(hdata->dev);
if (regulator_bulk_enable(ARRAY_SIZE(supply), hdata->regul_bulk)) if (regulator_bulk_enable(ARRAY_SIZE(supply), hdata->regul_bulk))
DRM_DEBUG_KMS("failed to enable regulator bulk\n"); DRM_DEV_DEBUG_KMS(hdata->dev,
"failed to enable regulator bulk\n");
regmap_update_bits(hdata->pmureg, PMU_HDMI_PHY_CONTROL, regmap_update_bits(hdata->pmureg, PMU_HDMI_PHY_CONTROL,
PMU_HDMI_PHY_ENABLE_BIT, 1); PMU_HDMI_PHY_ENABLE_BIT, 1);
@ -1753,7 +1760,7 @@ static int hdmi_resources_init(struct hdmi_context *hdata)
struct device *dev = hdata->dev; struct device *dev = hdata->dev;
int i, ret; int i, ret;
DRM_DEBUG_KMS("HDMI resource init\n"); DRM_DEV_DEBUG_KMS(dev, "HDMI resource init\n");
hdata->hpd_gpio = devm_gpiod_get(dev, "hpd", GPIOD_IN); hdata->hpd_gpio = devm_gpiod_get(dev, "hpd", GPIOD_IN);
if (IS_ERR(hdata->hpd_gpio)) { if (IS_ERR(hdata->hpd_gpio)) {

17
drivers/gpu/drm/exynos/exynos_mixer.c
View File

@ -228,8 +228,8 @@ static void mixer_regs_dump(struct mixer_context *ctx)
{ {
#define DUMPREG(reg_id) \ #define DUMPREG(reg_id) \
do { \ do { \
DRM_DEBUG_KMS(#reg_id " = %08x\n", \ DRM_DEV_DEBUG_KMS(ctx->dev, #reg_id " = %08x\n", \
(u32)readl(ctx->mixer_regs + reg_id)); \ (u32)readl(ctx->mixer_regs + reg_id)); \
} while (0) } while (0)
DUMPREG(MXR_STATUS); DUMPREG(MXR_STATUS);
@ -260,8 +260,8 @@ static void vp_regs_dump(struct mixer_context *ctx)
{ {
#define DUMPREG(reg_id) \ #define DUMPREG(reg_id) \
do { \ do { \
DRM_DEBUG_KMS(#reg_id " = %08x\n", \ DRM_DEV_DEBUG_KMS(ctx->dev, #reg_id " = %08x\n", \
(u32) readl(ctx->vp_regs + reg_id)); \ (u32) readl(ctx->vp_regs + reg_id)); \
} while (0) } while (0)
DUMPREG(VP_ENABLE); DUMPREG(VP_ENABLE);
@ -954,7 +954,7 @@ static void mixer_update_plane(struct exynos_drm_crtc *crtc,
{ {
struct mixer_context *mixer_ctx = crtc->ctx; struct mixer_context *mixer_ctx = crtc->ctx;
DRM_DEBUG_KMS("win: %d\n", plane->index); DRM_DEV_DEBUG_KMS(mixer_ctx->dev, "win: %d\n", plane->index);
if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
return; return;
@ -971,7 +971,7 @@ static void mixer_disable_plane(struct exynos_drm_crtc *crtc,
struct mixer_context *mixer_ctx = crtc->ctx; struct mixer_context *mixer_ctx = crtc->ctx;
unsigned long flags; unsigned long flags;
DRM_DEBUG_KMS("win: %d\n", plane->index); DRM_DEV_DEBUG_KMS(mixer_ctx->dev, "win: %d\n", plane->index);
if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
return; return;
@ -1048,8 +1048,9 @@ static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
struct mixer_context *ctx = crtc->ctx; struct mixer_context *ctx = crtc->ctx;
u32 w = mode->hdisplay, h = mode->vdisplay; u32 w = mode->hdisplay, h = mode->vdisplay;
DRM_DEBUG_KMS("xres=%d, yres=%d, refresh=%d, intl=%d\n", w, h, DRM_DEV_DEBUG_KMS(ctx->dev, "xres=%d, yres=%d, refresh=%d, intl=%d\n",
mode->vrefresh, !!(mode->flags & DRM_MODE_FLAG_INTERLACE)); w, h, mode->vrefresh,
!!(mode->flags & DRM_MODE_FLAG_INTERLACE));
if (ctx->mxr_ver == MXR_VER_128_0_0_184) if (ctx->mxr_ver == MXR_VER_128_0_0_184)
return MODE_OK; return MODE_OK;