From patchwork Fri Dec 3 08:55:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yannick Fertre X-Patchwork-Id: 12694624 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 532A8C433F5 for ; Fri, 3 Dec 2021 08:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Q8bdOOuPFZ8aVWAWBo5a30WtqkutQ/yQ8zoVnOqmBJw=; b=ogTbUTBklmgShV EbDjPGJKgwOFOfuf8wvBDMWEzrKAKjm90IFOirsMmfEQUquszTb+WzDNdI1Ut+2xgnSP0/Sos9Gt7 T6B5A7Gn9HWQwTOOZq010kdrMux8ZmbbqaGVaJ+wJCG+JAYUj9+3kRrq+tpDcZo+GyBMQf8lyl7/E dlxR8QguDtMiYaktZLUAXe3uRElKYhpHT8gnsNMdky1uOr2J+vnA7RZTb2gZv7MebdvhLEUTcuXwg zpmArx+w1ZS9uUqikuEwe6J+DI6G27D6XxnOm261cySIekamHwNUO0oWA7gc5hwDIdq2IDjfIsvoI ah2+GmOGUjC5K+eXtQfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mt4Md-00EuEw-TQ; Fri, 03 Dec 2021 08:56:20 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mt4Ma-00EuDf-AV for linux-arm-kernel@lists.infradead.org; Fri, 03 Dec 2021 08:56:18 +0000 Received: from pps.filterd (m0288072.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1B380wFr003800; Fri, 3 Dec 2021 09:56:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : subject : date : message-id : mime-version : content-type; s=selector1; bh=cmrBGM+3iRDXCSmRYdnfWthI/23p1rdwmYTRmVd+4vU=; b=ARnTBzVXIrrf6iGM5r+xo/fE9mIWMIonWvY/3+APbbe1xupDuG48rDXU5juEFBH7wXFn K91xhp8iUojPsNllkevKqpSyaQtt9t6hAO8K4Y4nk5+d4maPkOoiTsVygi2Cy+OVlYw9 TA20PgjPKeBJcw+Xi9Kij55fSdd9/ncvla1BqKF5uWxdUwvySF+XtJggJA6maJTW4LfE q6FhXf2eG5vK6ymd20vpRg2M2Xgbm+z6j4prA5pX5WtxSF7xRWNnMMzMA4mvEqJ4qQHJ g5LKGjFTBcF+NPb9UpHT68MWKFIn3SQ/O94AzKaol8Q+ku1E2CfMZfYlWbpuoXNkevt6 kg== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3cpxs3mrep-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Dec 2021 09:56:06 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8723210002A; Fri, 3 Dec 2021 09:56:04 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 75ABC226FAF; Fri, 3 Dec 2021 09:56:04 +0100 (CET) Received: from localhost (10.75.127.47) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Fri, 3 Dec 2021 09:56:03 +0100 From: Yannick Fertre To: Yannick Fertre , Philippe Cornu , Raphael Gallais-Pou , David Airlie , Daniel Vetter , Maxime Coquelin , Alexandre Torgue , , , , Subject: [PATCH] drm/stm: remove conflicting framebuffers Date: Fri, 3 Dec 2021 09:55:12 +0100 Message-ID: <20211203085512.11127-1-yannick.fertre@foss.st.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.75.127.47] X-ClientProxiedBy: SFHDAG1NODE3.st.com (10.75.127.3) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-03_05,2021-12-02_01,2021-12-02_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211203_005617_252789_19A5100A X-CRM114-Status: GOOD ( 15.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In case of using simplefb or another conflicting framebuffer, call drm_aperture_remove_framebuffers() to remove memory allocated. Signed-off-by: Yannick Fertre --- drivers/gpu/drm/stm/drv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c index 222869b232ae..5ba46f70f081 100644 --- a/drivers/gpu/drm/stm/drv.c +++ b/drivers/gpu/drm/stm/drv.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -193,6 +194,10 @@ static int stm_drm_platform_probe(struct platform_device *pdev) if (ret) goto err_put; + ret = drm_aperture_remove_framebuffers(false, &drv_driver); + if (ret) + goto err_put; + ret = drm_dev_register(ddev, 0); if (ret) goto err_put;