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

Commit 5cc25ba9 authored by Lakshmi Narayana Kalavala's avatar Lakshmi Narayana Kalavala Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm: Fix the format prints in display driver 



Fix the %p format prints with %pK.

Change-Id: I1743bacb76c1db4bfa304146f7d391751b35273c
Signed-off-by: default avatarLakshmi Narayana Kalavala <lkalaval@codeaurora.org>
parent 1c41dc15

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

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

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -484,7 +484,7 @@ static int dsi_ctrl_init_regmap(struct platform_device *pdev, 
	}

	}





	ctrl->hw.base = ptr;

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

		 ctrl->hw.base);





	ptr = msm_ioremap(pdev, "mmss_misc", ctrl->name);

	ptr = msm_ioremap(pdev, "mmss_misc", ctrl->name);
@@ -494,7 +494,7 @@ static int dsi_ctrl_init_regmap(struct platform_device *pdev, 
	}

	}





	ctrl->hw.mmss_misc_base = ptr;

	ctrl->hw.mmss_misc_base = ptr;

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

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

		 ctrl->hw.mmss_misc_base);

		 ctrl->hw.mmss_misc_base);

	return rc;

	return rc;

}

}

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

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

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -1469,7 +1469,7 @@ static int dsi_panel_parse_dba_config(struct dsi_panel *panel, 
			"qcom,bridge-name", &len);

			"qcom,bridge-name", &len);

		if (!panel->dba_config.bridge_name || len <= 0) {

		if (!panel->dba_config.bridge_name || len <= 0) {

			SDE_ERROR(

			SDE_ERROR(

			"%s:%d Unable to read bridge_name, data=%p,len=%d\n",

			"%s:%d Unable to read bridge_name, data=%pK,len=%d\n",

			__func__, __LINE__, panel->dba_config.bridge_name, len);

			__func__, __LINE__, panel->dba_config.bridge_name, len);

			rc = -EINVAL;

			rc = -EINVAL;

			goto error;

			goto error;

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

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

/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -93,7 +93,8 @@ static int dsi_phy_regmap_init(struct platform_device *pdev, 




	phy->hw.base = ptr;

	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;

	return rc;

}

}

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

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

/*

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

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

 *

 *

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

 * 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

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

		ret = -ENOMEM;

		goto fail;

		goto fail;

	}

	}

	DBG("eDP probed=%p", edp);

	DBG("eDP probed=%pK", edp);





	edp->pdev = pdev;

	edp->pdev = pdev;

	platform_set_drvdata(pdev, edp);

	platform_set_drvdata(pdev, edp);

drivers/gpu/drm/msm/msm_drv.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Copyright (C) 2013 Red Hat

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 * Author: Rob Clark <robdclark@gmail.com>

 *

 *

 * Copyright (c) 2017 The Linux Foundation. All rights reserved.

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

 *

 *

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

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

 * under the terms of the GNU General Public License version 2 as published by

 * under the terms of the GNU General Public License version 2 as published by
@@ -99,7 +99,8 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, 
	}

	}





	if (reglog)

	if (reglog)

		printk(KERN_DEBUG "IO:region %s %p %08lx\n", dbgname, ptr, size);

		pr_debug("IO:region %s %pK %08lx\n",

			dbgname, ptr, size);





	return ptr;

	return ptr;

}

}
@@ -107,7 +108,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name, 
void msm_writel(u32 data, void __iomem *addr)

void msm_writel(u32 data, void __iomem *addr)

{

{

	if (reglog)

	if (reglog)

		printk(KERN_DEBUG "IO:W %p %08x\n", addr, data);

		pr_debug("IO:W %pK %08x\n", addr, data);

	writel(data, addr);

	writel(data, addr);

}

}
@@ -115,7 +116,7 @@ u32 msm_readl(const void __iomem *addr) 
{

{

	u32 val = readl(addr);

	u32 val = readl(addr);

	if (reglog)

	if (reglog)

		printk(KERN_ERR "IO:R %p %08x\n", addr, val);

		pr_debug("IO:R %pK %08x\n", addr, val);

	return val;

	return val;

}

}
@@ -598,7 +599,7 @@ static int msm_enable_vblank(struct drm_device *dev, unsigned int pipe) 
	struct msm_kms *kms = priv->kms;

	struct msm_kms *kms = priv->kms;

	if (!kms)

	if (!kms)

		return -ENXIO;

		return -ENXIO;

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

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

	return vblank_ctrl_queue_work(priv, pipe, true);

	return vblank_ctrl_queue_work(priv, pipe, true);

}

}
@@ -608,7 +609,7 @@ static void msm_disable_vblank(struct drm_device *dev, unsigned int pipe) 
	struct msm_kms *kms = priv->kms;

	struct msm_kms *kms = priv->kms;

	if (!kms)

	if (!kms)

		return;

		return;

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

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

	vblank_ctrl_queue_work(priv, pipe, false);

	vblank_ctrl_queue_work(priv, pipe, false);

}

}