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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 7DE4AC433EF for ; Tue, 19 Apr 2022 18:13:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C4BE510EF46; Tue, 19 Apr 2022 18:13:32 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA90B10EF29; Tue, 19 Apr 2022 18:13:29 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5CB85B81982; Tue, 19 Apr 2022 18:13:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACFB4C385A7; Tue, 19 Apr 2022 18:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650392008; bh=KEKEDurTHdWIV53bP5ZnmLO8or544bc5KUoNgRMP9Hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M1mt8aKHSJAU5rmV2BPVAm2iImokibOzP5jAAOs7QGHc4RFuTsr5Ss+7+Okre0Xcd HEjhk4sqoCSONvJB5NT13zXaAZ64zDTY+YdVnFlLIbdZsmDidYAbzlKHE+dgyYldr6 cdFbquIVqV9juoUvMI36okV35YRSprqSz5/nxBT4Ov+WdzoV+RKNGvGm7EXt3XmAWW rDs+fioGJ3CDtJquhDBfgIYGplXCsaDRTmzjS0GYrA9arbqDh9Uppgzah5ey9NdR9y vTx44lg4aBgNmB6zYScjraMhodn3iWOLz/yz9Reqbwu8Pz8opZHjOUo5ZL+8HB3/+p 9bMxEnCKbXtyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 15/27] drm/msm: Stop using iommu_present() Date: Tue, 19 Apr 2022 14:12:30 -0400 Message-Id: <20220419181242.485308-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181242.485308-1-sashal@kernel.org> References: <20220419181242.485308-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Sasha Levin , airlied@linux.ie, sean@poorly.run, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Dmitry Baryshkov , freedreno@lists.freedesktop.org, Robin Murphy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Robin Murphy [ Upstream commit e2a88eabb02410267519b838fb9b79f5206769be ] Even if some IOMMU has registered itself on the platform "bus", that doesn't necessarily mean it provides translation for the device we care about. Replace iommu_present() with a more appropriate check. Signed-off-by: Robin Murphy Reviewed-by: Rob Clark Patchwork: https://patchwork.freedesktop.org/patch/480707/ Link: https://lore.kernel.org/r/5ab4f4574d7f3e042261da702d493ee40d003356.1649168268.git.robin.murphy@arm.com Signed-off-by: Dmitry Baryshkov Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index bbf999c66517..d6d40429016d 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -403,7 +403,7 @@ bool msm_use_mmu(struct drm_device *dev) struct msm_drm_private *priv = dev->dev_private; /* a2xx comes with its own MMU */ - return priv->is_a2xx || iommu_present(&platform_bus_type); + return priv->is_a2xx || device_iommu_mapped(dev->dev); } static int msm_init_vram(struct drm_device *dev) -- 2.35.1