[PATCHv2 2/2] gpu: drm: omapdrm: Change struct pat data_pa type to dma_addr_t

Matwey V. Kornilov matwey.kornilov at gmail.com
Fri Jul 25 10:37:37 PDT 2014


From: "Matwey V. Kornilov" <matwey at sai.msu.ru>

The single one use-case for data_pa member of the struct pat is to carry a value of dma_addr_t type.
This patch solves the following compilation error:

../drivers/gpu/drm/omapdrm/omap_dmm_tiler.c: In function 'dmm_txn_append':
../drivers/gpu/drm/omapdrm/omap_dmm_tiler.c:226:2: error: passing argument 3 of 'alloc_dma' from incompatible pointer type [-Werror]
  data = alloc_dma(txn, 4*i, &pat->data_pa);
  ^
../drivers/gpu/drm/omapdrm/omap_dmm_tiler.c:77:14: note: expected 'dma_addr_t *' but argument is of type 'uint32_t *'
 static void *alloc_dma(struct dmm_txn *txn, size_t sz, dma_addr_t *pa)
              ^

Signed-off-by: Matwey V. Kornilov <matwey at sai.msu.ru>
---
 drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_priv.h b/drivers/gpu/drm/omapdrm/omap_dmm_priv.h
index 58bcd6a..4142525 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_priv.h
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_priv.h
@@ -105,7 +105,7 @@ struct pat {
 	uint32_t next_pa;
 	struct pat_area area;
 	struct pat_ctrl ctrl;
-	uint32_t data_pa;
+	dma_addr_t data_pa;
 };
 
 #define DMM_FIXED_RETRY_COUNT 1000
-- 
1.8.1.4



More information about the dri-devel mailing list