Den 17.10.2017 14.38, skrev Daniel Vetter:

On Sun, Oct 15, 2017 at 06:30:35PM +0200, Noralf Trønnes wrote:

...

Make functions tolerate that the drm_fb_helper argument is NULL. This is useful for drivers that continue probing when fbdev emulation fails and not having to do this check themselves. Update docs for functions that already handles this.

Signed-off-by: Noralf Trønnes noralf@tronnes.org

Is there callsites that we can now simplify? Should we add a todo.rst entry if there's too many?

A quick scan didn't reveal any except for some .lastclose implementations that will be taken care of by the new lastclose helper.

Noralf.

Patch itself looks good.

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

...

---

drivers/gpu/drm/drm_fb_helper.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 116d1f1337c7..954cdd48de92 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -150,6 +150,9 @@ int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, { int err;

• if (!fb_helper)

• return 0;
  

• mutex_lock(&fb_helper->lock); err = __drm_fb_helper_add_one_connector(fb_helper, connector); mutex_unlock(&fb_helper->lock);

@@ -161,7 +164,7 @@ EXPORT_SYMBOL(drm_fb_helper_add_one_connector); /**

• drm_fb_helper_single_add_all_connectors() - add all connectors to fbdev

• 			       emulation helper
  

• • @fb_helper: fbdev initialized with drm_fb_helper_init

• • @fb_helper: fbdev initialized with drm_fb_helper_init, can be NULL
  • This functions adds all the available connectors for use with the given
  • fb_helper. This is a separate step to allow drivers to freely assign

@@ -179,7 +182,7 @@ int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper) struct drm_connector_list_iter conn_iter; int i, ret = 0;

• if (!drm_fbdev_emulation)

• if (!drm_fbdev_emulation || !fb_helper) return 0;

  mutex_lock(&fb_helper->lock);

@@ -245,6 +248,9 @@ int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper, { int err;

• if (!fb_helper)

• return 0;
  

• mutex_lock(&fb_helper->lock); err = __drm_fb_helper_remove_one_connector(fb_helper, connector); mutex_unlock(&fb_helper->lock);

@@ -484,7 +490,7 @@ static int restore_fbdev_mode(struct drm_fb_helper *fb_helper)

/**

• drm_fb_helper_restore_fbdev_mode_unlocked - restore fbdev configuration

• • @fb_helper: fbcon to restore

• • @fb_helper: driver-allocated fbdev helper, can be NULL
  • This should be called from driver's drm &drm_driver.lastclose callback
  • when implementing an fbcon on top of kms using this helper. This ensures that

@@ -498,7 +504,7 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper) bool do_delayed; int ret;

• if (!drm_fbdev_emulation)

• if (!drm_fbdev_emulation || !fb_helper) return -ENODEV;

  if (READ_ONCE(fb_helper->deferred_setup))

@@ -883,7 +889,7 @@ EXPORT_SYMBOL(drm_fb_helper_alloc_fbi);

/**

• drm_fb_helper_unregister_fbi - unregister fb_info framebuffer device

• • @fb_helper: driver-allocated fbdev helper

• • @fb_helper: driver-allocated fbdev helper, can be NULL
  • A wrapper around unregister_framebuffer, to release the fb_info
  • framebuffer device. This must be called before releasing all resources for

@@ -898,7 +904,7 @@ EXPORT_SYMBOL(drm_fb_helper_unregister_fbi);

/**

• drm_fb_helper_fini - finialize a &struct drm_fb_helper

• • @fb_helper: driver-allocated fbdev helper

• • @fb_helper: driver-allocated fbdev helper, can be NULL
  • This cleans up all remaining resources associated with @fb_helper. Must be
  • called after drm_fb_helper_unlink_fbi() was called.

@@ -937,7 +943,7 @@ EXPORT_SYMBOL(drm_fb_helper_fini);

/**

• drm_fb_helper_unlink_fbi - wrapper around unlink_framebuffer

• • @fb_helper: driver-allocated fbdev helper

• • @fb_helper: driver-allocated fbdev helper, can be NULL
  • A wrapper around unlink_framebuffer implemented by fbdev core
  */

@@ -1138,7 +1144,7 @@ EXPORT_SYMBOL(drm_fb_helper_cfb_imageblit);

/**

• drm_fb_helper_set_suspend - wrapper around fb_set_suspend

• • @fb_helper: driver-allocated fbdev helper

• • @fb_helper: driver-allocated fbdev helper, can be NULL
  • @suspend: whether to suspend or resume
  • A wrapper around fb_set_suspend implemented by fbdev core.

@@ -1155,7 +1161,7 @@ EXPORT_SYMBOL(drm_fb_helper_set_suspend); /**

• drm_fb_helper_set_suspend_unlocked - wrapper around fb_set_suspend that also

•                                  takes the console lock
  

• • @fb_helper: driver-allocated fbdev helper

• • @fb_helper: driver-allocated fbdev helper, can be NULL
  • @suspend: whether to suspend or resume
  • A wrapper around fb_set_suspend() that takes the console lock. If the lock

@@ -2568,7 +2574,7 @@ EXPORT_SYMBOL(drm_fb_helper_initial_config); /**

• drm_fb_helper_hotplug_event - respond to a hotplug notification by

•                           probing all the outputs attached to the fb
  

• • @fb_helper: the drm_fb_helper

• • @fb_helper: driver-allocated fbdev helper, can be NULL
  • Scan the connectors attached to the fb_helper and try to put together a
  • setup after notification of a change in output configuration.

@@ -2590,7 +2596,7 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper) { int err = 0;

• if (!drm_fbdev_emulation)

• if (!drm_fbdev_emulation || !fb_helper) return 0;

  mutex_lock(&fb_helper->lock);

-- 2.14.2

On Sun, Oct 15, 2017 at 06:30:36PM +0200, Noralf Trønnes wrote:

drm_fb_helper is *the* way of doing fbdev emulation so add a pointer to struct drm_device. This makes it possible to add callback helpers for .last_close and .output_poll_changed further reducing fbdev emulation footprint in drivers.

Signed-off-by: Noralf Trønnes noralf@tronnes.org

include/drm/drm_device.h | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index e21af87a2f3c..3c104b15a0c8 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -17,6 +17,7 @@ struct drm_vblank_crtc; struct drm_sg_mem; struct drm_local_map; struct drm_vma_offset_manager; +struct drm_fb_helper;

struct inode;

@@ -185,6 +186,13 @@ struct drm_device { struct drm_vma_offset_manager *vma_offset_manager; /*@} */ int switch_power_state;

• /**

• * @fbdev:
  

• *
  

• * Optional pointer to the fbdev emulation structure.
  

Needs more helper in here, to make it even more obvious that it's optional and not part of the core drm stuff.

Maybe call the member itself fbdev_helper_private or something like that.

With that bit of bikeshed applied to make it more over-the-top:

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

• */
  

• struct drm_fb_helper *fbdev;

};

#endif

2.14.2

On Sun, Oct 15, 2017 at 06:30:37PM +0200, Noralf Trønnes wrote:

This adds some simple init/fini helpers for drivers that don't need anything special in their fbdev emulation setup.

Signed-off-by: Noralf Trønnes noralf@tronnes.org

So I know the saying goes that any design problem in IT can be solved by adding another layer, but layers have costs. I still feel like this here just papers over some of the evolved design issues in our fbdev helper setup/teardown logic.

Do we _really_ need all of them, can't we fold at least some of this together?

E.g. the split between initial_config and single_add_all connectors seems a bit funny. Same with prepare and init. And maybe we should just push the default bpp handling down into the helpers too (no point reinventing that wheel everywhere)?

---

drivers/gpu/drm/drm_fb_helper.c | 163 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_fb_helper.h | 22 ++++++ 2 files changed, 185 insertions(+)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 954cdd48de92..166535da9a9b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -105,6 +105,127 @@ static DEFINE_MUTEX(kernel_fb_helper_lock);

• mmap page writes.

*/

+/**

• • drm_fb_helper_simple_init - Simple fbdev emulation setup
• • @dev: DRM device
• • @funcs: Pointer to structure of functions associated with this helper
• • @bpp: Bits per pixel value to use for the framebuffer configuration.

• •   @dev->mode_config.preferred_depth is used if this is zero.
    

• • @max_conn: Max connector count. @dev->mode_config.num_connector is used if

• •        this is zero.
    

• • Simple fbdev emulation initialization. This function allocates a
• • &drm_fb_helper structure attaches it to &drm_device->fbdev and calls:
• • drm_fb_helper_prepare(), drm_fb_helper_init(),
• • drm_fb_helper_single_add_all_connectors() and
• • drm_fb_helper_initial_config().
• • If fbdev emulation is disabled, this function does nothing. In that case
• • &drm_device->fbdev will be NULL. All drm_fb_helper entry function can handle
• • a NULL argument.
• • fbdev deferred I/O users should use the drm_fb_helper_defio_init() function
• • in their &drm_fb_helper_funcs.fb_probe callback.
• • Returns:
• • Zero on success or if fbdev emulation is disabled, negative error code on
• • failure.
• */

+int drm_fb_helper_simple_init(struct drm_device *dev,

• 	      const struct drm_fb_helper_funcs *funcs,
  

• 	      unsigned int bpp, int max_conn)
  

+{

• struct drm_fb_helper *fb_helper;
• int ret;
• if (!drm_fbdev_emulation)

• return 0;
  

• if (!bpp)

• bpp = dev->mode_config.preferred_depth;
  

• if (!max_conn)

• max_conn = dev->mode_config.num_connector;
  

• fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);
• if (!fb_helper)

• return -ENOMEM;
  

• drm_fb_helper_prepare(dev, fb_helper, funcs);
• ret = drm_fb_helper_init(dev, fb_helper, max_conn);
• if (ret < 0) {

• DRM_DEV_ERROR(dev->dev, "Failed to initialize fb helper.\n");
  

• goto err_drm_fb_helper_free;
  

• }
• ret = drm_fb_helper_single_add_all_connectors(fb_helper);
• if (ret < 0) {

• DRM_DEV_ERROR(dev->dev, "Failed to add connectors.\n");
  

• goto err_drm_fb_helper_fini;
  

• }
• ret = drm_fb_helper_initial_config(fb_helper, bpp);
• if (ret < 0) {

• DRM_DEV_ERROR(dev->dev, "Failed to set initial hw config.\n");
  

• goto err_drm_fb_helper_fini;
  

• }
• dev->fbdev = fb_helper;

This definitely needs to be in one of the above functions so that you don't force other drivers to either do this themselves or use this new helper to be able to benefit from the new convenience functions you've just added.

I'd set it in prepare, that's the first point where we can set it.

• return 0;

+err_drm_fb_helper_fini:

• drm_fb_helper_fini(fb_helper);

+err_drm_fb_helper_free:

• kfree(fb_helper);
• return ret;

+} +EXPORT_SYMBOL_GPL(drm_fb_helper_simple_init);

+/**

• • drm_fb_helper_simple_fini - Simple fbdev cleanup
• • @dev: DRM device
• • Simple fbdev emulation cleanup. This function unregisters fbdev if it is not
• • done, cleans up deferred IO if necessary, removes framebuffer, finalizes
• • @fb_helper and frees the structure.
• */

+void drm_fb_helper_simple_fini(struct drm_device *dev)

Similar here on the cleanup side, can't we simplify this a lot for everyone?

+{

• struct drm_fb_helper *fb_helper = dev->fbdev;
• struct fb_info *info;
• struct fb_ops *fbops;
• if (!fb_helper)

• return;
  

• dev->fbdev = NULL;
• info = fb_helper->fbdev;
• /* Make sure it hasn't been unregistered already */
• if (info && info->dev)

• drm_fb_helper_unregister_fbi(fb_helper);
  

• if (info && info->fbdefio) {

• fb_deferred_io_cleanup(info);
  

• kfree(info->fbdefio);
  

• fbops = info->fbops;
  

• }
• drm_fb_helper_fini(fb_helper);
• if (info && info->fbdefio)

• kfree(fbops);
  

• if (fb_helper->fb)

• drm_framebuffer_remove(fb_helper->fb);
  

• kfree(fb_helper);

+} +EXPORT_SYMBOL_GPL(drm_fb_helper_simple_fini);

#define drm_fb_helper_for_each_connector(fbh, i__) \ for (({ lockdep_assert_held(&(fbh)->lock); }), \ i__ = 0; i__ < (fbh)->connector_count; i__++) @@ -954,6 +1075,48 @@ void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper) } EXPORT_SYMBOL(drm_fb_helper_unlink_fbi);

+/**

• • drm_fb_helper_defio_init - fbdev deferred I/O initialization
• • @fb_helper: driver-allocated fbdev helper
• • This function allocates &fb_deferred_io, sets callback to
• • drm_fb_helper_deferred_io(), delay to 50ms and calls fb_deferred_io_init().
• • NOTE: A copy of &fb_ops is made and assigned to &info->fbops. This is done
• • because fb_deferred_io_cleanup() clears &fbops->fb_mmap and would thereby
• • affect other instances of that &fb_ops. This copy is freed in
• • drm_fb_helper_simple_fini().
• • Returns:
• • 0 on success or a negative error code on failure.
• */

+int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper) +{

• struct fb_info *info = fb_helper->fbdev;
• struct fb_deferred_io *fbdefio;
• struct fb_ops *fbops;
• fbdefio = kzalloc(sizeof(*fbdefio), GFP_KERNEL);
• fbops = kzalloc(sizeof(*fbops), GFP_KERNEL);
• if (!fbdefio || !fbops) {

• kfree(fbdefio);
  

• kfree(fbops);
  

• return -ENOMEM;
  

• }
• info->fbdefio = fbdefio;
• fbdefio->delay = msecs_to_jiffies(50);
• fbdefio->deferred_io = drm_fb_helper_deferred_io;
• *fbops = *info->fbops;
• info->fbops = fbops;
• fb_deferred_io_init(info);
• return 0;

+} +EXPORT_SYMBOL(drm_fb_helper_defio_init);

Probably good as a separate patch + using it in a bunch of drivers to show that it's the right kind of helper that's useful in a few places.

Cheers, Daniel

static void drm_fb_helper_dirty(struct fb_info *info, u32 x, u32 y, u32 width, u32 height) { diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 33fe95927742..6503f4c3e3ef 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -242,6 +242,10 @@ struct drm_fb_helper { .fb_ioctl = drm_fb_helper_ioctl

#ifdef CONFIG_DRM_FBDEV_EMULATION +int drm_fb_helper_simple_init(struct drm_device *dev,

• 	      const struct drm_fb_helper_funcs *funcs,
  

• 	      unsigned int bpp, int max_conn);
  

+void drm_fb_helper_simple_fini(struct drm_device *dev); void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, const struct drm_fb_helper_funcs *funcs); int drm_fb_helper_init(struct drm_device *dev, @@ -265,6 +269,7 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,

void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper);

+int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper); void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist);

@@ -311,6 +316,18 @@ int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_ int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector); #else +static inline int +drm_fb_helper_simple_init(struct drm_device *dev,

• 	  const struct drm_fb_helper_funcs *funcs,
  

• 	  unsigned int bpp, int max_conn)
  

+{

• return 0;

+}

+static inline void drm_fb_helper_simple_fini(struct drm_device *dev) +{ +}

static inline void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, const struct drm_fb_helper_funcs *funcs) @@ -393,6 +410,11 @@ static inline void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper) { }

+static inline int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper) +{

• return -ENODEV;

+}

static inline void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist) { -- 2.14.2

Den 17.10.2017 14.48, skrev Daniel Vetter:

On Sun, Oct 15, 2017 at 06:30:37PM +0200, Noralf Trønnes wrote:

...

This adds some simple init/fini helpers for drivers that don't need anything special in their fbdev emulation setup.

Signed-off-by: Noralf Trønnes noralf@tronnes.org

So I know the saying goes that any design problem in IT can be solved by adding another layer, but layers have costs. I still feel like this here just papers over some of the evolved design issues in our fbdev helper setup/teardown logic.

Do we _really_ need all of them, can't we fold at least some of this together?

E.g. the split between initial_config and single_add_all connectors seems a bit funny. Same with prepare and init. And maybe we should just push the default bpp handling down into the helpers too (no point reinventing that wheel everywhere)?

Ok, I think I'll bail out of this one, at least for now. It will be too much work and I need to focus on moving tinydrm away from the cma helper.

For those interested, here's a compilation of drm_fb_helper init/fini use in all drivers: https://gist.github.com/notro/d7fc2809736cdddb68a644b589a86ee1

I think I'll split out a patchset off of this one and do that first:

1. Add drm_device->drm_fb_helper_private    Set it in drm_fb_helper_init()    Clear it in drm_fb_helper_fini()

2. drm/fb-helper: Add .last_close and .output_poll_changed helpers

n. Convert drivers to use those helpers

Noralf.

...

---

drivers/gpu/drm/drm_fb_helper.c | 163 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_fb_helper.h | 22 ++++++ 2 files changed, 185 insertions(+)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 954cdd48de92..166535da9a9b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -105,6 +105,127 @@ static DEFINE_MUTEX(kernel_fb_helper_lock);

• mmap page writes.

*/

+/**

• • drm_fb_helper_simple_init - Simple fbdev emulation setup
• • @dev: DRM device
• • @funcs: Pointer to structure of functions associated with this helper
• • @bpp: Bits per pixel value to use for the framebuffer configuration.

• •   @dev->mode_config.preferred_depth is used if this is zero.
    

• • @max_conn: Max connector count. @dev->mode_config.num_connector is used if

• •        this is zero.
    

• • Simple fbdev emulation initialization. This function allocates a
• • &drm_fb_helper structure attaches it to &drm_device->fbdev and calls:
• • drm_fb_helper_prepare(), drm_fb_helper_init(),
• • drm_fb_helper_single_add_all_connectors() and
• • drm_fb_helper_initial_config().
• • If fbdev emulation is disabled, this function does nothing. In that case
• • &drm_device->fbdev will be NULL. All drm_fb_helper entry function can handle
• • a NULL argument.
• • fbdev deferred I/O users should use the drm_fb_helper_defio_init() function
• • in their &drm_fb_helper_funcs.fb_probe callback.
• • Returns:
• • Zero on success or if fbdev emulation is disabled, negative error code on
• • failure.
• */

+int drm_fb_helper_simple_init(struct drm_device *dev,

• 	      const struct drm_fb_helper_funcs *funcs,
  

• 	      unsigned int bpp, int max_conn)
  

+{

• struct drm_fb_helper *fb_helper;
• int ret;
• if (!drm_fbdev_emulation)

• return 0;
  

• if (!bpp)

• bpp = dev->mode_config.preferred_depth;
  

• if (!max_conn)

• max_conn = dev->mode_config.num_connector;
  

• fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);
• if (!fb_helper)

• return -ENOMEM;
  

• drm_fb_helper_prepare(dev, fb_helper, funcs);
• ret = drm_fb_helper_init(dev, fb_helper, max_conn);
• if (ret < 0) {

• DRM_DEV_ERROR(dev->dev, "Failed to initialize fb helper.\n");
  

• goto err_drm_fb_helper_free;
  

• }
• ret = drm_fb_helper_single_add_all_connectors(fb_helper);
• if (ret < 0) {

• DRM_DEV_ERROR(dev->dev, "Failed to add connectors.\n");
  

• goto err_drm_fb_helper_fini;
  

• }
• ret = drm_fb_helper_initial_config(fb_helper, bpp);
• if (ret < 0) {

• DRM_DEV_ERROR(dev->dev, "Failed to set initial hw config.\n");
  

• goto err_drm_fb_helper_fini;
  

• }
• dev->fbdev = fb_helper;

This definitely needs to be in one of the above functions so that you don't force other drivers to either do this themselves or use this new helper to be able to benefit from the new convenience functions you've just added.

I'd set it in prepare, that's the first point where we can set it.

...

• return 0;

+err_drm_fb_helper_fini:

• drm_fb_helper_fini(fb_helper);

+err_drm_fb_helper_free:

• kfree(fb_helper);
• return ret;

+} +EXPORT_SYMBOL_GPL(drm_fb_helper_simple_init);

+/**

• • drm_fb_helper_simple_fini - Simple fbdev cleanup
• • @dev: DRM device
• • Simple fbdev emulation cleanup. This function unregisters fbdev if it is not
• • done, cleans up deferred IO if necessary, removes framebuffer, finalizes
• • @fb_helper and frees the structure.
• */

+void drm_fb_helper_simple_fini(struct drm_device *dev)

Similar here on the cleanup side, can't we simplify this a lot for everyone?

...

+{

• struct drm_fb_helper *fb_helper = dev->fbdev;
• struct fb_info *info;
• struct fb_ops *fbops;
• if (!fb_helper)

• return;
  

• dev->fbdev = NULL;
• info = fb_helper->fbdev;
• /* Make sure it hasn't been unregistered already */
• if (info && info->dev)

• drm_fb_helper_unregister_fbi(fb_helper);
  

• if (info && info->fbdefio) {

• fb_deferred_io_cleanup(info);
  

• kfree(info->fbdefio);
  

• fbops = info->fbops;
  

• }
• drm_fb_helper_fini(fb_helper);
• if (info && info->fbdefio)

• kfree(fbops);
  

• if (fb_helper->fb)

• drm_framebuffer_remove(fb_helper->fb);
  

• kfree(fb_helper);

+} +EXPORT_SYMBOL_GPL(drm_fb_helper_simple_fini);

• #define drm_fb_helper_for_each_connector(fbh, i__) \ for (({ lockdep_assert_held(&(fbh)->lock); }), \ i__ = 0; i__ < (fbh)->connector_count; i__++)

@@ -954,6 +1075,48 @@ void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper) } EXPORT_SYMBOL(drm_fb_helper_unlink_fbi);

+/**

• • drm_fb_helper_defio_init - fbdev deferred I/O initialization
• • @fb_helper: driver-allocated fbdev helper
• • This function allocates &fb_deferred_io, sets callback to
• • drm_fb_helper_deferred_io(), delay to 50ms and calls fb_deferred_io_init().
• • NOTE: A copy of &fb_ops is made and assigned to &info->fbops. This is done
• • because fb_deferred_io_cleanup() clears &fbops->fb_mmap and would thereby
• • affect other instances of that &fb_ops. This copy is freed in
• • drm_fb_helper_simple_fini().
• • Returns:
• • 0 on success or a negative error code on failure.
• */

+int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper) +{

• struct fb_info *info = fb_helper->fbdev;
• struct fb_deferred_io *fbdefio;
• struct fb_ops *fbops;
• fbdefio = kzalloc(sizeof(*fbdefio), GFP_KERNEL);
• fbops = kzalloc(sizeof(*fbops), GFP_KERNEL);
• if (!fbdefio || !fbops) {

• kfree(fbdefio);
  

• kfree(fbops);
  

• return -ENOMEM;
  

• }
• info->fbdefio = fbdefio;
• fbdefio->delay = msecs_to_jiffies(50);
• fbdefio->deferred_io = drm_fb_helper_deferred_io;
• *fbops = *info->fbops;
• info->fbops = fbops;
• fb_deferred_io_init(info);
• return 0;

+} +EXPORT_SYMBOL(drm_fb_helper_defio_init);

Probably good as a separate patch + using it in a bunch of drivers to show that it's the right kind of helper that's useful in a few places.

Cheers, Daniel

...

• static void drm_fb_helper_dirty(struct fb_info *info, u32 x, u32 y, u32 width, u32 height) {

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 33fe95927742..6503f4c3e3ef 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -242,6 +242,10 @@ struct drm_fb_helper { .fb_ioctl = drm_fb_helper_ioctl

#ifdef CONFIG_DRM_FBDEV_EMULATION +int drm_fb_helper_simple_init(struct drm_device *dev,

• 	      const struct drm_fb_helper_funcs *funcs,
  

• 	      unsigned int bpp, int max_conn);
  

+void drm_fb_helper_simple_fini(struct drm_device *dev); void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, const struct drm_fb_helper_funcs *funcs); int drm_fb_helper_init(struct drm_device *dev, @@ -265,6 +269,7 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,

void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper);

+int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper); void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist);

@@ -311,6 +316,18 @@ int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_ int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector); #else +static inline int +drm_fb_helper_simple_init(struct drm_device *dev,

• 	  const struct drm_fb_helper_funcs *funcs,
  

• 	  unsigned int bpp, int max_conn)
  

+{

• return 0;

+}

+static inline void drm_fb_helper_simple_fini(struct drm_device *dev) +{ +}

• static inline void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, const struct drm_fb_helper_funcs *funcs)

@@ -393,6 +410,11 @@ static inline void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper) { }

+static inline int drm_fb_helper_defio_init(struct drm_fb_helper *fb_helper) +{

• return -ENODEV;

+}

• static inline void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist) {

-- 2.14.2

On Sun, Oct 15, 2017 at 06:30:38PM +0200, Noralf Trønnes wrote:

This adds helpers for the drm_driver->last_close and the drm_mode_config_funcs->output_poll_changed callbacks.

Signed-off-by: Noralf Trønnes noralf@tronnes.org

Definitely want a todo entry to roll these out to all drivers, but maybe do a separate follow-up patch to add them all in one go ...

On this:

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

---

drivers/gpu/drm/drm_fb_helper.c | 32 ++++++++++++++++++++++++++++++++ include/drm/drm_fb_helper.h | 10 ++++++++++ 2 files changed, 42 insertions(+)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 166535da9a9b..897be5304135 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -226,6 +226,38 @@ void drm_fb_helper_simple_fini(struct drm_device *dev) } EXPORT_SYMBOL_GPL(drm_fb_helper_simple_fini);

+/**

• • drm_fb_helper_lastclose - DRM driver lastclose helper for fbdev emulation
• • @dev: DRM device
• • This function can be used as the &drm_driver->lastclose callback for drivers
• • that only need to call drm_fb_helper_restore_fbdev_mode_unlocked().
• • Note: &drm_device->fbdev needs to be set.
• */

+void drm_fb_helper_lastclose(struct drm_device *dev) +{

• drm_fb_helper_restore_fbdev_mode_unlocked(dev->fbdev);

+} +EXPORT_SYMBOL(drm_fb_helper_lastclose);

+/**

• • drm_fb_helper_output_poll_changed - DRM mode config .output_poll_changed

• •                                 helper for fbdev emulation
    

• • @dev: DRM device
• • This function can be used as the
• • &drm_mode_config_funcs.output_poll_changed callback for drivers that only
• • need to call drm_fb_helper_hotplug_event().
• • Note: &drm_device->fbdev needs to be set.
• */

+void drm_fb_helper_output_poll_changed(struct drm_device *dev) +{

• drm_fb_helper_hotplug_event(dev->fbdev);

+} +EXPORT_SYMBOL(drm_fb_helper_output_poll_changed);

#define drm_fb_helper_for_each_connector(fbh, i__) \ for (({ lockdep_assert_held(&(fbh)->lock); }), \ i__ = 0; i__ < (fbh)->connector_count; i__++) diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 6503f4c3e3ef..2558425e29e5 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -246,6 +246,8 @@ int drm_fb_helper_simple_init(struct drm_device *dev, const struct drm_fb_helper_funcs *funcs, unsigned int bpp, int max_conn); void drm_fb_helper_simple_fini(struct drm_device *dev); +void drm_fb_helper_lastclose(struct drm_device *dev); +void drm_fb_helper_output_poll_changed(struct drm_device *dev); void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, const struct drm_fb_helper_funcs *funcs); int drm_fb_helper_init(struct drm_device *dev, @@ -328,6 +330,14 @@ static inline void drm_fb_helper_simple_fini(struct drm_device *dev) { }

+static inline void drm_fb_helper_lastclose(struct drm_device *dev) +{ +}

+static inline void drm_fb_helper_output_poll_changed(struct drm_device *dev) +{ +}

static inline void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper, const struct drm_fb_helper_funcs *funcs) -- 2.14.2

On Sun, Oct 15, 2017 at 06:30:39PM +0200, Noralf Trønnes wrote:

Add drm_gem_fb_debugfs_show() function to provide a debugfs representation of the framebuffer and GEM object(s).

Signed-off-by: Noralf Trønnes noralf@tronnes.org

drivers/gpu/drm/drm_gem_framebuffer_helper.c | 45 ++++++++++++++++++++++++++++ include/drm/drm_gem_framebuffer_helper.h | 6 ++++ 2 files changed, 51 insertions(+)

diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c index aa8cb9bfa499..18fdcc29427a 100644 --- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c +++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c @@ -265,6 +265,51 @@ int drm_gem_fb_prepare_fb(struct drm_plane *plane, } EXPORT_SYMBOL_GPL(drm_gem_fb_prepare_fb);

+#ifdef CONFIG_DEBUG_FS +static void drm_gem_fb_describe(struct drm_framebuffer *fb, struct seq_file *m) +{

• struct drm_gem_object *obj;
• unsigned int i;
• seq_printf(m, "[FB:%d] %dx%d@%4.4s\n", fb->base.id, fb->width,

•    fb->height, (char *)&fb->format->format);
  

• for (i = 0; i < fb->format->num_planes; i++) {

• obj = fb->obj[i];
  

• seq_printf(m, "\t%u: offset=%d pitch=%d, GEM: name=%d",
  

• 	   i, fb->offsets[i], fb->pitches[i], obj->name);
  

• seq_printf(m, " refcount=%d start=%08lx size=%zu%s\n",
  

• 	   kref_read(&obj->refcount),
  

• 	   drm_vma_node_start(&obj->vma_node), obj->size,
  

• 	   obj->import_attach ? " (imported)" : "");
  

• }

+}

Given that gem is the defacto standard and that we can easily skip the gem specific stuff on non-gem drivers by checking the pointer for NULL I think we should add the framebuffer list by default. Like we already do for e.g. atomic state, see drm_atomic_debugfs_init. Probably better to split it up into a generic fb describe, which calls into a gem_obj describe, with maybe in the future the option to also call into driver callbacks to dump more driver state.

There's probably more stuff that we should list by default in debugfs, like blob properties and similar things. -Daniel

+/**

• • drm_gem_fb_debugfs_show() - Helper to list GEM backed framebuffer objects

• •                         in debugfs.
    

• • @m: Output file
• • @arg: Private data for the callback
• • This function gives a debugfs representation of the framebuffers with their
• • backing GEM objects. See drm_debugfs_create_files() for more info.
• */

+int drm_gem_fb_debugfs_show(struct seq_file *m, void *arg) +{

• struct drm_info_node *node = m->private;
• struct drm_device *dev = node->minor->dev;
• struct drm_framebuffer *fb;
• mutex_lock(&dev->mode_config.fb_lock);
• drm_for_each_fb(fb, dev)

• drm_gem_fb_describe(fb, m);
  

• mutex_unlock(&dev->mode_config.fb_lock);
• return 0;

+} +EXPORT_SYMBOL_GPL(drm_gem_fb_debugfs_show); +#endif

/**

• drm_gem_fbdev_fb_create - Create a GEM backed &drm_framebuffer for fbdev

•                       emulation
  

diff --git a/include/drm/drm_gem_framebuffer_helper.h b/include/drm/drm_gem_framebuffer_helper.h index 5ca7cdc3f527..1bb73d961aba 100644 --- a/include/drm/drm_gem_framebuffer_helper.h +++ b/include/drm/drm_gem_framebuffer_helper.h @@ -28,6 +28,12 @@ drm_gem_fb_create(struct drm_device *dev, struct drm_file *file, int drm_gem_fb_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state);

+#ifdef CONFIG_DEBUG_FS +struct seq_file;

+int drm_gem_fb_debugfs_show(struct seq_file *m, void *arg); +#endif

struct drm_framebuffer * drm_gem_fbdev_fb_create(struct drm_device *dev, struct drm_fb_helper_surface_size *sizes, -- 2.14.2

On Wed, Oct 18, 2017 at 09:44:22PM +0200, Noralf Trønnes wrote:

Den 17.10.2017 14.56, skrev Daniel Vetter:

...

On Sun, Oct 15, 2017 at 06:30:39PM +0200, Noralf Trønnes wrote:

...

Add drm_gem_fb_debugfs_show() function to provide a debugfs representation of the framebuffer and GEM object(s).

Signed-off-by: Noralf Trønnes noralf@tronnes.org

drivers/gpu/drm/drm_gem_framebuffer_helper.c | 45 ++++++++++++++++++++++++++++ include/drm/drm_gem_framebuffer_helper.h | 6 ++++ 2 files changed, 51 insertions(+)

diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c index aa8cb9bfa499..18fdcc29427a 100644 --- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c +++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c @@ -265,6 +265,51 @@ int drm_gem_fb_prepare_fb(struct drm_plane *plane, } EXPORT_SYMBOL_GPL(drm_gem_fb_prepare_fb); +#ifdef CONFIG_DEBUG_FS +static void drm_gem_fb_describe(struct drm_framebuffer *fb, struct seq_file *m) +{

• struct drm_gem_object *obj;
• unsigned int i;
• seq_printf(m, "[FB:%d] %dx%d@%4.4s\n", fb->base.id, fb->width,

•    fb->height, (char *)&fb->format->format);
  

• for (i = 0; i < fb->format->num_planes; i++) {

• obj = fb->obj[i];
  

• seq_printf(m, "\t%u: offset=%d pitch=%d, GEM: name=%d",
  

• 	   i, fb->offsets[i], fb->pitches[i], obj->name);
  

• seq_printf(m, " refcount=%d start=%08lx size=%zu%s\n",
  

• 	   kref_read(&obj->refcount),
  

• 	   drm_vma_node_start(&obj->vma_node), obj->size,
  

• 	   obj->import_attach ? " (imported)" : "");
  

• }

+}

Given that gem is the defacto standard and that we can easily skip the gem specific stuff on non-gem drivers by checking the pointer for NULL I think we should add the framebuffer list by default. Like we already do for e.g. atomic state, see drm_atomic_debugfs_init. Probably better to split it up into a generic fb describe, which calls into a gem_obj describe, with maybe in the future the option to also call into driver callbacks to dump more driver state.

How about this:

lgtm. Whoever wants/needs to dump driver private stuff can then sprinkle the callbacks over this. -Daniel

drivers/gpu/drm/drm_gem.c:

#ifdef CONFIG_DEBUG_FS void drm_gem_print(const struct drm_gem_object *obj, struct drm_printer *p) {     drm_printf(p, "name=%d refcount=%d start=%08lx size=%zu%s\n",            obj->name, kref_read(&obj->refcount),            drm_vma_node_start(&obj->vma_node), obj->size,            obj->import_attach ? " (imported)" : ""); } #endif

drivers/gpu/drm/drm_framebuffer.c:

#ifdef CONFIG_DEBUG_FS static void drm_framebuffer_print(const struct drm_framebuffer *fb,                   struct drm_printer *p) {     unsigned int i;

drm_printf(p, "[FB:%d] %dx%d@%4.4s refcount=%d\n", fb->base.id,            fb->width, fb->height, (char *)&fb->format->format,            drm_framebuffer_read_refcount(fb));

for (i = 0; i < fb->format->num_planes; i++) {         drm_printf(p, "\t%u: offset=%d pitch=%d",                i, fb->offsets[i], fb->pitches[i]);         if (fb->obj[i]) {             drm_printf(p, " GEM: ");             drm_gem_print(fb->obj[i], p);         } else {             drm_printf(p, "\n");         }     } }

static int drm_framebuffer_info(struct seq_file *m, void *data) {     struct drm_info_node *node = m->private;     struct drm_device *dev = node->minor->dev;     struct drm_printer p = drm_seq_file_printer(m);     struct drm_framebuffer *fb;

mutex_lock(&dev->mode_config.fb_lock);     drm_for_each_fb(fb, dev)         drm_framebuffer_print(fb, &p);     mutex_unlock(&dev->mode_config.fb_lock);

return 0; }

static const struct drm_info_list drm_framebuffer_debugfs_list[] = {     { "framebuffer", drm_framebuffer_info, 0 }, };

int drm_framebuffer_debugfs_init(struct drm_minor *minor) {     return drm_debugfs_create_files(drm_framebuffer_debugfs_list,                 ARRAY_SIZE(drm_framebuffer_debugfs_list),                 minor->debugfs_root, minor); } #endif

drivers/gpu/drm/drm_debugfs.c:

int drm_debugfs_init(struct drm_minor *minor, int minor_id,              struct dentry *root) { ...     ret = drm_framebuffer_debugfs_init(minor);     if (ret) {         DRM_ERROR("Failed to create framebuffer debugfs files\n");         return ret;     } ... }

Available names for the debugfs file:

$ grep -r ""fbs"" drivers/gpu/drm

$ grep -r ""fb"" drivers/gpu/drm drivers/gpu/drm/tilcdc/tilcdc_drv.c:            { "fb", drm_fb_cma_debugfs_show, 0 }, drivers/gpu/drm/omapdrm/omap_debugfs.c: {"fb", fb_show, 0}, drivers/gpu/drm/tinydrm/mipi-dbi.c:     { "fb", drm_fb_cma_debugfs_show, 0 }, drivers/gpu/drm/arm/hdlcd_drv.c:        { "fb", drm_fb_cma_debugfs_show, 0 }, drivers/gpu/drm/msm/msm_debugfs.c:              { "fb", show_locked, 0, msm_fb_show }, drivers/gpu/drm/arc/arcpgu_drv.c:       { "fb", drm_fb_cma_debugfs_show, 0 },

$ grep -r ""framebuffer"" drivers/gpu/drm

$ grep -r ""framebuffers"" drivers/gpu/drm drivers/gpu/drm/tegra/drm.c:    { "framebuffers", tegra_debugfs_framebuffers, 0 },

Noralf.

...

There's probably more stuff that we should list by default in debugfs, like blob properties and similar things. -Daniel

...

+/**

• • drm_gem_fb_debugfs_show() - Helper to list GEM backed framebuffer objects

• •                         in debugfs.
    

• • @m: Output file
• • @arg: Private data for the callback
• • This function gives a debugfs representation of the framebuffers with their
• • backing GEM objects. See drm_debugfs_create_files() for more info.
• */

+int drm_gem_fb_debugfs_show(struct seq_file *m, void *arg) +{

• struct drm_info_node *node = m->private;
• struct drm_device *dev = node->minor->dev;
• struct drm_framebuffer *fb;
• mutex_lock(&dev->mode_config.fb_lock);
• drm_for_each_fb(fb, dev)

• drm_gem_fb_describe(fb, m);
  

• mutex_unlock(&dev->mode_config.fb_lock);
• return 0;

+} +EXPORT_SYMBOL_GPL(drm_gem_fb_debugfs_show); +#endif

• /**
  • drm_gem_fbdev_fb_create - Create a GEM backed &drm_framebuffer for fbdev

  •                       emulation
    

diff --git a/include/drm/drm_gem_framebuffer_helper.h b/include/drm/drm_gem_framebuffer_helper.h index 5ca7cdc3f527..1bb73d961aba 100644 --- a/include/drm/drm_gem_framebuffer_helper.h +++ b/include/drm/drm_gem_framebuffer_helper.h @@ -28,6 +28,12 @@ drm_gem_fb_create(struct drm_device *dev, struct drm_file *file, int drm_gem_fb_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state); +#ifdef CONFIG_DEBUG_FS +struct seq_file;

+int drm_gem_fb_debugfs_show(struct seq_file *m, void *arg); +#endif

• struct drm_framebuffer * drm_gem_fbdev_fb_create(struct drm_device *dev, struct drm_fb_helper_surface_size *sizes,

-- 2.14.2

On Sun, Oct 15, 2017 at 06:30:40PM +0200, Noralf Trønnes wrote:

Add vmalloc buffer object helper that can be useful for modesetting drivers, particularly the framebuffer flushing kind.

Signed-off-by: Noralf Trønnes noralf@tronnes.org

Why can't we extend the shmem stuff to provide a simple vmalloc helper? Doing a new flavour of gem for every special use-case seems like not a good idea ...

This could then also be used by stuff like udl, with fewer changes. -Daniel

---

Documentation/gpu/drm-kms-helpers.rst | 12 ++ drivers/gpu/drm/Kconfig | 7 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_vmalloc_bo_helper.c | 305 ++++++++++++++++++++++++++++++++ include/drm/drm_vmalloc_bo_helper.h | 88 +++++++++ 5 files changed, 413 insertions(+) create mode 100644 drivers/gpu/drm/drm_vmalloc_bo_helper.c create mode 100644 include/drm/drm_vmalloc_bo_helper.h

diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst index 13dd237418cc..fd1ca10f6611 100644 --- a/Documentation/gpu/drm-kms-helpers.rst +++ b/Documentation/gpu/drm-kms-helpers.rst @@ -305,3 +305,15 @@ Framebuffer GEM Helper Reference

.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c :export:

+vmalloc buffer object helper +============================

+.. kernel-doc:: drivers/gpu/drm/drm_vmalloc_bo_helper.c

• :doc: overview

+.. kernel-doc:: include/drm/drm_vmalloc_bo_helper.h

• :internal:

+.. kernel-doc:: drivers/gpu/drm/drm_vmalloc_bo_helper.c

• :export:

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 4d9f21831741..5d580440a259 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -145,6 +145,13 @@ config DRM_KMS_CMA_HELPER help Choose this if you need the KMS CMA helper functions

+config DRM_VMALLOC_BO_HELPER

• bool
• depends on DRM
• select DRM_KMS_HELPER
• help

•  Choose this if you need the vmalloc buffer object helper functions
  

config DRM_VM bool depends on DRM && MMU diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index a3fdc5a68dff..ed3eafa97a69 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -39,6 +39,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \ drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o +drm_kms_helper-$(CONFIG_DRM_VMALLOC_BO_HELPER) += drm_vmalloc_bo_helper.o drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o

obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o diff --git a/drivers/gpu/drm/drm_vmalloc_bo_helper.c b/drivers/gpu/drm/drm_vmalloc_bo_helper.c new file mode 100644 index 000000000000..4015b9d1d671 --- /dev/null +++ b/drivers/gpu/drm/drm_vmalloc_bo_helper.c @@ -0,0 +1,305 @@ +/*

• • DRM vmalloc buffer object helper functions
• • Copyright (C) 2017 Noralf Trønnes
• • This program is free software; you can redistribute it and/or modify
• • it under the terms of the GNU General Public License as published by
• • the Free Software Foundation; either version 2 of the License, or
• • (at your option) any later version.
• */

+#include <linux/dma-buf.h> +#include <linux/export.h> +#include <linux/slab.h> +#include <linux/vmalloc.h>

+#include <drm/drmP.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_vmalloc_bo_helper.h>

+/**

• • DOC: overview
• • This helper provides a simple GEM based buffer object with buffers allocated
• • using vmalloc(). This is useful for modesetting drivers that do framebuffer
• • flushing. It supports dumb buffers and PRIME import which can be setup using
• • the DEFINE_DRM_VMALLOC_BO_FOPS() and DRM_VMALLOC_BO_DRIVER_OPS() macros.
• • fbdev emulation can be setup using the drm_vmalloc_bo_fbdev_probe() function.
• */

+static struct drm_vmalloc_bo * +drm_vmalloc_bo_create(struct drm_device *dev, size_t size, bool backing) +{

• struct drm_vmalloc_bo *bo;
• int ret;
• size = PAGE_ALIGN(size);
• bo = kzalloc(sizeof(*bo), GFP_KERNEL);
• if (!bo)

• return ERR_PTR(-ENOMEM);
  

• if (backing) {

• bo->vaddr = vmalloc_user(size);
  

• if (!bo->vaddr) {
  

• 	ret = -ENOMEM;
  

• 	goto error_free;
  

• }
  

• }
• drm_gem_private_object_init(dev, &bo->base, size);
• return bo;

+error_free:

• kfree(bo);
• return ERR_PTR(ret);

+}

+/**

• • drm_vmalloc_bo_free_object() - Free resources associated with a vmalloc BO

• •                            object
    

• • @obj: GEM object to free
• • This function frees the backing memory of the vmalloc BO object, cleans up
• • the GEM object state and frees the memory used to store the object itself.
• • Drivers using the vmalloc BO helpers should set this as their
• • &drm_driver.gem_free_object callback.
• */

+void drm_vmalloc_bo_free_object(struct drm_gem_object *obj) +{

• struct drm_vmalloc_bo *bo = to_drm_vmalloc_bo(obj);
• if (obj->import_attach)

• dma_buf_vunmap(obj->import_attach->dmabuf, bo->vaddr);
  

• else

• vfree(bo->vaddr);
  

• drm_gem_object_release(obj);
• kfree(bo);

+} +EXPORT_SYMBOL(drm_vmalloc_bo_free_object);

+/**

• • drm_vmalloc_bo_dumb_create() - Create a dumb vmalloc BO
• • @file: DRM file structure to create the dumb buffer for
• • @dev: DRM device
• • @args: IOCTL data
• • This function computes the pitch of the dumb buffer and rounds it up to an
• • integer number of bytes per pixel. Drivers for hardware that doesn't have
• • any additional restrictions on the pitch can directly use this function as
• • their &drm_driver.dumb_create callback.
• • For hardware with additional restrictions, drivers can adjust the fields
• • set up by userspace before calling into this function. Also
• • &drm_mode_create_dumb.pitch and &drm_mode_create_dumb.size can be set.
• • Returns:
• • Zero on success or a negative error code on failure.
• */

+int drm_vmalloc_bo_dumb_create(struct drm_file *file, struct drm_device *dev,

• 	       struct drm_mode_create_dumb *args)
  

+{

• struct drm_vmalloc_bo *bo;
• int ret;
• if (!args->pitch)

• args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
  

• else

• args->pitch = max(args->pitch,
  

• 		  DIV_ROUND_UP(args->width * args->bpp, 8));
  

• if (!args->size)

• args->size = args->pitch * args->height;
  

• else

• args->size = max_t(typeof(args->size), args->size,
  

• 		   args->pitch * args->height);
  

• bo = drm_vmalloc_bo_create(dev, args->size, true);
• if (IS_ERR(bo))

• return PTR_ERR(bo);
  

• ret = drm_gem_handle_create(file, &bo->base, &args->handle);
• /* drop reference from allocate - handle holds it now. */
• drm_gem_object_put_unlocked(&bo->base);
• return ret;

+} +EXPORT_SYMBOL(drm_vmalloc_bo_dumb_create);

+const struct vm_operations_struct drm_vmalloc_bo_vm_ops = {

• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

+}; +EXPORT_SYMBOL_GPL(drm_vmalloc_bo_vm_ops);

+/**

• • drm_vmalloc_bo_mmap() - Memory-map a vmalloc BO
• • @filp: File object
• • @vma: VMA for the area to be mapped
• • This function implements an augmented version of the GEM DRM file mmap
• • operation for vmalloc buffer objects. Drivers should use this function as
• • their ->mmap handler in the DRM device file's file_operations structure.
• • Instead of directly referencing this function, drivers should use the
• • DEFINE_DRM_VMALLOC_BO_FOPS() macro.
• • Returns:
• • Zero on success or a negative error code on failure.
• */

+int drm_vmalloc_bo_mmap(struct file *filp, struct vm_area_struct *vma) +{

• struct drm_vmalloc_bo *bo;
• int ret;
• ret = drm_gem_mmap(filp, vma);
• if (ret)

• return ret;
  

• /* Set by drm_gem_mmap() */
• vma->vm_flags &= ~VM_IO;
• vma->vm_flags &= ~VM_PFNMAP;
• bo = to_drm_vmalloc_bo(vma->vm_private_data);
• return remap_vmalloc_range(vma, bo->vaddr, 0);

+} +EXPORT_SYMBOL(drm_vmalloc_bo_mmap);

+/**

• • drm_vmalloc_bo_prime_import_sg_table() - Produce a vmalloc BO from a dma-buf
• • @dev: DRM device to import into
• • @attach: dmabuf attachment
• • @sgt: Scatter/gather table of pinned pages
• • This function creates a vmalloc buffer object using the virtual address on
• • the dma-buf exported by another driver. Drivers using the vmalloc BO helpers
• • should set this as their &drm_driver.gem_prime_import_sg_table callback.
• • Returns:
• • A pointer to a newly created GEM object or an ERR_PTR-encoded negative
• • error code on failure.
• */

+struct drm_gem_object * +drm_vmalloc_bo_prime_import_sg_table(struct drm_device *dev,

• 		     struct dma_buf_attachment *attach,
  

• 		     struct sg_table *sgt)
  

+{

• struct drm_vmalloc_bo *bo;
• void *vaddr;
• vaddr = dma_buf_vmap(attach->dmabuf);
• if (!vaddr) {

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

• return ERR_PTR(-ENOMEM);
  

• }
• bo = drm_vmalloc_bo_create(dev, attach->dmabuf->size, false);
• if (IS_ERR(bo)) {

• dma_buf_vunmap(attach->dmabuf, vaddr);
  

• return ERR_CAST(bo);
  

• }
• bo->vaddr = vaddr;
• DRM_DEBUG_PRIME("size = %zu\n", attach->dmabuf->size);
• return &bo->base;

+} +EXPORT_SYMBOL(drm_vmalloc_bo_prime_import_sg_table);

+static struct fb_ops drm_vmalloc_bo_fbdev_ops = {

• .owner = THIS_MODULE,
• DRM_FB_HELPER_DEFAULT_OPS,
• .fb_read = drm_fb_helper_sys_read,
• .fb_write = drm_fb_helper_sys_write,
• .fb_fillrect = drm_fb_helper_sys_fillrect,
• .fb_copyarea = drm_fb_helper_sys_copyarea,
• .fb_imageblit = drm_fb_helper_sys_imageblit,

+};

+/**

• • drm_vmalloc_bo_fbdev_probe - fbdev emulation .fb_probe helper
• • @fb_helper: fbdev emulation helper structure
• • @sizes: Describes fbdev size and scanout surface size
• • @fb_funcs: DRM framebuffer functions
• • This function can be used in the &drm_fb_helper_funcs.fb_probe callback to
• • setup fbdev emulation. If @fb_funcs->dirty is set, fbdev deferred I/O is
• • initialized. drm_fb_helper_simple_init() can be used to initialize the fbdev
• • emulation.
• • Returns:
• • Zero on success, negative error code on failure.
• */

+int drm_vmalloc_bo_fbdev_probe(struct drm_fb_helper *fb_helper,

• 	       struct drm_fb_helper_surface_size *sizes,
  

• 	       const struct drm_framebuffer_funcs *fb_funcs)
  

+{

• struct drm_device *dev = fb_helper->dev;
• struct drm_framebuffer *fb;
• struct drm_vmalloc_bo *bo;
• struct fb_info *fbi;
• size_t size;
• int ret;
• DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d)\n",

•       sizes->surface_width, sizes->surface_height,
  

•       sizes->surface_bpp);
  

• size = sizes->surface_width * sizes->surface_height *

•       DIV_ROUND_UP(sizes->surface_bpp, 8);
  

• bo = drm_vmalloc_bo_create(dev, size, true);
• if (IS_ERR(bo))

• return -ENOMEM;
  

• fb = drm_gem_fbdev_fb_create(dev, sizes, 0, &bo->base, fb_funcs);
• if (IS_ERR(fb)) {

• dev_err(dev->dev, "Failed to allocate DRM framebuffer.\n");
  

• ret = PTR_ERR(fb);
  

• goto err_bo_free;
  

• }
• fb_helper->fb = fb;
• fbi = drm_fb_helper_alloc_fbi(fb_helper);
• if (IS_ERR(fbi)) {

• ret = PTR_ERR(fbi);
  

• goto err_fb_free;
  

• }
• fbi->par = fb_helper;
• fbi->flags = FBINFO_VIRTFB;
• fbi->fbops = &drm_vmalloc_bo_fbdev_ops;
• drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth);
• drm_fb_helper_fill_var(fbi, fb_helper, sizes->fb_width, sizes->fb_height);
• fbi->screen_base = bo->vaddr;
• fbi->screen_size = size;
• fbi->fix.smem_len = size;
• if (fb_funcs->dirty) {

• ret = drm_fb_helper_defio_init(fb_helper);
  

• if (ret)
  

• 	goto err_fb_info_destroy;
  

• }
• return 0;

+err_fb_info_destroy:

• drm_fb_helper_fini(fb_helper);

+err_fb_free:

• drm_framebuffer_remove(fb);

+err_bo_free:

• drm_gem_object_put_unlocked(&bo->base);
• return ret;

+} +EXPORT_SYMBOL(drm_vmalloc_bo_fbdev_probe); diff --git a/include/drm/drm_vmalloc_bo_helper.h b/include/drm/drm_vmalloc_bo_helper.h new file mode 100644 index 000000000000..0df3d15e2e4a --- /dev/null +++ b/include/drm/drm_vmalloc_bo_helper.h @@ -0,0 +1,88 @@ +#ifndef __DRM_VMALLOC_BO_HELPER_H__ +#define __DRM_VMALLOC_BO_HELPER_H__

+#include <drm/drmP.h> +#include <drm/drm_gem.h>

+struct drm_fb_helper_surface_size;

+/**

• • struct drm_vmalloc_bo - vmalloc buffer object
• */

+struct drm_vmalloc_bo {

• /**

• * @base:
  

• *
  

• * Base GEM object.
  

• */
  

• struct drm_gem_object base;
• /**

• * @vaddr:
  

• *
  

• * Kernel virtual address of the buffer.
  

• */
  

• void *vaddr;

+};

+static inline struct drm_vmalloc_bo * +to_drm_vmalloc_bo(struct drm_gem_object *obj) +{

• return container_of(obj, struct drm_vmalloc_bo, base);

+}

+static inline void *drm_vmalloc_bo_fb_vaddr(struct drm_framebuffer *fb) +{

• return to_drm_vmalloc_bo(fb->obj[0])->vaddr;

+}

+void drm_vmalloc_bo_free_object(struct drm_gem_object *obj); +int drm_vmalloc_bo_dumb_create(struct drm_file *file, struct drm_device *dev,

• 	       struct drm_mode_create_dumb *args);
  

+int drm_vmalloc_bo_mmap(struct file *filp, struct vm_area_struct *vma); +struct drm_gem_object * +drm_vmalloc_bo_prime_import_sg_table(struct drm_device *dev,

• 		     struct dma_buf_attachment *attach,
  

• 		     struct sg_table *sgt);
  

+int drm_vmalloc_bo_fbdev_probe(struct drm_fb_helper *fb_helper,

• 	       struct drm_fb_helper_surface_size *sizes,
  

• 	       const struct drm_framebuffer_funcs *fb_funcs);
  

+/**

• • DEFINE_DRM_VMALLOC_BO_FOPS() - Macro to generate file operations for drivers
• • @name: Name for the generated structure
• • This macro autogenerates a suitable &struct file_operations which can be
• • assigned to &drm_driver.fops for vmalloc BO drivers.
• */

+#define DEFINE_DRM_VMALLOC_BO_FOPS(name) \

• static const struct file_operations name = {\

• .owner		= THIS_MODULE,\
  

• .open		= drm_open,\
  

• .release	= drm_release,\
  

• .unlocked_ioctl	= drm_ioctl,\
  

• .compat_ioctl	= drm_compat_ioctl,\
  

• .poll		= drm_poll,\
  

• .read		= drm_read,\
  

• .llseek		= noop_llseek,\
  

• .mmap		= drm_vmalloc_bo_mmap,\
  

• }

+extern const struct vm_operations_struct drm_vmalloc_bo_vm_ops;

+/**

• • DRM_VMALLOC_BO_DRIVER_OPS - Default GEM and PRIME operations
• • This macro provides a shortcut for setting the GEM and PRIME operations in
• • the &drm_driver structure for vmalloc BO drivers.
• */

+#define DRM_VMALLOC_BO_DRIVER_OPS \

• .gem_free_object = drm_vmalloc_bo_free_object, \
• .gem_vm_ops = &drm_vmalloc_bo_vm_ops, \
• .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \
• .gem_prime_import = drm_gem_prime_import, \
• .gem_prime_import_sg_table = drm_vmalloc_bo_prime_import_sg_table, \
• .dumb_create = drm_vmalloc_bo_dumb_create

+#endif /* __DRM_VMALLOC_BO_HELPER_H__ */

2.14.2

On Wed, Oct 18, 2017 at 09:44:43PM +0200, Noralf Trønnes wrote:

Den 17.10.2017 14.51, skrev Daniel Vetter:

...

On Sun, Oct 15, 2017 at 06:30:40PM +0200, Noralf Trønnes wrote:

...

Add vmalloc buffer object helper that can be useful for modesetting drivers, particularly the framebuffer flushing kind.

Signed-off-by: Noralf Trønnes noralf@tronnes.org

Why can't we extend the shmem stuff to provide a simple vmalloc helper? Doing a new flavour of gem for every special use-case seems like not a good idea ...

This could then also be used by stuff like udl, with fewer changes.

This is the rationale (from the coverletter):

The reason I want to move away from the cma helper, is that it restricts which drivers to PRIME import from, since cma requires the buffer to be physically continuous. Initially I looked at udl and decided to use shmem, but have later decided against it since shmem doesn't work with fbdev deferred I/O, they both use page->lru and page->mapping. This meant adding a shadow buffer for fbdev with increased complexity, so I fell back to the KISS principle.

Hm, I missed that. Can you pls add the reason for why we can't just use shmem to the overview kerneldoc comment?

I'm trying to make tinydrm support drivers like simpledrm and udl, so if using vmalloc blocks those use cases, please let me know.

It shouldn't, I just wanted to know why we need something really similar to shmem (since that's also an sg list that can be vmapped). One remote concern I have is that drivers which in general want to use shmem, but also need fbdev defio support might need to do some acrobatics, and use the vmalloc gem type only for fbdev. But I think that should work out too.

I'm travelling next week and will probably not get around to do a full review of this patch here, would be good if you can find someone else meanwhile.

Thanks, Daniel

Noralf.

...

-Daniel

...

---

Documentation/gpu/drm-kms-helpers.rst | 12 ++ drivers/gpu/drm/Kconfig | 7 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_vmalloc_bo_helper.c | 305 ++++++++++++++++++++++++++++++++ include/drm/drm_vmalloc_bo_helper.h | 88 +++++++++ 5 files changed, 413 insertions(+) create mode 100644 drivers/gpu/drm/drm_vmalloc_bo_helper.c create mode 100644 include/drm/drm_vmalloc_bo_helper.h

diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst index 13dd237418cc..fd1ca10f6611 100644 --- a/Documentation/gpu/drm-kms-helpers.rst +++ b/Documentation/gpu/drm-kms-helpers.rst @@ -305,3 +305,15 @@ Framebuffer GEM Helper Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c :export:

+vmalloc buffer object helper +============================

+.. kernel-doc:: drivers/gpu/drm/drm_vmalloc_bo_helper.c

• :doc: overview

+.. kernel-doc:: include/drm/drm_vmalloc_bo_helper.h

• :internal:

+.. kernel-doc:: drivers/gpu/drm/drm_vmalloc_bo_helper.c

• :export:

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 4d9f21831741..5d580440a259 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -145,6 +145,13 @@ config DRM_KMS_CMA_HELPER help Choose this if you need the KMS CMA helper functions +config DRM_VMALLOC_BO_HELPER

• bool
• depends on DRM
• select DRM_KMS_HELPER
• help

•  Choose this if you need the vmalloc buffer object helper functions
  

• config DRM_VM bool depends on DRM && MMU

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index a3fdc5a68dff..ed3eafa97a69 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -39,6 +39,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \ drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o +drm_kms_helper-$(CONFIG_DRM_VMALLOC_BO_HELPER) += drm_vmalloc_bo_helper.o drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o diff --git a/drivers/gpu/drm/drm_vmalloc_bo_helper.c b/drivers/gpu/drm/drm_vmalloc_bo_helper.c new file mode 100644 index 000000000000..4015b9d1d671 --- /dev/null +++ b/drivers/gpu/drm/drm_vmalloc_bo_helper.c @@ -0,0 +1,305 @@ +/*

• • DRM vmalloc buffer object helper functions
• • Copyright (C) 2017 Noralf Trønnes
• • This program is free software; you can redistribute it and/or modify
• • it under the terms of the GNU General Public License as published by
• • the Free Software Foundation; either version 2 of the License, or
• • (at your option) any later version.
• */

+#include <linux/dma-buf.h> +#include <linux/export.h> +#include <linux/slab.h> +#include <linux/vmalloc.h>

+#include <drm/drmP.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_vmalloc_bo_helper.h>

+/**

• • DOC: overview
• • This helper provides a simple GEM based buffer object with buffers allocated
• • using vmalloc(). This is useful for modesetting drivers that do framebuffer
• • flushing. It supports dumb buffers and PRIME import which can be setup using
• • the DEFINE_DRM_VMALLOC_BO_FOPS() and DRM_VMALLOC_BO_DRIVER_OPS() macros.
• • fbdev emulation can be setup using the drm_vmalloc_bo_fbdev_probe() function.
• */

+static struct drm_vmalloc_bo * +drm_vmalloc_bo_create(struct drm_device *dev, size_t size, bool backing) +{

• struct drm_vmalloc_bo *bo;
• int ret;
• size = PAGE_ALIGN(size);
• bo = kzalloc(sizeof(*bo), GFP_KERNEL);
• if (!bo)

• return ERR_PTR(-ENOMEM);
  

• if (backing) {

• bo->vaddr = vmalloc_user(size);
  

• if (!bo->vaddr) {
  

• 	ret = -ENOMEM;
  

• 	goto error_free;
  

• }
  

• }
• drm_gem_private_object_init(dev, &bo->base, size);
• return bo;

+error_free:

• kfree(bo);
• return ERR_PTR(ret);

+}

+/**

• • drm_vmalloc_bo_free_object() - Free resources associated with a vmalloc BO

• •                            object
    

• • @obj: GEM object to free
• • This function frees the backing memory of the vmalloc BO object, cleans up
• • the GEM object state and frees the memory used to store the object itself.
• • Drivers using the vmalloc BO helpers should set this as their
• • &drm_driver.gem_free_object callback.
• */

+void drm_vmalloc_bo_free_object(struct drm_gem_object *obj) +{

• struct drm_vmalloc_bo *bo = to_drm_vmalloc_bo(obj);
• if (obj->import_attach)

• dma_buf_vunmap(obj->import_attach->dmabuf, bo->vaddr);
  

• else

• vfree(bo->vaddr);
  

• drm_gem_object_release(obj);
• kfree(bo);

+} +EXPORT_SYMBOL(drm_vmalloc_bo_free_object);

+/**

• • drm_vmalloc_bo_dumb_create() - Create a dumb vmalloc BO
• • @file: DRM file structure to create the dumb buffer for
• • @dev: DRM device
• • @args: IOCTL data
• • This function computes the pitch of the dumb buffer and rounds it up to an
• • integer number of bytes per pixel. Drivers for hardware that doesn't have
• • any additional restrictions on the pitch can directly use this function as
• • their &drm_driver.dumb_create callback.
• • For hardware with additional restrictions, drivers can adjust the fields
• • set up by userspace before calling into this function. Also
• • &drm_mode_create_dumb.pitch and &drm_mode_create_dumb.size can be set.
• • Returns:
• • Zero on success or a negative error code on failure.
• */

+int drm_vmalloc_bo_dumb_create(struct drm_file *file, struct drm_device *dev,

• 	       struct drm_mode_create_dumb *args)
  

+{

• struct drm_vmalloc_bo *bo;
• int ret;
• if (!args->pitch)

• args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
  

• else

• args->pitch = max(args->pitch,
  

• 		  DIV_ROUND_UP(args->width * args->bpp, 8));
  

• if (!args->size)

• args->size = args->pitch * args->height;
  

• else

• args->size = max_t(typeof(args->size), args->size,
  

• 		   args->pitch * args->height);
  

• bo = drm_vmalloc_bo_create(dev, args->size, true);
• if (IS_ERR(bo))

• return PTR_ERR(bo);
  

• ret = drm_gem_handle_create(file, &bo->base, &args->handle);
• /* drop reference from allocate - handle holds it now. */
• drm_gem_object_put_unlocked(&bo->base);
• return ret;

+} +EXPORT_SYMBOL(drm_vmalloc_bo_dumb_create);

+const struct vm_operations_struct drm_vmalloc_bo_vm_ops = {

• .open = drm_gem_vm_open,
• .close = drm_gem_vm_close,

+}; +EXPORT_SYMBOL_GPL(drm_vmalloc_bo_vm_ops);

+/**

• • drm_vmalloc_bo_mmap() - Memory-map a vmalloc BO
• • @filp: File object
• • @vma: VMA for the area to be mapped
• • This function implements an augmented version of the GEM DRM file mmap
• • operation for vmalloc buffer objects. Drivers should use this function as
• • their ->mmap handler in the DRM device file's file_operations structure.
• • Instead of directly referencing this function, drivers should use the
• • DEFINE_DRM_VMALLOC_BO_FOPS() macro.
• • Returns:
• • Zero on success or a negative error code on failure.
• */

+int drm_vmalloc_bo_mmap(struct file *filp, struct vm_area_struct *vma) +{

• struct drm_vmalloc_bo *bo;
• int ret;
• ret = drm_gem_mmap(filp, vma);
• if (ret)

• return ret;
  

• /* Set by drm_gem_mmap() */
• vma->vm_flags &= ~VM_IO;
• vma->vm_flags &= ~VM_PFNMAP;
• bo = to_drm_vmalloc_bo(vma->vm_private_data);
• return remap_vmalloc_range(vma, bo->vaddr, 0);

+} +EXPORT_SYMBOL(drm_vmalloc_bo_mmap);

+/**

• • drm_vmalloc_bo_prime_import_sg_table() - Produce a vmalloc BO from a dma-buf
• • @dev: DRM device to import into
• • @attach: dmabuf attachment
• • @sgt: Scatter/gather table of pinned pages
• • This function creates a vmalloc buffer object using the virtual address on
• • the dma-buf exported by another driver. Drivers using the vmalloc BO helpers
• • should set this as their &drm_driver.gem_prime_import_sg_table callback.
• • Returns:
• • A pointer to a newly created GEM object or an ERR_PTR-encoded negative
• • error code on failure.
• */

+struct drm_gem_object * +drm_vmalloc_bo_prime_import_sg_table(struct drm_device *dev,

• 		     struct dma_buf_attachment *attach,
  

• 		     struct sg_table *sgt)
  

+{

• struct drm_vmalloc_bo *bo;
• void *vaddr;
• vaddr = dma_buf_vmap(attach->dmabuf);
• if (!vaddr) {

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

• return ERR_PTR(-ENOMEM);
  

• }
• bo = drm_vmalloc_bo_create(dev, attach->dmabuf->size, false);
• if (IS_ERR(bo)) {

• dma_buf_vunmap(attach->dmabuf, vaddr);
  

• return ERR_CAST(bo);
  

• }
• bo->vaddr = vaddr;
• DRM_DEBUG_PRIME("size = %zu\n", attach->dmabuf->size);
• return &bo->base;

+} +EXPORT_SYMBOL(drm_vmalloc_bo_prime_import_sg_table);

+static struct fb_ops drm_vmalloc_bo_fbdev_ops = {

• .owner = THIS_MODULE,
• DRM_FB_HELPER_DEFAULT_OPS,
• .fb_read = drm_fb_helper_sys_read,
• .fb_write = drm_fb_helper_sys_write,
• .fb_fillrect = drm_fb_helper_sys_fillrect,
• .fb_copyarea = drm_fb_helper_sys_copyarea,
• .fb_imageblit = drm_fb_helper_sys_imageblit,

+};

+/**

• • drm_vmalloc_bo_fbdev_probe - fbdev emulation .fb_probe helper
• • @fb_helper: fbdev emulation helper structure
• • @sizes: Describes fbdev size and scanout surface size
• • @fb_funcs: DRM framebuffer functions
• • This function can be used in the &drm_fb_helper_funcs.fb_probe callback to
• • setup fbdev emulation. If @fb_funcs->dirty is set, fbdev deferred I/O is
• • initialized. drm_fb_helper_simple_init() can be used to initialize the fbdev
• • emulation.
• • Returns:
• • Zero on success, negative error code on failure.
• */

+int drm_vmalloc_bo_fbdev_probe(struct drm_fb_helper *fb_helper,

• 	       struct drm_fb_helper_surface_size *sizes,
  

• 	       const struct drm_framebuffer_funcs *fb_funcs)
  

+{

• struct drm_device *dev = fb_helper->dev;
• struct drm_framebuffer *fb;
• struct drm_vmalloc_bo *bo;
• struct fb_info *fbi;
• size_t size;
• int ret;
• DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d)\n",

•       sizes->surface_width, sizes->surface_height,
  

•       sizes->surface_bpp);
  

• size = sizes->surface_width * sizes->surface_height *

•       DIV_ROUND_UP(sizes->surface_bpp, 8);
  

• bo = drm_vmalloc_bo_create(dev, size, true);
• if (IS_ERR(bo))

• return -ENOMEM;
  

• fb = drm_gem_fbdev_fb_create(dev, sizes, 0, &bo->base, fb_funcs);
• if (IS_ERR(fb)) {

• dev_err(dev->dev, "Failed to allocate DRM framebuffer.\n");
  

• ret = PTR_ERR(fb);
  

• goto err_bo_free;
  

• }
• fb_helper->fb = fb;
• fbi = drm_fb_helper_alloc_fbi(fb_helper);
• if (IS_ERR(fbi)) {

• ret = PTR_ERR(fbi);
  

• goto err_fb_free;
  

• }
• fbi->par = fb_helper;
• fbi->flags = FBINFO_VIRTFB;
• fbi->fbops = &drm_vmalloc_bo_fbdev_ops;
• drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth);
• drm_fb_helper_fill_var(fbi, fb_helper, sizes->fb_width, sizes->fb_height);
• fbi->screen_base = bo->vaddr;
• fbi->screen_size = size;
• fbi->fix.smem_len = size;
• if (fb_funcs->dirty) {

• ret = drm_fb_helper_defio_init(fb_helper);
  

• if (ret)
  

• 	goto err_fb_info_destroy;
  

• }
• return 0;

+err_fb_info_destroy:

• drm_fb_helper_fini(fb_helper);

+err_fb_free:

• drm_framebuffer_remove(fb);

+err_bo_free:

• drm_gem_object_put_unlocked(&bo->base);
• return ret;

+} +EXPORT_SYMBOL(drm_vmalloc_bo_fbdev_probe); diff --git a/include/drm/drm_vmalloc_bo_helper.h b/include/drm/drm_vmalloc_bo_helper.h new file mode 100644 index 000000000000..0df3d15e2e4a --- /dev/null +++ b/include/drm/drm_vmalloc_bo_helper.h @@ -0,0 +1,88 @@ +#ifndef __DRM_VMALLOC_BO_HELPER_H__ +#define __DRM_VMALLOC_BO_HELPER_H__

+#include <drm/drmP.h> +#include <drm/drm_gem.h>

+struct drm_fb_helper_surface_size;

+/**

• • struct drm_vmalloc_bo - vmalloc buffer object
• */

+struct drm_vmalloc_bo {

• /**

• * @base:
  

• *
  

• * Base GEM object.
  

• */
  

• struct drm_gem_object base;
• /**

• * @vaddr:
  

• *
  

• * Kernel virtual address of the buffer.
  

• */
  

• void *vaddr;

+};

+static inline struct drm_vmalloc_bo * +to_drm_vmalloc_bo(struct drm_gem_object *obj) +{

• return container_of(obj, struct drm_vmalloc_bo, base);

+}

+static inline void *drm_vmalloc_bo_fb_vaddr(struct drm_framebuffer *fb) +{

• return to_drm_vmalloc_bo(fb->obj[0])->vaddr;

+}

+void drm_vmalloc_bo_free_object(struct drm_gem_object *obj); +int drm_vmalloc_bo_dumb_create(struct drm_file *file, struct drm_device *dev,

• 	       struct drm_mode_create_dumb *args);
  

+int drm_vmalloc_bo_mmap(struct file *filp, struct vm_area_struct *vma); +struct drm_gem_object * +drm_vmalloc_bo_prime_import_sg_table(struct drm_device *dev,

• 		     struct dma_buf_attachment *attach,
  

• 		     struct sg_table *sgt);
  

+int drm_vmalloc_bo_fbdev_probe(struct drm_fb_helper *fb_helper,

• 	       struct drm_fb_helper_surface_size *sizes,
  

• 	       const struct drm_framebuffer_funcs *fb_funcs);
  

+/**

• • DEFINE_DRM_VMALLOC_BO_FOPS() - Macro to generate file operations for drivers
• • @name: Name for the generated structure
• • This macro autogenerates a suitable &struct file_operations which can be
• • assigned to &drm_driver.fops for vmalloc BO drivers.
• */

+#define DEFINE_DRM_VMALLOC_BO_FOPS(name) \

• static const struct file_operations name = {\

• .owner		= THIS_MODULE,\
  

• .open		= drm_open,\
  

• .release	= drm_release,\
  

• .unlocked_ioctl	= drm_ioctl,\
  

• .compat_ioctl	= drm_compat_ioctl,\
  

• .poll		= drm_poll,\
  

• .read		= drm_read,\
  

• .llseek		= noop_llseek,\
  

• .mmap		= drm_vmalloc_bo_mmap,\
  

• }

+extern const struct vm_operations_struct drm_vmalloc_bo_vm_ops;

+/**

• • DRM_VMALLOC_BO_DRIVER_OPS - Default GEM and PRIME operations
• • This macro provides a shortcut for setting the GEM and PRIME operations in
• • the &drm_driver structure for vmalloc BO drivers.
• */

+#define DRM_VMALLOC_BO_DRIVER_OPS \

• .gem_free_object = drm_vmalloc_bo_free_object, \
• .gem_vm_ops = &drm_vmalloc_bo_vm_ops, \
• .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \
• .gem_prime_import = drm_gem_prime_import, \
• .gem_prime_import_sg_table = drm_vmalloc_bo_prime_import_sg_table, \
• .dumb_create = drm_vmalloc_bo_dumb_create

+#endif /* __DRM_VMALLOC_BO_HELPER_H__ */

2.14.2