[PATCHv4,06/36] drm/gem-fb-helper: Add method to allocate struct drm_framebuffer
diff mbox series

Message ID 20191213155907.16581-7-andrzej.p@collabora.com
State New
Headers show
Series
  • AFBC support for Rockchip
Related show

Commit Message

Andrzej Pietrasiewicz Dec. 13, 2019, 3:58 p.m. UTC
Some drivers might want to use the modifier_info field of struct
drm_framebuffer to hold struct drm_afbc. The memory for the latter must
be managed by the driver. To eliminate the need to modify existing
invocations of kfree(fb), add a function to allocate struct drm_framebuffer
and its associated struct drm_afbc in one chunk.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
---
 drivers/gpu/drm/drm_gem_framebuffer_helper.c | 32 ++++++++++++++++++++
 include/drm/drm_gem_framebuffer_helper.h     |  1 +
 2 files changed, 33 insertions(+)

Comments

Daniel Vetter Dec. 13, 2019, 5:33 p.m. UTC | #1
On Fri, Dec 13, 2019 at 04:58:37PM +0100, Andrzej Pietrasiewicz wrote:
> Some drivers might want to use the modifier_info field of struct
> drm_framebuffer to hold struct drm_afbc. The memory for the latter must
> be managed by the driver. To eliminate the need to modify existing
> invocations of kfree(fb), add a function to allocate struct drm_framebuffer
> and its associated struct drm_afbc in one chunk.
> 
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
> ---
>  drivers/gpu/drm/drm_gem_framebuffer_helper.c | 32 ++++++++++++++++++++
>  include/drm/drm_gem_framebuffer_helper.h     |  1 +
>  2 files changed, 33 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
> index e20f4d00b0a5..0338f303f988 100644
> --- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c
> +++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
> @@ -21,6 +21,13 @@
>  #include <drm/drm_modeset_helper.h>
>  #include <drm/drm_simple_kms_helper.h>
>  
> +#define DRM_ALIGN_MASK(type) \
> +	(__alignof__(type) - 1)
> +#define DRM_INFO_OFFSET(type1, type2)	\
> +	((sizeof(type1) + DRM_ALIGN_MASK(type2)) & ~DRM_ALIGN_MASK(type2))
> +#define DRM_COMPOUND_SIZE(type1, type2) \
> +	(DRM_INFO_OFFSET(type1, type2) + sizeof(type2))
> +
>  #define AFBC_HEADER_SIZE		16
>  #define AFBC_TH_LAYOUT_ALIGNMENT	8
>  #define AFBC_SUPERBLOCK_PIXELS		256
> @@ -59,6 +66,31 @@ struct drm_gem_object *drm_gem_fb_get_obj(struct drm_framebuffer *fb,
>  }
>  EXPORT_SYMBOL_GPL(drm_gem_fb_get_obj);
>  
> +/**
> + * drm_gem_fb_alloc_with_afbc() - Allocate struct drm_framebuffer together
> + *				  with a struct drm_afbc for easier freeing
> + *				  and assign drm_framebuffer's modifier_info
> + *
> + * Returns:
> + * Pointer to drm_framebuffer on success or NULL
> + */
> +struct drm_framebuffer *drm_gem_fb_alloc_with_afbc(void)
> +{
> +	struct drm_framebuffer *fb;
> +
> +	/* alloc in one chunk to ease freeing */
> +	fb = kzalloc(DRM_COMPOUND_SIZE(struct drm_framebuffer, struct drm_afbc),
> +		     GFP_KERNEL);
> +	if (!fb)
> +		return NULL;
> +
> +	fb->modifier_info =
> +		fb + DRM_INFO_OFFSET(struct drm_framebuffer, struct drm_afbc);

That's not how we do subclassing in general ... (so also no on patch 1).
What I mean here is:

struct drm_afbc {
	struct drm_framebuffer base;
	/* additional afbc information goes here, _not_ into struct
	 * drm_framebuffer */
}

#define drm_framebuffer_to_afbc(fb) container_of(fb, struct drm_afbc, base)

Both probably best stuffed into drm_plane.h

Aside from that style issue I think the core/helper work of this patch
series is getting there. But I didn't read the details (and probably wont
get to that before the new year because stuff and vacations).

Cheers, Daniel

> +
> +	return fb;
> +}
> +EXPORT_SYMBOL_GPL(drm_gem_fb_alloc_with_afbc);
> +
>  int drm_gem_fb_init_with_funcs(struct drm_framebuffer *fb,
>  			       struct drm_device *dev,
>  			       const struct drm_mode_fb_cmd2 *mode_cmd,
> diff --git a/include/drm/drm_gem_framebuffer_helper.h b/include/drm/drm_gem_framebuffer_helper.h
> index 3d6015194b3c..4e7b1e2c765b 100644
> --- a/include/drm/drm_gem_framebuffer_helper.h
> +++ b/include/drm/drm_gem_framebuffer_helper.h
> @@ -42,6 +42,7 @@ struct drm_afbc {
>  
>  struct drm_gem_object *drm_gem_fb_get_obj(struct drm_framebuffer *fb,
>  					  unsigned int plane);
> +struct drm_framebuffer *drm_gem_fb_alloc_with_afbc(void);
>  int drm_gem_fb_init_with_funcs(struct drm_framebuffer *fb,
>  			       struct drm_device *dev,
>  			       const struct drm_mode_fb_cmd2 *mode_cmd,
> -- 
> 2.17.1
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
index e20f4d00b0a5..0338f303f988 100644
--- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c
+++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c
@@ -21,6 +21,13 @@ 
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_simple_kms_helper.h>
 
+#define DRM_ALIGN_MASK(type) \
+	(__alignof__(type) - 1)
+#define DRM_INFO_OFFSET(type1, type2)	\
+	((sizeof(type1) + DRM_ALIGN_MASK(type2)) & ~DRM_ALIGN_MASK(type2))
+#define DRM_COMPOUND_SIZE(type1, type2) \
+	(DRM_INFO_OFFSET(type1, type2) + sizeof(type2))
+
 #define AFBC_HEADER_SIZE		16
 #define AFBC_TH_LAYOUT_ALIGNMENT	8
 #define AFBC_SUPERBLOCK_PIXELS		256
@@ -59,6 +66,31 @@  struct drm_gem_object *drm_gem_fb_get_obj(struct drm_framebuffer *fb,
 }
 EXPORT_SYMBOL_GPL(drm_gem_fb_get_obj);
 
+/**
+ * drm_gem_fb_alloc_with_afbc() - Allocate struct drm_framebuffer together
+ *				  with a struct drm_afbc for easier freeing
+ *				  and assign drm_framebuffer's modifier_info
+ *
+ * Returns:
+ * Pointer to drm_framebuffer on success or NULL
+ */
+struct drm_framebuffer *drm_gem_fb_alloc_with_afbc(void)
+{
+	struct drm_framebuffer *fb;
+
+	/* alloc in one chunk to ease freeing */
+	fb = kzalloc(DRM_COMPOUND_SIZE(struct drm_framebuffer, struct drm_afbc),
+		     GFP_KERNEL);
+	if (!fb)
+		return NULL;
+
+	fb->modifier_info =
+		fb + DRM_INFO_OFFSET(struct drm_framebuffer, struct drm_afbc);
+
+	return fb;
+}
+EXPORT_SYMBOL_GPL(drm_gem_fb_alloc_with_afbc);
+
 int drm_gem_fb_init_with_funcs(struct drm_framebuffer *fb,
 			       struct drm_device *dev,
 			       const struct drm_mode_fb_cmd2 *mode_cmd,
diff --git a/include/drm/drm_gem_framebuffer_helper.h b/include/drm/drm_gem_framebuffer_helper.h
index 3d6015194b3c..4e7b1e2c765b 100644
--- a/include/drm/drm_gem_framebuffer_helper.h
+++ b/include/drm/drm_gem_framebuffer_helper.h
@@ -42,6 +42,7 @@  struct drm_afbc {
 
 struct drm_gem_object *drm_gem_fb_get_obj(struct drm_framebuffer *fb,
 					  unsigned int plane);
+struct drm_framebuffer *drm_gem_fb_alloc_with_afbc(void);
 int drm_gem_fb_init_with_funcs(struct drm_framebuffer *fb,
 			       struct drm_device *dev,
 			       const struct drm_mode_fb_cmd2 *mode_cmd,