Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 951d4ca1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: Fix the format prints in display driver" into dev/msm-4.14-display

parents e2e9e75a 3e4a2d54

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int dsi_ctrl_init_regmap(struct platform_device *pdev, 
	}



	ctrl->hw.base = ptr;

	pr_debug("[%s] map dsi_ctrl registers to %p\n", ctrl->name,

	pr_debug("[%s] map dsi_ctrl registers to %pK\n", ctrl->name,

		 ctrl->hw.base);



	switch (ctrl->version) {

drivers/gpu/drm/msm/dsi-staging/dsi_phy.c

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static int dsi_phy_regmap_init(struct platform_device *pdev, 


	phy->hw.base = ptr;



	pr_debug("[%s] map dsi_phy registers to %p\n", phy->name, phy->hw.base);

	pr_debug("[%s] map dsi_phy registers to %pK\n",

		phy->name, phy->hw.base);



	return rc;

}

drivers/gpu/drm/msm/edp/edp.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -54,7 +54,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);

drivers/gpu/drm/msm/msm_drv.c

+6 −5
Original line number Diff line number Diff line
@@ -187,7 +187,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;

}
@@ -218,7 +219,7 @@ void msm_iounmap(struct platform_device *pdev, void __iomem *addr) 
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);

}
@@ -227,7 +228,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;

}
@@ -1079,7 +1080,7 @@ static int msm_enable_vblank(struct drm_device *dev, unsigned int pipe) 


	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);

}
@@ -1090,7 +1091,7 @@ static void msm_disable_vblank(struct drm_device *dev, unsigned int pipe) 


	if (!kms)

		return;

	DBG("dev=%p, crtc=%u", dev, pipe);

	DBG("dev=%pK, crtc=%u", dev, pipe);

	vblank_ctrl_queue_work(priv, pipe, false);

}

drivers/gpu/drm/msm/msm_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void msm_framebuffer_destroy(struct drm_framebuffer *fb) 
	msm_fb = to_msm_framebuffer(fb);

	n = fb->format->num_planes;



	DBG("destroy: FB ID: %d (%p)", fb->base.id, fb);

	DBG("destroy: FB ID: %d (%pK)", fb->base.id, fb);



	drm_framebuffer_cleanup(fb);
@@ -366,7 +366,7 @@ struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev, 
	unsigned int hsub, vsub;

	bool is_modified = false;



	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);
@@ -450,7 +450,7 @@ 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;