aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2014-07-03 09:10:29 -0400
committerInki Dae <daeinki@gmail.com>2014-08-03 03:52:17 -0400
commita8ea17f60e966d4dd07458fb614e3ddfba23770e (patch)
tree6040d4e81d55f516923fa11a6b925da6ffdb986e
parent5c76c5b146b0f25ee55af190c6213faf63da0cd9 (diff)
drm/exynos/ipp: correct address type
exynos_drm_gem_get_dma_addr returns dma_addr_t, type casting to void* and back is not necessary. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_ipp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 34d185c280c0..f3d8b5cf3438 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -681,7 +681,6 @@ static struct drm_exynos_ipp_mem_node
681{ 681{
682 struct drm_exynos_ipp_mem_node *m_node; 682 struct drm_exynos_ipp_mem_node *m_node;
683 struct drm_exynos_ipp_buf_info buf_info; 683 struct drm_exynos_ipp_buf_info buf_info;
684 void *addr;
685 int i; 684 int i;
686 685
687 m_node = kzalloc(sizeof(*m_node), GFP_KERNEL); 686 m_node = kzalloc(sizeof(*m_node), GFP_KERNEL);
@@ -704,6 +703,8 @@ static struct drm_exynos_ipp_mem_node
704 703
705 /* get dma address by handle */ 704 /* get dma address by handle */
706 if (qbuf->handle[i]) { 705 if (qbuf->handle[i]) {
706 dma_addr_t *addr;
707
707 addr = exynos_drm_gem_get_dma_addr(drm_dev, 708 addr = exynos_drm_gem_get_dma_addr(drm_dev,
708 qbuf->handle[i], file); 709 qbuf->handle[i], file);
709 if (IS_ERR(addr)) { 710 if (IS_ERR(addr)) {
@@ -712,7 +713,7 @@ static struct drm_exynos_ipp_mem_node
712 } 713 }
713 714
714 buf_info.handles[i] = qbuf->handle[i]; 715 buf_info.handles[i] = qbuf->handle[i];
715 buf_info.base[i] = *(dma_addr_t *) addr; 716 buf_info.base[i] = *addr;
716 DRM_DEBUG_KMS("i[%d]base[0x%x]hd[0x%x]\n", 717 DRM_DEBUG_KMS("i[%d]base[0x%x]hd[0x%x]\n",
717 i, buf_info.base[i], (int)buf_info.handles[i]); 718 i, buf_info.base[i], (int)buf_info.handles[i]);
718 } 719 }