On Wed, May 11, 2016 at 06:09:18PM +0200, Noralf Trønnes wrote: > Hook up fb_cma_helper to DocBook. Remove mention of > CONFIG_FB_DEFERRED_IO in the docs, which was forgotten in the latest > version of the deferred_io patch. > Use & when referencing drm_mode_config_funcs in docs. > > Signed-off-by: Noralf Trønnes <noralf@xxxxxxxxxxx> First two patches applied to drm-misc, thanks. -Daniel > --- > Documentation/DocBook/gpu.tmpl | 5 +++++ > drivers/gpu/drm/drm_fb_cma_helper.c | 8 +++----- > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl > index 9dd48f7..4a0c599 100644 > --- a/Documentation/DocBook/gpu.tmpl > +++ b/Documentation/DocBook/gpu.tmpl > @@ -1617,6 +1617,11 @@ void intel_crt_init(struct drm_device *dev) > !Iinclude/drm/drm_fb_helper.h > </sect2> > <sect2> > + <title>Framebuffer CMA Helper Functions Reference</title> > +!Pdrivers/gpu/drm/drm_fb_cma_helper.c framebuffer cma helper functions > +!Edrivers/gpu/drm/drm_fb_cma_helper.c > + </sect2> > + <sect2> > <title>Display Port Helper Functions Reference</title> > !Pdrivers/gpu/drm/drm_dp_helper.c dp helpers > !Iinclude/drm/drm_dp_helper.h > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c > index 086f600..3165ac0 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -43,14 +43,12 @@ struct drm_fbdev_cma { > * Provides helper functions for creating a cma (contiguous memory allocator) > * backed framebuffer. > * > - * drm_fb_cma_create() is used in the > - * (struct drm_mode_config_funcs *)->fb_create callback function to create the > - * cma backed framebuffer. > + * drm_fb_cma_create() is used in the &drm_mode_config_funcs ->fb_create > + * callback function to create a cma backed framebuffer. > * > * An fbdev framebuffer backed by cma is also available by calling > * drm_fbdev_cma_init(). drm_fbdev_cma_fini() tears it down. > - * If CONFIG_FB_DEFERRED_IO is enabled and the callback > - * (struct drm_framebuffer_funcs)->dirty is set, fb_deferred_io > + * If the &drm_framebuffer_funcs ->dirty callback is set, fb_deferred_io > * will be set up automatically. dirty() is called by > * drm_fb_helper_deferred_io() in process context (struct delayed_work). > * > -- > 2.8.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel