From patchwork Wed Feb 7 17:45:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10205791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A27EB6020F for ; Wed, 7 Feb 2018 17:46:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91ACD28B72 for ; Wed, 7 Feb 2018 17:46:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83CCF28FB3; Wed, 7 Feb 2018 17:46:08 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 366DE28B72 for ; Wed, 7 Feb 2018 17:46:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D325D6E3C6; Wed, 7 Feb 2018 17:46:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x244.google.com (mail-qt0-x244.google.com [IPv6:2607:f8b0:400d:c0d::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A9106E3C6 for ; Wed, 7 Feb 2018 17:46:05 +0000 (UTC) Received: by mail-qt0-x244.google.com with SMTP id s27so2743313qts.4 for ; Wed, 07 Feb 2018 09:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6lHPzjwC5rG/OnFErnE58DRU3NC5UCx3P2COWe4mxrM=; b=UEDbmQFo0UB9hU1GsCCP0l4WMl0UqMFmtLtdZscHEEex1P5jAOYtwwrvGJfhp0KC1R E9wPNpoSl/jWnkm6ygUnxexQXgfPeCThyXpHhSpC7MNStip7oSakiyqZ4EDtjX1SDKgU 5GEhtUs5EMa7OjjWrL3NW+en9v6i3jpywiBXxsqZ7bPYiIDvBXyky9SNKecDhSJ14noe w1130mfLpXCOjjbD72DFOaDdG4DU3famnoZvrXHDB2x8U7mamWRrv+de1WdPTG4cZfe1 5CU9f75RRlyekjcdtULff5jonyuvOyvzww3KiGEyrQETrdJDRQKDmJxvBE3dG1EK/vwR fu9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6lHPzjwC5rG/OnFErnE58DRU3NC5UCx3P2COWe4mxrM=; b=X0JHo/fr9tVC4r1paa2yNvQ6c7WSI3gqD89p8DRIap8pvT/RSS7NsTWWknWj3BWsjT g4M/hji0KCPoc+0Cqm8/hRNnARvfZMzdSAon875HTVCOVXdC7uAXfY0D0ixnOpvnVsXL TiZbWiN9UUiLjqdECFcMdlLtrU0JdG/DX8N8Cms5cok6F7OIQch1QbN7GS6+iWg/FWOS p8QzBASVpt5oVKAEKOg9S5lv6kFroDewSeNxK6ndHVIdrJusFnseSXxNPQbZ9SgsCqHk Sb/4aQZzFgDLVs4cd+0a+8tVZ9Fx02mvBMQftOVcWbXJ1Kyen/Ur/hIhiSowypCINs/g qrbQ== X-Gm-Message-State: APf1xPBmxf6vruZSxBqdHjuqSd5siBssyw1e9LfLgrxg+H6jptIHz/oV qinTL5Ik5Ctayy3OWHcE48Y= X-Google-Smtp-Source: AH8x224z6aKyLP/VW4q0p1FnyxWwTn9Rod5A4mNEEk3pvSDfHJQDkIeTvcZdJAP7atYoIQxY4wbgjA== X-Received: by 10.200.81.83 with SMTP id h19mr10076122qtn.63.1518025564597; Wed, 07 Feb 2018 09:46:04 -0800 (PST) Received: from localhost (p200300E41F41B00009B231EAB1BE76D4.dip0.t-ipconnect.de. [2003:e4:1f41:b000:9b2:31ea:b1be:76d4]) by smtp.gmail.com with ESMTPSA id 78sm1427843qky.96.2018.02.07.09.46.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Feb 2018 09:46:04 -0800 (PST) From: Thierry Reding To: Thierry Reding Subject: [PATCH 3/3] drm/tegra: fb: Implement ->fb_mmap() callback Date: Wed, 7 Feb 2018 18:45:56 +0100 Message-Id: <20180207174556.25401-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180207174556.25401-1-thierry.reding@gmail.com> References: <20180207174556.25401-1-thierry.reding@gmail.com> 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: Marcel Ziswiler , linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding This fixes hangs with legacy applications that use the mmap() syscall on the fbdev device to map framebuffer memory. The fbdev implementation for mmap() creates a mapping that conflicts with DRM usage and causes a hang when the memory is accessed through the mapping. Reported-by: Marcel Ziswiler Signed-off-by: Thierry Reding Tested-by: Stefan Agner Tested-by: Marcel Ziswiler Reported-by: Marcel Ziswiler --- drivers/gpu/drm/tegra/fb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c index 001cb77e2f59..0786159edef3 100644 --- a/drivers/gpu/drm/tegra/fb.c +++ b/drivers/gpu/drm/tegra/fb.c @@ -224,12 +224,28 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm, } #ifdef CONFIG_DRM_FBDEV_EMULATION +static int tegra_fb_mmap(struct fb_info *info, struct vm_area_struct *vma) +{ + struct drm_fb_helper *helper = info->par; + struct tegra_bo *bo; + int err; + + bo = tegra_fb_get_plane(helper->fb, 0); + + err = drm_gem_mmap_obj(&bo->gem, bo->gem.size, vma); + if (err < 0) + return err; + + return __tegra_gem_mmap(&bo->gem, vma); +} + static struct fb_ops tegra_fb_ops = { .owner = THIS_MODULE, DRM_FB_HELPER_DEFAULT_OPS, .fb_fillrect = drm_fb_helper_sys_fillrect, .fb_copyarea = drm_fb_helper_sys_copyarea, .fb_imageblit = drm_fb_helper_sys_imageblit, + .fb_mmap = tegra_fb_mmap, }; static int tegra_fbdev_probe(struct drm_fb_helper *helper,