Commit 3db8d37d authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/tinydrm: Use DRM_GEM_CMA_VMAP_DRIVER_OPS 



The CMA helper now has the functionality to ensure a virtual address on
imported buffer so use that.

While touching all tinydrm drivers, remove the unnecessary inclusion of
drm_fb_helper.h in some drivers.

Cc: David Lechner <david@lechnology.com>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20181110145647.17580-6-noralf@tronnes.org
parent b9068cde

drivers/gpu/drm/tinydrm/core/tinydrm-core.c

+0 −71
Original line number Diff line number Diff line
@@ -36,77 +36,6 @@ 
 * and registers the DRM device using devm_tinydrm_register().

 */



/**

 * tinydrm_gem_cma_prime_import_sg_table - Produce a CMA GEM object from

 *     another driver's scatter/gather table of pinned pages

 * @drm: DRM device to import into

 * @attach: DMA-BUF attachment

 * @sgt: Scatter/gather table of pinned pages

 *

 * This function imports a scatter/gather table exported via DMA-BUF by

 * another driver using drm_gem_cma_prime_import_sg_table(). It sets the

 * kernel virtual address on the CMA object. Drivers should use this as their

 * &drm_driver->gem_prime_import_sg_table callback if they need the virtual

 * address. tinydrm_gem_cma_free_object() should be used in combination with

 * this function.

 *

 * Returns:

 * A pointer to a newly created GEM object or an ERR_PTR-encoded negative

 * error code on failure.

 */

struct drm_gem_object *

tinydrm_gem_cma_prime_import_sg_table(struct drm_device *drm,

				      struct dma_buf_attachment *attach,

				      struct sg_table *sgt)

{

	struct drm_gem_cma_object *cma_obj;

	struct drm_gem_object *obj;

	void *vaddr;



	vaddr = dma_buf_vmap(attach->dmabuf);

	if (!vaddr) {

		DRM_ERROR("Failed to vmap PRIME buffer\n");

		return ERR_PTR(-ENOMEM);

	}



	obj = drm_gem_cma_prime_import_sg_table(drm, attach, sgt);

	if (IS_ERR(obj)) {

		dma_buf_vunmap(attach->dmabuf, vaddr);

		return obj;

	}



	cma_obj = to_drm_gem_cma_obj(obj);

	cma_obj->vaddr = vaddr;



	return obj;

}

EXPORT_SYMBOL(tinydrm_gem_cma_prime_import_sg_table);



/**

 * tinydrm_gem_cma_free_object - Free resources associated with a CMA GEM

 *                               object

 * @gem_obj: GEM object to free

 *

 * This function frees the backing memory of the CMA GEM object, cleans up the

 * GEM object state and frees the memory used to store the object itself using

 * drm_gem_cma_free_object(). It also handles PRIME buffers which has the kernel

 * virtual address set by tinydrm_gem_cma_prime_import_sg_table(). Drivers

 * can use this as their &drm_driver->gem_free_object_unlocked callback.

 */

void tinydrm_gem_cma_free_object(struct drm_gem_object *gem_obj)

{

	if (gem_obj->import_attach) {

		struct drm_gem_cma_object *cma_obj;



		cma_obj = to_drm_gem_cma_obj(gem_obj);

		dma_buf_vunmap(gem_obj->import_attach->dmabuf, cma_obj->vaddr);

		cma_obj->vaddr = NULL;

	}



	drm_gem_cma_free_object(gem_obj);

}

EXPORT_SYMBOL_GPL(tinydrm_gem_cma_free_object);



static struct drm_framebuffer *

tinydrm_fb_create(struct drm_device *drm, struct drm_file *file_priv,

		  const struct drm_mode_fb_cmd2 *mode_cmd)

drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c

+6 −0
Original line number Diff line number Diff line
@@ -9,12 +9,18 @@ 


#include <linux/backlight.h>

#include <linux/dma-buf.h>

#include <linux/module.h>

#include <linux/pm.h>

#include <linux/spi/spi.h>

#include <linux/swab.h>



#include <drm/drm_device.h>

#include <drm/drm_drv.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_print.h>

#include <drm/tinydrm/tinydrm.h>

#include <drm/tinydrm/tinydrm-helpers.h>

#include <uapi/drm/drm.h>



static unsigned int spi_max;

module_param(spi_max, uint, 0400);

drivers/gpu/drm/tinydrm/hx8357d.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/property.h>

#include <linux/spi/spi.h>



#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/tinydrm/mipi-dbi.h>
@@ -188,7 +188,7 @@ DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops); 
static struct drm_driver hx8357d_driver = {

	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,

	.fops			= &hx8357d_fops,

	TINYDRM_GEM_DRIVER_OPS,

	DRM_GEM_CMA_VMAP_DRIVER_OPS,

	.debugfs_init		= mipi_dbi_debugfs_init,

	.name			= "hx8357d",

	.desc			= "HX8357D",

drivers/gpu/drm/tinydrm/ili9225.c

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include <linux/spi/spi.h>

#include <video/mipi_display.h>



#include <drm/drm_fb_helper.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/tinydrm/mipi-dbi.h>

#include <drm/tinydrm/tinydrm-helpers.h>
@@ -367,7 +368,7 @@ static struct drm_driver ili9225_driver = { 
	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |

				  DRIVER_ATOMIC,

	.fops			= &ili9225_fops,

	TINYDRM_GEM_DRIVER_OPS,

	DRM_GEM_CMA_VMAP_DRIVER_OPS,

	.name			= "ili9225",

	.desc			= "Ilitek ILI9225",

	.date			= "20171106",

drivers/gpu/drm/tinydrm/ili9341.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/property.h>

#include <linux/spi/spi.h>



#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/tinydrm/mipi-dbi.h>
@@ -144,7 +144,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops); 
static struct drm_driver ili9341_driver = {

	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,

	.fops			= &ili9341_fops,

	TINYDRM_GEM_DRIVER_OPS,

	DRM_GEM_CMA_VMAP_DRIVER_OPS,

	.debugfs_init		= mipi_dbi_debugfs_init,

	.name			= "ili9341",

	.desc			= "Ilitek ILI9341",

CRA Git | Maintained and supported by SUSTech CRA and CCSE