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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EE47C433FE for ; Tue, 19 Apr 2022 18:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242465AbiDSSPq (ORCPT ); Tue, 19 Apr 2022 14:15:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356435AbiDSSPQ (ORCPT ); Tue, 19 Apr 2022 14:15:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 713783EA81; Tue, 19 Apr 2022 11:12:10 -0700 (PDT) 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 E9B2CB81185; Tue, 19 Apr 2022 18:12:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25BEBC385AC; Tue, 19 Apr 2022 18:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650391927; bh=5rrFm1EwVdW4iFBqfEtRLDN8DJI66xBvMeRdb5iR9zU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bO/fe0WdBAR+Y6Y7LkKJRiWtuPowA+1znTYnObLLcauQ1AIOd7RxBCzT81QdUvkqC /aCCHZqCXzfbvwBimNW5t/NfBRQvawh3jPqVYOsDRakF/HBGNxGK3Z8uP/9xn8HPPG KGM2nLUS75YVKVy/AQFJF+jl4cIoin7STp0fW3bj5gGwupNvshcyZc1ohwaONkIRxE VCR0AOL7EKm0sDSK08A94PhQltlD27dtlciVYB/1pkEIvI4NzLFaV20t3y0NFe0roz MHGJl/4AAyHyH1QvVFlxiDBX7uMGCu9A3PtP5y7geRjkXP2Hnk/mVOmsLZ+efnEcxo TlDpf/T2ZWa+Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Robin Murphy , Rob Clark , Dmitry Baryshkov , Rob Clark , Sasha Levin , sean@poorly.run, airlied@linux.ie, daniel@ffwll.ch, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.17 19/34] drm/msm: Stop using iommu_present() Date: Tue, 19 Apr 2022 14:10:46 -0400 Message-Id: <20220419181104.484667-19-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181104.484667-1-sashal@kernel.org> References: <20220419181104.484667-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 555666e3f960..5959527efc6e 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -427,7 +427,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