| Message ID | 1463057606-1916-2-git-send-email-noralf@tronnes.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Noralf, Thank you for the patch. On Thursday 12 May 2016 14:53:25 Noralf Trønnes wrote: > Add drm_fb_cma_create_with_funcs() for drivers that need to set the > dirty() callback. > > Cc: laurent.pinchart@ideasonboard.com > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> > --- > > Changes since v1: > - Expand docs > > drivers/gpu/drm/drm_fb_cma_helper.c | 31 +++++++++++++++++++++++++------ > include/drm/drm_fb_cma_helper.h | 3 +++ > 2 files changed, 28 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c > b/drivers/gpu/drm/drm_fb_cma_helper.c index 3165ac0..ede77c9 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -159,13 +159,17 @@ static struct drm_fb_cma *drm_fb_cma_alloc(struct > drm_device *dev, } > > /** > - * drm_fb_cma_create() - (struct drm_mode_config_funcs *)->fb_create > callback function > + * drm_fb_cma_create_with_funcs() - helper function for the > + * &drm_mode_config_funcs ->fb_create > + * callback function > * > - * If your hardware has special alignment or pitch requirements these > should be > - * checked before calling this function. > + * This can be used to set &drm_framebuffer_funcs for drivers that need the > + * dirty() callback. Use drm_fb_cma_create() if you don't need to change + > * &drm_framebuffer_funcs. > */ > -struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, > - struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) > +struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device > *dev, > + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, > + struct drm_framebuffer_funcs *funcs) Shouldn't the funcs argument be const ? Apart from that, Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > { > struct drm_fb_cma *fb_cma; > struct drm_gem_cma_object *objs[4]; > @@ -202,7 +206,7 @@ struct drm_framebuffer *drm_fb_cma_create(struct > drm_device *dev, objs[i] = to_drm_gem_cma_obj(obj); > } > > - fb_cma = drm_fb_cma_alloc(dev, mode_cmd, objs, i, &drm_fb_cma_funcs); > + fb_cma = drm_fb_cma_alloc(dev, mode_cmd, objs, i, funcs); > if (IS_ERR(fb_cma)) { > ret = PTR_ERR(fb_cma); > goto err_gem_object_unreference; > @@ -215,6 +219,21 @@ err_gem_object_unreference: > drm_gem_object_unreference_unlocked(&objs[i]->base); > return ERR_PTR(ret); > } > +EXPORT_SYMBOL_GPL(drm_fb_cma_create_with_funcs); > + > +/** > + * drm_fb_cma_create() - &drm_mode_config_funcs ->fb_create callback > function > + * > + * If your hardware has special alignment or pitch requirements these > should be > + * checked before calling this function. Use drm_fb_cma_create_with_funcs() > if > + * you need to set &drm_framebuffer_funcs ->dirty. > + */ > +struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, > + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) > +{ > + return drm_fb_cma_create_with_funcs(dev, file_priv, mode_cmd, > + &drm_fb_cma_funcs); > +} > EXPORT_SYMBOL_GPL(drm_fb_cma_create); > > /** > diff --git a/include/drm/drm_fb_cma_helper.h > b/include/drm/drm_fb_cma_helper.h index c6d9c9c..1f9a8bc 100644 > --- a/include/drm/drm_fb_cma_helper.h > +++ b/include/drm/drm_fb_cma_helper.h > @@ -31,6 +31,9 @@ void drm_fb_cma_destroy(struct drm_framebuffer *fb); > int drm_fb_cma_create_handle(struct drm_framebuffer *fb, > struct drm_file *file_priv, unsigned int *handle); > > +struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device > *dev, > + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, > + struct drm_framebuffer_funcs *funcs); > struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, > struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd);
Den 12.05.2016 15:47, skrev Laurent Pinchart: > Hi Noralf, > > Thank you for the patch. > > On Thursday 12 May 2016 14:53:25 Noralf Trønnes wrote: >> Add drm_fb_cma_create_with_funcs() for drivers that need to set the >> dirty() callback. >> >> Cc: laurent.pinchart@ideasonboard.com >> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> >> --- >> >> Changes since v1: >> - Expand docs >> >> drivers/gpu/drm/drm_fb_cma_helper.c | 31 +++++++++++++++++++++++++------ >> include/drm/drm_fb_cma_helper.h | 3 +++ >> 2 files changed, 28 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c >> b/drivers/gpu/drm/drm_fb_cma_helper.c index 3165ac0..ede77c9 100644 >> --- a/drivers/gpu/drm/drm_fb_cma_helper.c >> +++ b/drivers/gpu/drm/drm_fb_cma_helper.c >> @@ -159,13 +159,17 @@ static struct drm_fb_cma *drm_fb_cma_alloc(struct >> drm_device *dev, } >> >> /** >> - * drm_fb_cma_create() - (struct drm_mode_config_funcs *)->fb_create >> callback function >> + * drm_fb_cma_create_with_funcs() - helper function for the >> + * &drm_mode_config_funcs ->fb_create >> + * callback function >> * >> - * If your hardware has special alignment or pitch requirements these >> should be >> - * checked before calling this function. >> + * This can be used to set &drm_framebuffer_funcs for drivers that need the >> + * dirty() callback. Use drm_fb_cma_create() if you don't need to change + >> * &drm_framebuffer_funcs. >> */ >> -struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, >> - struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) >> +struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device >> *dev, >> + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, >> + struct drm_framebuffer_funcs *funcs) > Shouldn't the funcs argument be const ? Yes you're right, drm_framebuffer_init() uses const. I missed this in my previous patch as well, so I need to fix up drm_fb_cma_alloc() and drm_fbdev_cma_create_with_funcs() as well. Thanks. Noralf. > Apart from that, > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > >> { >> struct drm_fb_cma *fb_cma; >> struct drm_gem_cma_object *objs[4]; >> @@ -202,7 +206,7 @@ struct drm_framebuffer *drm_fb_cma_create(struct >> drm_device *dev, objs[i] = to_drm_gem_cma_obj(obj); >> } >> >> - fb_cma = drm_fb_cma_alloc(dev, mode_cmd, objs, i, &drm_fb_cma_funcs); >> + fb_cma = drm_fb_cma_alloc(dev, mode_cmd, objs, i, funcs); >> if (IS_ERR(fb_cma)) { >> ret = PTR_ERR(fb_cma); >> goto err_gem_object_unreference; >> @@ -215,6 +219,21 @@ err_gem_object_unreference: >> drm_gem_object_unreference_unlocked(&objs[i]->base); >> return ERR_PTR(ret); >> } >> +EXPORT_SYMBOL_GPL(drm_fb_cma_create_with_funcs); >> + >> +/** >> + * drm_fb_cma_create() - &drm_mode_config_funcs ->fb_create callback >> function >> + * >> + * If your hardware has special alignment or pitch requirements these >> should be >> + * checked before calling this function. Use drm_fb_cma_create_with_funcs() >> if >> + * you need to set &drm_framebuffer_funcs ->dirty. >> + */ >> +struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, >> + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) >> +{ >> + return drm_fb_cma_create_with_funcs(dev, file_priv, mode_cmd, >> + &drm_fb_cma_funcs); >> +} >> EXPORT_SYMBOL_GPL(drm_fb_cma_create); >> >> /** >> diff --git a/include/drm/drm_fb_cma_helper.h >> b/include/drm/drm_fb_cma_helper.h index c6d9c9c..1f9a8bc 100644 >> --- a/include/drm/drm_fb_cma_helper.h >> +++ b/include/drm/drm_fb_cma_helper.h >> @@ -31,6 +31,9 @@ void drm_fb_cma_destroy(struct drm_framebuffer *fb); >> int drm_fb_cma_create_handle(struct drm_framebuffer *fb, >> struct drm_file *file_priv, unsigned int *handle); >> >> +struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device >> *dev, >> + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, >> + struct drm_framebuffer_funcs *funcs); >> struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, >> struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd);
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index 3165ac0..ede77c9 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -159,13 +159,17 @@ static struct drm_fb_cma *drm_fb_cma_alloc(struct drm_device *dev, } /** - * drm_fb_cma_create() - (struct drm_mode_config_funcs *)->fb_create callback function + * drm_fb_cma_create_with_funcs() - helper function for the + * &drm_mode_config_funcs ->fb_create + * callback function * - * If your hardware has special alignment or pitch requirements these should be - * checked before calling this function. + * This can be used to set &drm_framebuffer_funcs for drivers that need the + * dirty() callback. Use drm_fb_cma_create() if you don't need to change + * &drm_framebuffer_funcs. */ -struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, - struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) +struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device *dev, + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, + struct drm_framebuffer_funcs *funcs) { struct drm_fb_cma *fb_cma; struct drm_gem_cma_object *objs[4]; @@ -202,7 +206,7 @@ struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, objs[i] = to_drm_gem_cma_obj(obj); } - fb_cma = drm_fb_cma_alloc(dev, mode_cmd, objs, i, &drm_fb_cma_funcs); + fb_cma = drm_fb_cma_alloc(dev, mode_cmd, objs, i, funcs); if (IS_ERR(fb_cma)) { ret = PTR_ERR(fb_cma); goto err_gem_object_unreference; @@ -215,6 +219,21 @@ err_gem_object_unreference: drm_gem_object_unreference_unlocked(&objs[i]->base); return ERR_PTR(ret); } +EXPORT_SYMBOL_GPL(drm_fb_cma_create_with_funcs); + +/** + * drm_fb_cma_create() - &drm_mode_config_funcs ->fb_create callback function + * + * If your hardware has special alignment or pitch requirements these should be + * checked before calling this function. Use drm_fb_cma_create_with_funcs() if + * you need to set &drm_framebuffer_funcs ->dirty. + */ +struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd) +{ + return drm_fb_cma_create_with_funcs(dev, file_priv, mode_cmd, + &drm_fb_cma_funcs); +} EXPORT_SYMBOL_GPL(drm_fb_cma_create); /** diff --git a/include/drm/drm_fb_cma_helper.h b/include/drm/drm_fb_cma_helper.h index c6d9c9c..1f9a8bc 100644 --- a/include/drm/drm_fb_cma_helper.h +++ b/include/drm/drm_fb_cma_helper.h @@ -31,6 +31,9 @@ void drm_fb_cma_destroy(struct drm_framebuffer *fb); int drm_fb_cma_create_handle(struct drm_framebuffer *fb, struct drm_file *file_priv, unsigned int *handle); +struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device *dev, + struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, + struct drm_framebuffer_funcs *funcs); struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd);
Add drm_fb_cma_create_with_funcs() for drivers that need to set the dirty() callback. Cc: laurent.pinchart@ideasonboard.com Signed-off-by: Noralf Trønnes <noralf@tronnes.org> --- Changes since v1: - Expand docs drivers/gpu/drm/drm_fb_cma_helper.c | 31 +++++++++++++++++++++++++------ include/drm/drm_fb_cma_helper.h | 3 +++ 2 files changed, 28 insertions(+), 6 deletions(-) -- 2.8.2