diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2019-11-14 15:10:23 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2019-11-26 12:34:43 +0100 |
| commit | ba59b015a0145330e2bf7ab20d504bc624fd618a (patch) | |
| tree | 6137c0ebafb84410d8287ab74f0b01aedc05e308 /drivers/gpu/drm/udl/udl_fb.c | |
| parent | f3f8630a9a7c8f8ab1b16e09b254417478df5182 (diff) | |
drm/udl: Store active framebuffer in device structure
The framebuffer's 'active_16' flag signals which framebuffer to flush
to device memory. Moving the 'active_16' state from struct udl_framebuffer
into struct udl_device prepares for using the generic GEM framebuffer.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191114141025.32198-4-tzimmermann@suse.de
Diffstat (limited to 'drivers/gpu/drm/udl/udl_fb.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_fb.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index a9e6ec360b16d..e9a4bbd5b1950 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -78,8 +78,12 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, BUG_ON(!is_power_of_2(fb->base.format->cpp[0])); log_bpp = __ffs(fb->base.format->cpp[0]); - if (!fb->active_16) + spin_lock(&udl->active_fb_16_lock); + if (udl->active_fb_16 != &fb->base) { + spin_unlock(&udl->active_fb_16_lock); return 0; + } + spin_unlock(&udl->active_fb_16_lock); vaddr = drm_gem_shmem_vmap(&fb->shmem->base); if (IS_ERR(vaddr)) { @@ -153,14 +157,19 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, unsigned num_clips) { struct udl_framebuffer *ufb = to_udl_fb(fb); + struct udl_device *udl = fb->dev->dev_private; struct dma_buf_attachment *import_attach; int i; int ret = 0; drm_modeset_lock_all(fb->dev); - if (!ufb->active_16) + spin_lock(&udl->active_fb_16_lock); + if (udl->active_fb_16 != fb) { + spin_unlock(&udl->active_fb_16_lock); goto unlock; + } + spin_unlock(&udl->active_fb_16_lock); import_attach = ufb->shmem->base.import_attach; |