On Thu, Nov 10, 2022 at 02:55:19PM +0100, Thomas Zimmermann wrote:
> The fbdev damage worker is unused, so remove it.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
I'd squash this into the previous patch, which gets rid of the
schedule_work(), if you limit the previous patch to really just that
change. But split out is fine too.
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/drm_fb_helper.c | 9 ---------
> include/drm/drm_fb_helper.h | 2 --
> 2 files changed, 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 8cb644e4ecf90..47b8ef03a1f89 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -403,13 +403,6 @@ static void drm_fb_helper_fb_dirty(struct drm_fb_helper *helper)
> spin_unlock_irqrestore(&helper->damage_lock, flags);
> }
>
> -static void drm_fb_helper_damage_work(struct work_struct *work)
> -{
> - struct drm_fb_helper *helper = container_of(work, struct drm_fb_helper, damage_work);
> -
> - drm_fb_helper_fb_dirty(helper);
> -}
> -
> /**
> * drm_fb_helper_prepare - setup a drm_fb_helper structure
> * @dev: DRM device
> @@ -425,7 +418,6 @@ void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,
> INIT_LIST_HEAD(&helper->kernel_fb_list);
> spin_lock_init(&helper->damage_lock);
> INIT_WORK(&helper->resume_work, drm_fb_helper_resume_worker);
> - INIT_WORK(&helper->damage_work, drm_fb_helper_damage_work);
> helper->damage_clip.x1 = helper->damage_clip.y1 = ~0;
> mutex_init(&helper->lock);
> helper->funcs = funcs;
> @@ -557,7 +549,6 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
> return;
>
> cancel_work_sync(&fb_helper->resume_work);
> - cancel_work_sync(&fb_helper->damage_work);
>
> info = fb_helper->info;
> if (info) {
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index ecfcd2c56d95a..f37bb2832ba41 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -116,7 +116,6 @@ struct drm_fb_helper_funcs {
> * @damage_clip: clip rectangle used with deferred_io to accumulate damage to
> * the screen buffer
> * @damage_lock: spinlock protecting @damage_clip
> - * @damage_work: worker used to flush the framebuffer
> * @resume_work: worker used during resume if the console lock is already taken
> *
> * This is the main structure used by the fbdev helpers. Drivers supporting
> @@ -146,7 +145,6 @@ struct drm_fb_helper {
> u32 pseudo_palette[17];
> struct drm_clip_rect damage_clip;
> spinlock_t damage_lock;
> - struct work_struct damage_work;
> struct work_struct resume_work;
>
> /**
> --
> 2.38.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
