On Wed, 2021-07-21 at 15:30 +0200, Daniel Vetter wrote: > There's two stages of manual upload/invalidate displays: > - just handling dirtyfb and uploading the entire fb all the time > - looking at damage clips > > In the latter case we support it through fbdev emulation (with > fb_defio), atomic property, and with the dirtfy clip rects. > > Make sure at least the atomic property is set up as the main official > interface for this. Ideally we'd also check that > drm_atomic_helper_dirtyfb() is used and that fbdev defio is set up, > but that's quite a bit harder to do. Ideas very much welcome. > > From a cursor audit drivers seem to be getting this right mostly, but > better to make sure. At least no one is bypassing the accessor > function. > > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Cc: Gwan-gyeong Mun <gwan-gyeong.mun@xxxxxxxxx> > Cc: José Roberto de Souza <jose.souza@xxxxxxxxx> > Cc: Hans de Goede <hdegoede@xxxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Maxime Ripard <mripard@xxxxxxxxxx> > Cc: Thomas Zimmermann <tzimmermann@xxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > --- > drivers/gpu/drm/drm_plane.c | 42 +++++++++++++++++++++++++++++++++++++ > include/drm/drm_plane.h | 36 ++++--------------------------- > 2 files changed, 46 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c > index b373958ecb30..40f099c67a8d 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -1397,6 +1397,48 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, > return ret; > } > > +/** > + * drm_plane_get_damage_clips_count - Returns damage clips count. > + * @state: Plane state. > + * > + * Simple helper to get the number of &drm_mode_rect clips set by user-space > + * during plane update. > + * > + * Return: Number of clips in plane fb_damage_clips blob property. > + */ > +unsigned int > +drm_plane_get_damage_clips_count(const struct drm_plane_state *state) > +{ > + return (state && state->fb_damage_clips) ? > + state->fb_damage_clips->length/sizeof(struct drm_mode_rect) : 0; > +} > +EXPORT_SYMBOL(drm_plane_get_damage_clips_count); > + > +/** > + * drm_plane_get_damage_clips - Returns damage clips. > + * @state: Plane state. > + * > + * Note that this function returns uapi type &drm_mode_rect. Drivers might want > + * to use the helper functions drm_atomic_helper_damage_iter_init() and > + * drm_atomic_helper_damage_iter_next() or drm_atomic_helper_damage_merged() if > + * the driver can only handle a single damage region at most. > + * > + * Return: Damage clips in plane fb_damage_clips blob property. > + */ > +struct drm_mode_rect * > +drm_plane_get_damage_clips(const struct drm_plane_state *state) > +{ > + struct drm_mode_config *config = &state->plane->dev->mode_config; > + > + /* check that drm_plane_enable_fb_damage_clips() was called */ > + WARN_ON_ONCE(!drm_mode_obj_find_prop_id(&state->plane->base, > + config->prop_fb_damage_clips->base.id)); Changing to drm_warn_once() Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx> > + > + return (struct drm_mode_rect *)((state && state->fb_damage_clips) ? > + state->fb_damage_clips->data : NULL); > +} > +EXPORT_SYMBOL(drm_plane_get_damage_clips); > + > struct drm_property * > drm_create_scaling_filter_prop(struct drm_device *dev, > unsigned int supported_filters) > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > index 7f7d5148310c..a2684aab8372 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -897,39 +897,11 @@ static inline struct drm_plane *drm_plane_find(struct drm_device *dev, > > bool drm_any_plane_has_format(struct drm_device *dev, > u32 format, u64 modifier); > -/** > - * drm_plane_get_damage_clips_count - Returns damage clips count. > - * @state: Plane state. > - * > - * Simple helper to get the number of &drm_mode_rect clips set by user-space > - * during plane update. > - * > - * Return: Number of clips in plane fb_damage_clips blob property. > - */ > -static inline unsigned int > -drm_plane_get_damage_clips_count(const struct drm_plane_state *state) > -{ > - return (state && state->fb_damage_clips) ? > - state->fb_damage_clips->length/sizeof(struct drm_mode_rect) : 0; > -} > +unsigned int > +drm_plane_get_damage_clips_count(const struct drm_plane_state *state); > > -/** > - * drm_plane_get_damage_clips - Returns damage clips. > - * @state: Plane state. > - * > - * Note that this function returns uapi type &drm_mode_rect. Drivers might want > - * to use the helper functions drm_atomic_helper_damage_iter_init() and > - * drm_atomic_helper_damage_iter_next() or drm_atomic_helper_damage_merged() if > - * the driver can only handle a single damage region at most. > - * > - * Return: Damage clips in plane fb_damage_clips blob property. > - */ > -static inline struct drm_mode_rect * > -drm_plane_get_damage_clips(const struct drm_plane_state *state) > -{ > - return (struct drm_mode_rect *)((state && state->fb_damage_clips) ? > - state->fb_damage_clips->data : NULL); > -} > +struct drm_mode_rect * > +drm_plane_get_damage_clips(const struct drm_plane_state *state); > > int drm_plane_create_scaling_filter_property(struct drm_plane *plane, > unsigned int supported_filters); _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx