From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 009/171] drm/bochs: Fix connector leak during driver unload Date: Thu, 18 Jul 2019 23:54:00 -0400 Message-ID: <20190719035643.14300-9-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A64F6E49B for ; Fri, 19 Jul 2019 03:57:06 +0000 (UTC) In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sam Bobroff , Sasha Levin , Gerd Hoffmann , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2FtIEJvYnJvZmYgPHNib2Jyb2ZmQGxpbnV4LmlibS5jb20+CgpbIFVwc3RyZWFtIGNv bW1pdCAzYzZiODYyNWRkZTgyNjAwZmQwM2FkMWZjYmEyMjNmMTMwM2VlNTM1IF0KCldoZW4gdW5s b2FkaW5nIHRoZSBib2Nocy1kcm0gZHJpdmVyLCBhIHdhcm5pbmcgbWVzc2FnZSBpcyBwcmludGVk IGJ5CmRybV9tb2RlX2NvbmZpZ19jbGVhbnVwKCkgYmVjYXVzZSBhIHJlZmVyZW5jZSBpcyBzdGls bCBoZWxkIHRvIG9uZSBvZgp0aGUgZHJtX2Nvbm5lY3RvciBzdHJ1Y3RzLgoKQ29ycmVjdCB0aGlz IGJ5IGNhbGxpbmcgZHJtX2F0b21pY19oZWxwZXJfc2h1dGRvd24oKSBpbgpib2Noc19wY2lfcmVt b3ZlKCkuCgpGaXhlczogNjU3OWMzOTU5NGFlICgiZHJtL2JvY2hzOiBhdG9taWM6IHN3aXRjaCBw bGFuZXMgdG8gYXRvbWljLCB3aXJlIHVwIGhlbHBlcnMuIikKU2lnbmVkLW9mZi1ieTogU2FtIEJv YnJvZmYgPHNib2Jyb2ZmQGxpbnV4LmlibS5jb20+Ckxpbms6IGh0dHA6Ly9wYXRjaHdvcmsuZnJl ZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzkzYjM2M2FkNjJmNDkzOGQ5ZGRmM2UwNWIyYTYxZTNm NjZiMmRjZDMuMTU1ODQxNjQ3My5naXQuc2JvYnJvZmZAbGludXguaWJtLmNvbQpTaWduZWQtb2Zm LWJ5OiBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KU2lnbmVkLW9mZi1ieTogU2Fz aGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9ib2Nocy9i b2Noc19kcnYuYyB8IDIgKysKIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKykKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNfZHJ2LmMgYi9kcml2ZXJzL2dwdS9k cm0vYm9jaHMvYm9jaHNfZHJ2LmMKaW5kZXggYjg2Y2M3MDUxMzhjLi5kOGI5NDU1OTZiMDkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19kcnYuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vYm9jaHMvYm9jaHNfZHJ2LmMKQEAgLTcsNiArNyw3IEBACiAjaW5jbHVkZSA8bGlu dXgvc2xhYi5oPgogI2luY2x1ZGUgPGRybS9kcm1fZmJfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJt L2RybV9wcm9iZV9oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2F0b21pY19oZWxwZXIuaD4K IAogI2luY2x1ZGUgImJvY2hzLmgiCiAKQEAgLTE3MSw2ICsxNzIsNyBAQCBzdGF0aWMgdm9pZCBi b2Noc19wY2lfcmVtb3ZlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQogewogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBwY2lfZ2V0X2RydmRhdGEocGRldik7CiAKKwlkcm1fYXRvbWljX2hlbHBlcl9z aHV0ZG93bihkZXYpOwogCWRybV9kZXZfdW5yZWdpc3RlcihkZXYpOwogCWJvY2hzX3VubG9hZChk ZXYpOwogCWRybV9kZXZfcHV0KGRldik7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3678CC76188 for ; Fri, 19 Jul 2019 04:41:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01E552084C for ; Fri, 19 Jul 2019 04:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563511268; bh=NOChr+M9WOR9orhCSmC3TRPJClfJwif6AL58ptimSVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EP9pZIzgzX2QhlezknntTAsYFKdqZZPmUgVjg7MoYiwwwZ7m3KsOm1xXHt2ab+Zef 6FtdeYGS5E7B37Q/CFWH3Ae/JNBZDfmRlQvDVb75QQT3XAD2m/4hkwKkWarenk4GUz Q2eAwtOiuHq76cMMOtiA9LxUP69qt2MGdr3dh8JM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728479AbfGSElG (ORCPT ); Fri, 19 Jul 2019 00:41:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:56414 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726147AbfGSD5G (ORCPT ); Thu, 18 Jul 2019 23:57:06 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2CA1221850; Fri, 19 Jul 2019 03:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508625; bh=NOChr+M9WOR9orhCSmC3TRPJClfJwif6AL58ptimSVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YkTqd2ElFuWeLqHW6VEveWs20pnTPxsyuYcyktLIF0EmLLb9EghRc6c0vRN+pgwcH XgEG2EjWDIpQsIBmUkeEIHnlaraYpOI/+lhxioazyYlpFwrbDl7aCqeCVOZRDIQFDA UBZ3tcohv7VraN3xfAosx20DA+V7R3gdGMZNXJCA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sam Bobroff , Gerd Hoffmann , Sasha Levin , virtualization@lists.linux-foundation.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 009/171] drm/bochs: Fix connector leak during driver unload Date: Thu, 18 Jul 2019 23:54:00 -0400 Message-Id: <20190719035643.14300-9-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sam Bobroff [ Upstream commit 3c6b8625dde82600fd03ad1fcba223f1303ee535 ] When unloading the bochs-drm driver, a warning message is printed by drm_mode_config_cleanup() because a reference is still held to one of the drm_connector structs. Correct this by calling drm_atomic_helper_shutdown() in bochs_pci_remove(). Fixes: 6579c39594ae ("drm/bochs: atomic: switch planes to atomic, wire up helpers.") Signed-off-by: Sam Bobroff Link: http://patchwork.freedesktop.org/patch/msgid/93b363ad62f4938d9ddf3e05b2a61e3f66b2dcd3.1558416473.git.sbobroff@linux.ibm.com Signed-off-by: Gerd Hoffmann Signed-off-by: Sasha Levin --- drivers/gpu/drm/bochs/bochs_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index b86cc705138c..d8b945596b09 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "bochs.h" @@ -171,6 +172,7 @@ static void bochs_pci_remove(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); + drm_atomic_helper_shutdown(dev); drm_dev_unregister(dev); bochs_unload(dev); drm_dev_put(dev); -- 2.20.1