From 9c2851d04eb665b16cf00c744d6242b89b71cf24 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Fri, 11 Sep 2015 17:27:53 +0100 Subject: drm: hdlcd: Use drm_gem_cma_prime_get_sg_table Rather than a custom implementation. This is possible since commit 1d1ddf67dc3b ("arm64: dma-mapping: implement dma_get_sgtable()") Signed-off-by: Jon Medhurst --- drivers/gpu/drm/arm/hdlcd_drv.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 70592c7abd63..e3faa02842d9 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -382,23 +382,6 @@ static const struct file_operations fops = { .mmap = drm_gem_cma_mmap, }; -struct sg_table *hdlcd_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) -{ - struct sg_table *sgt; - - sgt = drm_gem_cma_prime_get_sg_table(obj); - if (sgt) { - struct drm_gem_cma_object *cma_obj; - - cma_obj = to_drm_gem_cma_obj(obj); - sg_dma_address(sgt->sgl) = cma_obj->paddr; - sg_set_page(sgt->sgl, pfn_to_page(PFN_DOWN(cma_obj->paddr)), - PAGE_ALIGN(obj->size), 0); - } - - return sgt; -} - static struct drm_driver hdlcd_driver = { .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME, @@ -423,7 +406,7 @@ static struct drm_driver hdlcd_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, - .gem_prime_get_sg_table = hdlcd_gem_cma_prime_get_sg_table, + .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_vmap = drm_gem_cma_prime_vmap, .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, -- cgit v1.2.3