From patchwork Thu Nov 14 14:10:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 11243843 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00C0C138C for ; Thu, 14 Nov 2019 14:10:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DCEF22070E for ; Thu, 14 Nov 2019 14:10:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCEF22070E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EA356E9D0; Thu, 14 Nov 2019 14:10:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 452CE6E9D1 for ; Thu, 14 Nov 2019 14:10:31 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id ACBFBB188; Thu, 14 Nov 2019 14:10:29 +0000 (UTC) From: Thomas Zimmermann To: airlied@redhat.com, sean@poorly.run, daniel@ffwll.ch, kraxel@redhat.com, emil.velikov@collabora.com, sam@ravnborg.org, noralf@tronnes.org Subject: [PATCH 3/5] drm/udl: Store active framebuffer in device structure Date: Thu, 14 Nov 2019 15:10:23 +0100 Message-Id: <20191114141025.32198-4-tzimmermann@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191114141025.32198-1-tzimmermann@suse.de> References: <20191114141025.32198-1-tzimmermann@suse.de> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Zimmermann , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- drivers/gpu/drm/udl/udl_drv.h | 5 ++++- drivers/gpu/drm/udl/udl_fb.c | 13 +++++++++++-- drivers/gpu/drm/udl/udl_main.c | 3 +++ drivers/gpu/drm/udl/udl_modeset.c | 18 +++++++----------- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index be585e3e572d..a0946b955739 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -53,6 +53,10 @@ struct udl_device { struct usb_device *udev; struct drm_crtc *crtc; + /* active framebuffer on the 16-bit channel */ + const struct drm_framebuffer *active_fb_16; + spinlock_t active_fb_16_lock; + struct mutex gem_lock; int sku_pixel_limit; @@ -73,7 +77,6 @@ struct udl_device { struct udl_framebuffer { struct drm_framebuffer base; struct drm_gem_shmem_object *shmem; - bool active_16; /* active on the 16-bit channel */ }; #define to_udl_fb(x) container_of(x, struct udl_framebuffer, base) diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index a9e6ec360b16..e9a4bbd5b195 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; diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 9b091b5b063e..a23218fc7d8e 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -317,6 +317,9 @@ int udl_init(struct udl_device *udl) DRM_DEBUG("\n"); + udl->active_fb_16 = NULL; + spin_lock_init(&udl->active_fb_16_lock); + mutex_init(&udl->gem_lock); if (!udl_parse_vendor_descriptor(dev, udl->udev)) { diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index 6582c9d27a87..44a741f463c9 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -332,11 +332,9 @@ static int udl_crtc_mode_set(struct drm_crtc *crtc, wrptr = udl_dummy_render(wrptr); - if (old_fb) { - struct udl_framebuffer *uold_fb = to_udl_fb(old_fb); - uold_fb->active_16 = false; - } - ufb->active_16 = true; + spin_lock(&udl->active_fb_16_lock); + udl->active_fb_16 = &ufb->base; + spin_unlock(&udl->active_fb_16_lock); udl->mode_buf_len = wrptr - buf; /* damage all of it */ @@ -364,13 +362,11 @@ static int udl_crtc_page_flip(struct drm_crtc *crtc, { struct udl_framebuffer *ufb = to_udl_fb(fb); struct drm_device *dev = crtc->dev; + struct udl_device *udl = dev->dev_private; - struct drm_framebuffer *old_fb = crtc->primary->fb; - if (old_fb) { - struct udl_framebuffer *uold_fb = to_udl_fb(old_fb); - uold_fb->active_16 = false; - } - ufb->active_16 = true; + spin_lock(&udl->active_fb_16_lock); + udl->active_fb_16 = fb; + spin_unlock(&udl->active_fb_16_lock); udl_handle_damage(ufb, 0, 0, fb->width, fb->height);