leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/tinydrm: Make fb_dirty into a lower level hook

Browse Source 
mipi_dbi_enable_flush() wants to call the fb->dirty() hook from the
bowels of the .atomic_enable() hook. That prevents us from taking the
plane mutex in fb->dirty() unless we also plumb down the acquire
context.

Instead it seems simpler to split the fb->dirty() into a tinydrm
specific lower level hook that can be called from
mipi_dbi_enable_flush() and from a generic higher level
tinydrm_fb_dirty() helper. As we don't have a tinydrm specific
vfuncs table we'll just stick it into tinydrm_device directly
for now.

v2: Deal with the fb->dirty() in tinydrm_display_pipe_update() as well (Noralf)

Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: David Lechner <david@lechnology.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180323153509.15287-1-ville.syrjala@linux.intel.com
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Tested-by: Noralf Trønnes <noralf@tronnes.org>
This commit is contained in:
Ville Syrjälä
2018-03-23 17:35:09 +02:00
parent 0c9c7fd00e
commit e85d30060e
11 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
View File

@@ -78,6 +78,36 @@ bool tinydrm_merge_clips(struct drm_clip_rect *dst,
}
EXPORT_SYMBOL(tinydrm_merge_clips);
int tinydrm_fb_dirty(struct drm_framebuffer *fb,
struct drm_file *file_priv,
unsigned int flags, unsigned int color,
struct drm_clip_rect *clips,
unsigned int num_clips)
{
struct tinydrm_device *tdev = fb->dev->dev_private;
struct drm_plane *plane = &tdev->pipe.plane;
int ret = 0;
drm_modeset_lock(&plane->mutex, NULL);
/* fbdev can flush even when we're not interested */
if (plane->state->fb == fb) {
mutex_lock(&tdev->dirty_lock);
ret = tdev->fb_dirty(fb, file_priv, flags,
color, clips, num_clips);
mutex_unlock(&tdev->dirty_lock);
}
drm_modeset_unlock(&plane->mutex);
if (ret)
dev_err_once(fb->dev->dev,
"Failed to update display %d\n", ret);
return ret;
}
EXPORT_SYMBOL(tinydrm_fb_dirty);
/**
* tinydrm_memcpy - Copy clip buffer
* @dst: Destination buffer