From patchwork Tue Jul 4 09:46:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9824441 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 061E0602F0 for ; Tue, 4 Jul 2017 09:46:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E87ED26E16 for ; Tue, 4 Jul 2017 09:46:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBD2228384; Tue, 4 Jul 2017 09:46:51 +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_SIGNED, 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 7221626E16 for ; Tue, 4 Jul 2017 09:46:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C566F89C8D; Tue, 4 Jul 2017 09:46:49 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A04E89C8D for ; Tue, 4 Jul 2017 09:46:48 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id z45so46896882wrb.2 for ; Tue, 04 Jul 2017 02:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=n//HOwUN8IeMsWJ4o3oRhLSuvmzzhn1sTG/Qk1NC8hQ=; b=a/rfaUaXT8yrzDKo6opQ0ymtI03Z5Af2sRdIdUTLJKAnijRHOPS5q9DfBloCZWoR8k djyWU9//ieoHEGsSlPJ0Go3wekl2pCYG8RT7cDfXlDhG1z92lpSV/+5AhjLPfVKHRr4s GdKOqW84zK9yDGnrLwf3M35d0hhM8XHaPNXcqOgxcNXEsTxb5S6ejbnb0GljQds5kOlS 24ghRtUuOAmegHqnAQJf+g6BzdsH19K36Ip9lM8TlkMee2EyXYm2E+Tlz75HKNzNXCpm kkPkxz4cv14hlWu83jo0kttaurCKpxa7wA8u7CtyNnOnicIBFFZA4veXEVGlHUarkKNf 3EWA== 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; bh=n//HOwUN8IeMsWJ4o3oRhLSuvmzzhn1sTG/Qk1NC8hQ=; b=H9/FOzY0sDUPjppLY1+aZ8FfBKjLOhiXS6Q52U7pyQf8HylE8wFVuS35hE2ro1ylsj WjgBx/ZAr4jigInOgo6un6O5BZ4dp4ZUoa9yDf/BTD09Nw0FxlLkbJt+CNDTOc3ZRoMs Mtfy4wUgt1+ajCCW7OicT6Nve+xSr17wivUIesXEnPnHwfvrTpY8WUbsRPzAD4J5XyX6 IrVPbNPKNpE9z1oKIChR5Otx/w3eJWavQkL7tju4VlmPH1svjaacLMJbPgjUVF5NEdNH tz0L1hNmU4p9byhCkLZsz/+gAn7b+JL0heOtoQ77XTwf4toUYw6om8Bpc9tTfzimD27v WeOQ== X-Gm-Message-State: AKS2vOwkM6m+vyPlIazFZHx6gF1OR+miGz48rMLm/jFYOf3fI6yyb3mH Wi3xf0gbDKXS9ZJuFqI= X-Received: by 10.223.175.238 with SMTP id y46mr30490120wrd.163.1499161607079; Tue, 04 Jul 2017 02:46:47 -0700 (PDT) Received: from t460p.intel ([95.146.144.225]) by smtp.gmail.com with ESMTPSA id y192sm17594105wmy.6.2017.07.04.02.46.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 02:46:46 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 4 Jul 2017 10:46:40 +0100 Message-Id: <20170704094640.24991-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.9.4 Subject: [Intel-gfx] [PATCH] drm/i915: Unpin vma iomapping when fbdev is destroyed X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin If we don't release the iomapping we are not able to unpin the vma which then gets leaked. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson --- Some time last year we talked about a pending patch to get rid of the fbdev VMA leak. I lost track of what happened with that. Compile tested only. --- drivers/gpu/drm/i915/intel_fbdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 03347c6ae599..46831021236f 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -537,6 +537,7 @@ static void intel_fbdev_destroy(struct intel_fbdev *ifbdev) if (ifbdev->fb) { mutex_lock(&ifbdev->helper.dev->struct_mutex); + i915_vma_unpin_iomap(ifbdev->vma); intel_unpin_fb_vma(ifbdev->vma); mutex_unlock(&ifbdev->helper.dev->struct_mutex);