From patchwork Thu Aug 1 11:56:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 11070591 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 716C913A4 for ; Thu, 1 Aug 2019 11:56:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 623572858F for ; Thu, 1 Aug 2019 11:56:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5689228595; Thu, 1 Aug 2019 11:56:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 00E7028553 for ; Thu, 1 Aug 2019 11:56:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DAD756E571; Thu, 1 Aug 2019 11:56:50 +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 757FF6E56A for ; Thu, 1 Aug 2019 11:56:49 +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 89B12AF68; Thu, 1 Aug 2019 11:56:47 +0000 (UTC) From: Thomas Zimmermann To: daniel@ffwll.ch, noralf@tronnes.org, airlied@linux.ie, rong.a.chen@intel.com, feng.tang@intel.com, ying.huang@intel.com, sean@poorly.run, maxime.ripard@bootlin.com, maarten.lankhorst@linux.intel.com Subject: [PATCH 2/3] drm/ast: Map fbdev framebuffer while it's being displayed Date: Thu, 1 Aug 2019 13:56:41 +0200 Message-Id: <20190801115642.21231-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190801115642.21231-1-tzimmermann@suse.de> References: <20190801115642.21231-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: Oleksandr Andrushchenko , Sam Bobroff , Greg Kroah-Hartman , YueHaibing , dri-devel@lists.freedesktop.org, Alex Deucher , Huang Rui , Gerd Hoffmann , Thomas Zimmermann , Daniel Vetter , Dave Airlie , Thomas Gleixner , Sam Ravnborg , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The generic fbdev emulation will map and unmap the framebuffer's memory if required. As consoles are most often updated while being on screen, we map the fbdev buffer while it's being displayed. This avoids frequent map/unmap operations in the fbdev code. The original fbdev code in ast used the same trick to improve performance. Signed-off-by: Thomas Zimmermann Cc: Thomas Zimmermann Cc: Noralf Trønnes Cc: Dave Airlie Cc: Greg Kroah-Hartman Cc: Thomas Gleixner Cc: Sam Ravnborg Cc: Gerd Hoffmann Cc: Oleksandr Andrushchenko Cc: CK Hu Cc: Daniel Vetter Cc: Alex Deucher Cc: "Christian König" Cc: YueHaibing Cc: Sam Bobroff Cc: Huang Rui Cc: "Y.C. Chen" Cc: Rong Chen Cc: Feng Tang Cc: Huang Ying --- drivers/gpu/drm/ast/ast_mode.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index c792362024a5..35ba25262f54 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -529,13 +529,20 @@ static int ast_crtc_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb, int x, int y, int atomic) { + struct drm_fb_helper *fb_helper = crtc->dev->fb_helper; struct drm_gem_vram_object *gbo; int ret; s64 gpu_addr; + void *base; if (!atomic && fb) { gbo = drm_gem_vram_of_gem(fb->obj[0]); drm_gem_vram_unpin(gbo); + + // Unmap fbdev FB if it's not being displayed + // any longer. + if (fb == fb_helper->buffer->fb) + drm_gem_vram_kunmap(gbo); } gbo = drm_gem_vram_of_gem(crtc->primary->fb->obj[0]); @@ -552,6 +559,15 @@ static int ast_crtc_do_set_base(struct drm_crtc *crtc, ast_set_offset_reg(crtc); ast_set_start_address_crt1(crtc, (u32)gpu_addr); + // Map fbdev FB while it's being displayed. This + // avoids frequent mapping and unmapping withing the + // fbdev code. + if (crtc->primary->fb == fb_helper->buffer->fb) { + base = drm_gem_vram_kmap(gbo, true, NULL); + if (IS_ERR(base)) + DRM_ERROR("failed to kmap fbcon\n"); + } + return 0; err_drm_gem_vram_unpin: @@ -605,10 +621,14 @@ static void ast_crtc_disable(struct drm_crtc *crtc) DRM_DEBUG_KMS("\n"); ast_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); if (crtc->primary->fb) { + struct drm_fb_helper *fb_helper = crtc->dev->fb_helper; struct drm_framebuffer *fb = crtc->primary->fb; struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(fb->obj[0]); + // Unmap if it's the fbdev FB. + if (fb == fb_helper->buffer->fb) + drm_gem_vram_kunmap(gbo); drm_gem_vram_unpin(gbo); } crtc->primary->fb = NULL;