Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1281532

Re: [PATCH 1/9] drm: Create a driver hook for allocating GEM object structs.

Show all headers | View raw

On Tue, Dec 01, 2015 at 12:35:50PM -0800, Eric Anholt wrote:
> The CMA helpers had no way for a driver to extend the struct with its
> own fields.  Since the CMA helpers are mostly "Allocate a
> drm_gem_cma_object, then fill in a few fields", it's hard to write as
> pure helpers without passing in a driver callback for the allocate
> step.
> 
> Signed-off-by: Eric Anholt <eric@anholt.net>

Yeah there's no other way to make this happen without ridiculous amounts
of boilerplate.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/drm_gem_cma_helper.c | 10 ++++++----
>  include/drm/drmP.h                   |  7 +++++++
>  2 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
> index e109b49..0f7b00ba 100644
> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
> @@ -59,11 +59,13 @@ __drm_gem_cma_create(struct drm_device *drm, size_t size)
>  	struct drm_gem_object *gem_obj;
>  	int ret;
>  
> -	cma_obj = kzalloc(sizeof(*cma_obj), GFP_KERNEL);
> -	if (!cma_obj)
> +	if (drm->driver->gem_create_object)
> +		gem_obj = drm->driver->gem_create_object(drm, size);
> +	else
> +		gem_obj = kzalloc(sizeof(*cma_obj), GFP_KERNEL);
> +	if (!gem_obj)
>  		return ERR_PTR(-ENOMEM);
> -
> -	gem_obj = &cma_obj->base;
> +	cma_obj = container_of(gem_obj, struct drm_gem_cma_object, base);
>  
>  	ret = drm_gem_object_init(drm, gem_obj, size);
>  	if (ret)
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 0b921ae..22ff162 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -580,6 +580,13 @@ struct drm_driver {
>  	int (*gem_open_object) (struct drm_gem_object *, struct drm_file *);
>  	void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);
>  
> +	/**
> +	 * Hook for allocating the GEM object struct, for use by core
> +	 * helpers.
> +	 */
> +	struct drm_gem_object *(*gem_create_object)(struct drm_device *dev,
> +						    size_t size);
> +
>  	/* prime: */
>  	/* export handle -> fd (see drm_gem_prime_handle_to_fd() helper) */
>  	int (*prime_handle_to_fd)(struct drm_device *dev, struct drm_file *file_priv,
> -- 
> 2.6.2
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/9] drm: Create a driver hook for allocating GEM object structs. Eric Anholt <eric@anholt.net> - 2015-12-01 21:40 +0100
  [PATCH 4/9] drm/vc4: Add an API for creating GPU shaders in GEM BOs. Eric Anholt <eric@anholt.net> - 2015-12-01 21:40 +0100
    Re: [PATCH 4/9] drm/vc4: Add an API for creating GPU shaders in GEM BOs. Emil Velikov <emil.l.velikov@gmail.com> - 2015-12-02 12:40 +0100
      Re: [PATCH 4/9] drm/vc4: Add an API for creating GPU shaders in GEM BOs. Eric Anholt <eric@anholt.net> - 2015-12-02 20:30 +0100
  [PATCH 6/9] drm/vc4: Bind and initialize the V3D engine. Eric Anholt <eric@anholt.net> - 2015-12-01 21:40 +0100
  [PATCH 8/9] drm/vc4: Add support for async pageflips. Eric Anholt <eric@anholt.net> - 2015-12-01 21:40 +0100
    Re: [PATCH 8/9] drm/vc4: Add support for async pageflips. Daniel Stone <daniel@fooishbar.org> - 2015-12-02 15:10 +0100
      Re: [PATCH 8/9] drm/vc4: Add support for async pageflips. Eric Anholt <eric@anholt.net> - 2015-12-04 02:50 +0100
        Re: [PATCH 8/9] drm/vc4: Add support for async pageflips. Daniel Stone <daniel@fooishbar.org> - 2015-12-07 11:20 +0100
  [PATCH 3/9] drm/vc4: Add create and map BO ioctls. Eric Anholt <eric@anholt.net> - 2015-12-01 21:40 +0100
    Re: [PATCH 3/9] drm/vc4: Add create and map BO ioctls. Emil Velikov <emil.l.velikov@gmail.com> - 2015-12-04 15:30 +0100
      Re: [PATCH 3/9] drm/vc4: Add create and map BO ioctls. Eric Anholt <eric@anholt.net> - 2015-12-08 02:20 +0100
        Re: [PATCH 3/9] drm/vc4: Add create and map BO ioctls. Michel Dänzer <michel@daenzer.net> - 2015-12-08 04:00 +0100
          Re: [PATCH 3/9] drm/vc4: Add create and map BO ioctls. Eric Anholt <eric@anholt.net> - 2015-12-08 05:10 +0100
  [PATCH 2/9] drm/vc4: Add a BO cache. Eric Anholt <eric@anholt.net> - 2015-12-01 21:40 +0100
  Re: [PATCH 1/9] drm: Create a driver hook for allocating GEM object  structs. Daniel Vetter <daniel@ffwll.ch> - 2015-12-02 10:00 +0100
  Re: [PATCH 7/9] drm/vc4: Add support for drawing 3D frames. Emil Velikov <emil.l.velikov@gmail.com> - 2015-12-02 12:30 +0100
    Re: [PATCH 7/9] drm/vc4: Add support for drawing 3D frames. Eric Anholt <eric@anholt.net> - 2015-12-02 20:30 +0100

csiph-web