From patchwork Tue Oct 27 13:48:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312493 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 19F5BC83011 for ; Tue, 27 Oct 2020 15:47:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE30922202 for ; Tue, 27 Oct 2020 15:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813649; bh=3moX06p79H8XExd+yu2Chq3rW1CjysgAOr6DOahlUSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UH6ELobFK/Oky6uTHsptJ2Jhk5NKxgzZWOLGmwTzy12DbTQ7FHlWaVQ0ZHLn0BV32 afJaCuZg5omXMitrxuK0pe5J0Z8Ou3J61TQo2z/cSrVMS5xdK9q8R02CcJheRbWDrJ v9TWfbr4eKPQbCGOR5j62SnL0GcOxKHYAMKO2U5Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1802154AbgJ0Ppr (ORCPT ); Tue, 27 Oct 2020 11:45:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:45962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1798650AbgJ0P3b (ORCPT ); Tue, 27 Oct 2020 11:29:31 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 913D12225E; Tue, 27 Oct 2020 15:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812571; bh=3moX06p79H8XExd+yu2Chq3rW1CjysgAOr6DOahlUSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WD1NDxA8OJpm3550zuSvDr7IeR2EkYuC/EIw5T+H1kDykrKfZ5zq0c4codafNqfZY H3BWrLrwFG56ZH0eOF8OVxydPotg6mfgoMUnaUvj/550me+ZtL5qhCKTF0Z8Uky+6P 9Tm2H1rtmaE8h47XkaOH7b53r48gzzVf0KPmFEnI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luca Weiss , Jordan Crouse , Rob Clark , Sasha Levin Subject: [PATCH 5.9 257/757] drm/msm/adreno: fix probe without iommu Date: Tue, 27 Oct 2020 14:48:27 +0100 Message-Id: <20201027135502.629464305@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luca Weiss [ Upstream commit 0a48db562c6264da2ae8013491efd6e8dc780520 ] The function iommu_domain_alloc returns NULL on platforms without IOMMU such as msm8974. This resulted in PTR_ERR(-ENODEV) being assigned to gpu->aspace so the correct code path wasn't taken. Fixes: ccac7ce373c1 ("drm/msm: Refactor address space initialization") Signed-off-by: Luca Weiss Reviewed-by: Jordan Crouse Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 862dd35b27d3d..6e8bef1a9ea25 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -189,10 +189,16 @@ struct msm_gem_address_space * adreno_iommu_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev) { - struct iommu_domain *iommu = iommu_domain_alloc(&platform_bus_type); - struct msm_mmu *mmu = msm_iommu_new(&pdev->dev, iommu); + struct iommu_domain *iommu; + struct msm_mmu *mmu; struct msm_gem_address_space *aspace; + iommu = iommu_domain_alloc(&platform_bus_type); + if (!iommu) + return NULL; + + mmu = msm_iommu_new(&pdev->dev, iommu); + aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M, 0xffffffff - SZ_16M);