mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 20:33:58 -04:00
drm: msm: Fix the format prints in display driver
Fix the %p format prints with %pK. Change-Id: I2611e3872df136204b630c2a3e037384fd002c25 Signed-off-by: Lei Ma <leima@codeaurora.org>
This commit is contained in:
parent
4440785ea8
commit
5fce077d24
5 changed files with 15 additions and 14 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2014-2015,2020, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/of_irq.h>
|
||||
|
|
@ -46,7 +46,7 @@ static struct msm_edp *edp_init(struct platform_device *pdev)
|
|||
ret = -ENOMEM;
|
||||
goto fail;
|
||||
}
|
||||
DBG("eDP probed=%p", edp);
|
||||
DBG("eDP probed=%pK", edp);
|
||||
|
||||
edp->pdev = pdev;
|
||||
platform_set_drvdata(pdev, edp);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2016-2018,2020, The Linux Foundation. All rights reserved.
|
||||
* Copyright (C) 2013 Red Hat
|
||||
* Author: Rob Clark <robdclark@gmail.com>
|
||||
*/
|
||||
|
|
@ -145,7 +145,8 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
|
|||
}
|
||||
|
||||
if (reglog)
|
||||
printk(KERN_DEBUG "IO:region %s %p %08lx\n", dbgname, ptr, size);
|
||||
dev_dbg(&pdev->dev, "IO:region %s %pK %08lx\n",
|
||||
dbgname, ptr, size);
|
||||
|
||||
return ptr;
|
||||
}
|
||||
|
|
@ -153,7 +154,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
|
|||
void msm_writel(u32 data, void __iomem *addr)
|
||||
{
|
||||
if (reglog)
|
||||
printk(KERN_DEBUG "IO:W %p %08x\n", addr, data);
|
||||
pr_debug("IO:W %pK %08x\n", addr, data);
|
||||
writel(data, addr);
|
||||
}
|
||||
|
||||
|
|
@ -161,7 +162,7 @@ u32 msm_readl(const void __iomem *addr)
|
|||
{
|
||||
u32 val = readl(addr);
|
||||
if (reglog)
|
||||
pr_err("IO:R %p %08x\n", addr, val);
|
||||
pr_err("IO:R %pK %08x\n", addr, val);
|
||||
return val;
|
||||
}
|
||||
|
||||
|
|
@ -674,7 +675,7 @@ static int msm_enable_vblank(struct drm_device *dev, unsigned int pipe)
|
|||
struct msm_kms *kms = priv->kms;
|
||||
if (!kms)
|
||||
return -ENXIO;
|
||||
DBG("dev=%p, crtc=%u", dev, pipe);
|
||||
DBG("dev=%pK, crtc=%u", dev, pipe);
|
||||
return vblank_ctrl_queue_work(priv, pipe, true);
|
||||
}
|
||||
|
||||
|
|
@ -684,7 +685,7 @@ static void msm_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
|||
struct msm_kms *kms = priv->kms;
|
||||
if (!kms)
|
||||
return;
|
||||
DBG("dev=%p, crtc=%u", dev, pipe);
|
||||
DBG("dev=%pK, crtc=%u", dev, pipe);
|
||||
vblank_ctrl_queue_work(priv, pipe, false);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ static struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
|
|||
const struct msm_format *format;
|
||||
int ret, i, n;
|
||||
|
||||
DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%4.4s)",
|
||||
DBG("create framebuffer: dev=%pK, mode_cmd=%pK (%dx%d@%4.4s)",
|
||||
dev, mode_cmd, mode_cmd->width, mode_cmd->height,
|
||||
(char *)&mode_cmd->pixel_format);
|
||||
|
||||
|
|
@ -193,7 +193,7 @@ static struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
|
|||
goto fail;
|
||||
}
|
||||
|
||||
DBG("create: FB ID: %d (%p)", fb->base.id, fb);
|
||||
DBG("create: FB ID: %d (%pK)", fb->base.id, fb);
|
||||
|
||||
return fb;
|
||||
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
|
|||
goto fail_unlock;
|
||||
}
|
||||
|
||||
DBG("fbi=%p, dev=%p", fbi, dev);
|
||||
DBG("fbi=%pK, dev=%pK", fbi, dev);
|
||||
|
||||
fbdev->fb = fb;
|
||||
helper->fb = fb;
|
||||
|
|
@ -127,7 +127,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
|
|||
fbi->fix.smem_start = paddr;
|
||||
fbi->fix.smem_len = bo->size;
|
||||
|
||||
DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
|
||||
DBG("par=%pK, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
|
||||
DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);
|
||||
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ vm_fault_t msm_gem_fault(struct vm_fault *vmf)
|
|||
|
||||
pfn = page_to_pfn(pages[pgoff]);
|
||||
|
||||
VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
|
||||
VERB("Inserting %pK pfn %lx, pa %lx", (void *)vmf->address,
|
||||
pfn, pfn << PAGE_SHIFT);
|
||||
|
||||
ret = vmf_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
|
||||
|
|
@ -821,7 +821,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
|
|||
break;
|
||||
}
|
||||
|
||||
seq_printf(m, "%08x: %c %2d (%2d) %08llx %p",
|
||||
seq_printf(m, "%08x: %c %2d (%2d) %08llx %pK",
|
||||
msm_obj->flags, is_active(msm_obj) ? 'A' : 'I',
|
||||
obj->name, kref_read(&obj->refcount),
|
||||
off, msm_obj->vaddr);
|
||||
|
|
|
|||
Loading…
Reference in a new issue