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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 4D072C4742C for ; Tue, 3 Nov 2020 21:47:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2D632245A for ; Tue, 3 Nov 2020 21:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604440048; bh=wy10irmcQSAMQddqzmPHl+tca+hIUrh+n/muGSdINOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oUDuAYHK6C/Lqrr7y9xPixtu89Ud2euoxvXbGY5xnTW3qZwf0iYHEVtgbpU4oeCuB 5gNA6uIzfseIwOvu62hstCVbHQP6SCSOVGBqTyLFrP+JPQWy9wmKHc2fCscyIhiLqE cUbXEaH2nW8eRPwFVUPdPxsTNbSNlagys3XDDUdM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731885AbgKCVr0 (ORCPT ); Tue, 3 Nov 2020 16:47:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:46022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731267AbgKCUvM (ORCPT ); Tue, 3 Nov 2020 15:51:12 -0500 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 31D7520719; Tue, 3 Nov 2020 20:51:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436671; bh=wy10irmcQSAMQddqzmPHl+tca+hIUrh+n/muGSdINOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hXmiWDa6ZVkC+rgEf9LF9AhqIC9sarAolVihTneI1jnApPrc5AFoc9pwQNNMBakYt YcO1BJcpw7N/y9qWrRmARoHNDcIW18m3o26YPTruHi6ZoU8ewgUE4XQY9/qlhmg7Z0 cnOZFv6F4Hfek6V/Wus7v7+DZB0/od5Ki2vUysPk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matias Zuniga , Thierry Reding , Dmitry Osipenko , Krzysztof Kozlowski Subject: [PATCH 5.9 353/391] memory: tegra: Remove GPU from DRM IOMMU group Date: Tue, 3 Nov 2020 21:36:44 +0100 Message-Id: <20201103203410.956450253@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@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: stable@vger.kernel.org From: Thierry Reding commit ea90f66f2a8629dde07328df0b8314aae5e54a47 upstream. Commit 63a613fdb16c ("memory: tegra: Add gr2d and gr3d to DRM IOMMU group") added the GPU to the DRM IOMMU group, which doesn't make any sense. This causes problems when Nouveau tries to attach to the SMMU and causes it to fall back to using the DMA API. Remove the GPU from the DRM groups to restore the old behaviour. The GPU should always have its own IOMMU domain to make sure it can map buffers into contiguous chunks (for big page support) without getting in the way of mappings from the DRM group. Cc: Fixes: 63a613fdb16c ("memory: tegra: Add gr2d and gr3d to DRM IOMMU group") Reported-by: Matias Zuniga Signed-off-by: Thierry Reding Reviewed-by: Dmitry Osipenko Link: https://lore.kernel.org/r/20200901153248.1831263-1-thierry.reding@gmail.com Signed-off-by: Krzysztof Kozlowski Signed-off-by: Greg Kroah-Hartman --- drivers/memory/tegra/tegra124.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/memory/tegra/tegra124.c +++ b/drivers/memory/tegra/tegra124.c @@ -957,7 +957,6 @@ static const struct tegra_smmu_swgroup t static const unsigned int tegra124_group_drm[] = { TEGRA_SWGROUP_DC, TEGRA_SWGROUP_DCB, - TEGRA_SWGROUP_GPU, TEGRA_SWGROUP_VIC, };