OSDN Git Service

gpu: host1x: Fix compiler errors by converting to dma_addr_t
authorEmil Goode <emil.fsw@goode.io>
Wed, 16 May 2018 10:22:04 +0000 (12:22 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 18 May 2018 09:23:48 +0000 (11:23 +0200)
commit2f8a6da866eff746a9f8c7745790f3765baeb589
treeb7e5eeec4e1e8b019fe9b7c39ff363c622b7256f
parent5cb8b9969be6f14ac3b7ba90de8f7a65f68e46fe
gpu: host1x: Fix compiler errors by converting to dma_addr_t

The compiler is complaining with the following errors:

drivers/gpu/host1x/cdma.c:94:48: error:
passing argument 3 of ‘dma_alloc_wc’ from incompatible pointer type
[-Werror=incompatible-pointer-types]

drivers/gpu/host1x/cdma.c:113:48: error:
passing argument 3 of ‘dma_alloc_wc’ from incompatible pointer type
[-Werror=incompatible-pointer-types]

The expected pointer type of the third argument to dma_alloc_wc() is
dma_addr_t but phys_addr_t is passed.

Change the phys member of struct push_buffer to be dma_addr_t so that we
pass the correct type to dma_alloc_wc().
Also check pb->mapped for non-NULL in the destroy function as that is the
right way of checking if dma_alloc_wc() was successful.

Signed-off-by: Emil Goode <emil.fsw@goode.io>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/host1x/cdma.c
drivers/gpu/host1x/cdma.h