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=-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 1C252C4363A for ; Tue, 27 Oct 2020 17:13:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9F7721D24 for ; Tue, 27 Oct 2020 17:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603818835; bh=XWLCR1jHUnBLZmGz/xWiUmbIYr0LjSd4mV9PuT4LUTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o9phPYVvG/+EPhjxdmUCYbQsw2tkudF6s9/lm93+jqYfOQPeBPyiPPhMTMlxufkoD r7n6IsMQB9TiEtlkwh7605XCnsEh0sdOt6l2l6eQaJcNqY1JKA+Xvp66CHkPIaWsQ7 HvaSFRBN9g+ynaEtowSb6IJ6nW1KNkiztgMJsjV0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1817157AbgJ0RNw (ORCPT ); Tue, 27 Oct 2020 13:13:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:60566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1784310AbgJ0O7C (ORCPT ); Tue, 27 Oct 2020 10:59:02 -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 746A820715; Tue, 27 Oct 2020 14:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810742; bh=XWLCR1jHUnBLZmGz/xWiUmbIYr0LjSd4mV9PuT4LUTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1o5ESpHy18HdOse815vK+s6dJqKY24XWyS0lct5oT8J/p8SEEph/0FedKeAd4mr4F Zzq8PTrun+P7sOWpRA1SbiukIGxAYG9uiHPGTR1gxLM4gMNv9RQdXaSCd6nbE2OY8g VFUJlnHz4UI6IPG2/87RrE6TI2jFLaWjx78kTubQ= 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.8 216/633] drm/msm/adreno: fix probe without iommu Date: Tue, 27 Oct 2020 14:49:19 +0100 Message-Id: <20201027135532.813939636@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 a74ccc5b8220d..5b5809c0e44b3 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); -- 2.25.1