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

Commit 3b356785 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Inki Dae
Browse files

drm/exynos: ipp: fix incorrect format specifiers in debug messages 



Drivers should use %p for printing pointers instead of hardcoding them
as hexadecimal integers. This patch fixes compilation warnings on 64bit
architectures.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent dbbc925b

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+1 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ static int fimc_probe(struct platform_device *pdev) 
		goto err_put_clk;

	}



	DRM_DEBUG_KMS("id[%d]ippdrv[0x%x]\n", ctx->id, (int)ippdrv);

	DRM_DEBUG_KMS("id[%d]ippdrv[%p]\n", ctx->id, ippdrv);



	spin_lock_init(&ctx->lock);

	platform_set_drvdata(pdev, ctx);

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+1 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ static int gsc_probe(struct platform_device *pdev) 
		return ret;

	}



	DRM_DEBUG_KMS("id[%d]ippdrv[0x%x]\n", ctx->id, (int)ippdrv);

	DRM_DEBUG_KMS("id[%d]ippdrv[%p]\n", ctx->id, ippdrv);



	mutex_init(&ctx->lock);

	platform_set_drvdata(pdev, ctx);

drivers/gpu/drm/exynos/exynos_drm_ipp.c

+16 −16
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static struct exynos_drm_ippdrv *ipp_find_drv_by_handle(u32 prop_id) 
	 * e.g PAUSE state, queue buf, command control.

	 */

	list_for_each_entry(ippdrv, &exynos_drm_ippdrv_list, drv_list) {

		DRM_DEBUG_KMS("count[%d]ippdrv[0x%x]\n", count++, (int)ippdrv);

		DRM_DEBUG_KMS("count[%d]ippdrv[%p]\n", count++, ippdrv);



		mutex_lock(&ippdrv->cmd_lock);

		list_for_each_entry(c_node, &ippdrv->cmd_list, list) {
@@ -388,8 +388,8 @@ int exynos_drm_ipp_set_property(struct drm_device *drm_dev, void *data, 
	}

	property->prop_id = ret;



	DRM_DEBUG_KMS("created prop_id[%d]cmd[%d]ippdrv[0x%x]\n",

		property->prop_id, property->cmd, (int)ippdrv);

	DRM_DEBUG_KMS("created prop_id[%d]cmd[%d]ippdrv[%p]\n",

		property->prop_id, property->cmd, ippdrv);



	/* stored property information and ippdrv in private data */

	c_node->property = *property;
@@ -518,7 +518,7 @@ static int ipp_put_mem_node(struct drm_device *drm_dev, 
{

	int i;



	DRM_DEBUG_KMS("node[0x%x]\n", (int)m_node);

	DRM_DEBUG_KMS("node[%p]\n", m_node);



	if (!m_node) {

		DRM_ERROR("invalid dequeue node.\n");
@@ -562,7 +562,7 @@ static struct drm_exynos_ipp_mem_node 
	m_node->buf_id = qbuf->buf_id;

	INIT_LIST_HEAD(&m_node->list);



	DRM_DEBUG_KMS("m_node[0x%x]ops_id[%d]\n", (int)m_node, qbuf->ops_id);

	DRM_DEBUG_KMS("m_node[%p]ops_id[%d]\n", m_node, qbuf->ops_id);

	DRM_DEBUG_KMS("prop_id[%d]buf_id[%d]\n", qbuf->prop_id, m_node->buf_id);



	for_each_ipp_planar(i) {
@@ -582,8 +582,8 @@ static struct drm_exynos_ipp_mem_node 


			buf_info->handles[i] = qbuf->handle[i];

			buf_info->base[i] = *addr;

			DRM_DEBUG_KMS("i[%d]base[0x%x]hd[0x%lx]\n", i,

				      buf_info->base[i], buf_info->handles[i]);

			DRM_DEBUG_KMS("i[%d]base[%pad]hd[0x%lx]\n", i,

				      &buf_info->base[i], buf_info->handles[i]);

		}

	}
@@ -659,7 +659,7 @@ static void ipp_put_event(struct drm_exynos_ipp_cmd_node *c_node, 


	mutex_lock(&c_node->event_lock);

	list_for_each_entry_safe(e, te, &c_node->event_list, base.link) {

		DRM_DEBUG_KMS("count[%d]e[0x%x]\n", count++, (int)e);

		DRM_DEBUG_KMS("count[%d]e[%p]\n", count++, e);



		/*

		 * qbuf == NULL condition means all event deletion.
@@ -750,7 +750,7 @@ static struct drm_exynos_ipp_mem_node 


	/* find memory node from memory list */

	list_for_each_entry(m_node, head, list) {

		DRM_DEBUG_KMS("count[%d]m_node[0x%x]\n", count++, (int)m_node);

		DRM_DEBUG_KMS("count[%d]m_node[%p]\n", count++, m_node);



		/* compare buffer id */

		if (m_node->buf_id == qbuf->buf_id)
@@ -767,7 +767,7 @@ static int ipp_set_mem_node(struct exynos_drm_ippdrv *ippdrv, 
	struct exynos_drm_ipp_ops *ops = NULL;

	int ret = 0;



	DRM_DEBUG_KMS("node[0x%x]\n", (int)m_node);

	DRM_DEBUG_KMS("node[%p]\n", m_node);



	if (!m_node) {

		DRM_ERROR("invalid queue node.\n");
@@ -1232,7 +1232,7 @@ static int ipp_start_property(struct exynos_drm_ippdrv *ippdrv, 
			m_node = list_first_entry(head,

				struct drm_exynos_ipp_mem_node, list);



			DRM_DEBUG_KMS("m_node[0x%x]\n", (int)m_node);

			DRM_DEBUG_KMS("m_node[%p]\n", m_node);



			ret = ipp_set_mem_node(ippdrv, c_node, m_node);

			if (ret) {
@@ -1601,8 +1601,8 @@ static int ipp_subdrv_probe(struct drm_device *drm_dev, struct device *dev) 
		}

		ippdrv->prop_list.ipp_id = ret;



		DRM_DEBUG_KMS("count[%d]ippdrv[0x%x]ipp_id[%d]\n",

			count++, (int)ippdrv, ret);

		DRM_DEBUG_KMS("count[%d]ippdrv[%p]ipp_id[%d]\n",

			count++, ippdrv, ret);



		/* store parent device for node */

		ippdrv->parent_dev = dev;
@@ -1659,7 +1659,7 @@ static int ipp_subdrv_open(struct drm_device *drm_dev, struct device *dev, 


	file_priv->ipp_dev = dev;



	DRM_DEBUG_KMS("done priv[0x%x]\n", (int)dev);

	DRM_DEBUG_KMS("done priv[%p]\n", dev);



	return 0;

}
@@ -1676,8 +1676,8 @@ static void ipp_subdrv_close(struct drm_device *drm_dev, struct device *dev, 
		mutex_lock(&ippdrv->cmd_lock);

		list_for_each_entry_safe(c_node, tc_node,

			&ippdrv->cmd_list, list) {

			DRM_DEBUG_KMS("count[%d]ippdrv[0x%x]\n",

				count++, (int)ippdrv);

			DRM_DEBUG_KMS("count[%d]ippdrv[%p]\n",

				count++, ippdrv);



			if (c_node->filp == file) {

				/*

drivers/gpu/drm/exynos/exynos_drm_rotator.c

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ static int rotator_probe(struct platform_device *pdev) 
		goto err_ippdrv_register;

	}



	DRM_DEBUG_KMS("ippdrv[0x%x]\n", (int)ippdrv);

	DRM_DEBUG_KMS("ippdrv[%p]\n", ippdrv);



	platform_set_drvdata(pdev, rot);