From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA95C6D1AF; Tue, 14 May 2024 11:12:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715685128; cv=none; b=IOxfzXps7xHvWF1GL4/xqO8d0nywu+kjvUApnDQoAwD1bcOgEcmhB3Nssv71+gwPYpQKSkBXxq5/vMubUnzH11esTwTrT4zH1r+4dug0PxiXlV5dpGuMrEGAkF+JZIYwEMdwplDRZEeuuaVVi/kzLdyaucGO6ufQq+Ba6XQ2hxk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715685128; c=relaxed/simple; bh=xM4iq3gbpbPnwXdWS4fR/O55kY/o9ayDMMa5gvBt4k8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hta2MmCDeTJQE8MT2tkTIg2GFp/jElQ8Ethqc3YS3VAUI02UN1J0qJv3EeP17KiZTi1wpKIs+KyfjRDi8B2169l7Im3YdkkBOnXvJZaE1yPH55VUW87HBEvhkzGGEO70mboDM/ynRSiAZuP831YQHSVezUnD8mRJqGKcIxSkLN0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dy24jBjR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dy24jBjR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2ACD6C2BD10; Tue, 14 May 2024 11:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715685128; bh=xM4iq3gbpbPnwXdWS4fR/O55kY/o9ayDMMa5gvBt4k8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dy24jBjRDpWlCr+Co1B4RyAXvFZmakThoCzJN2EbbCnwL3OackZqgCqgKDGNxeytF qQGNbUZPn4zmW5IqUHxG9hn0mfAAZxbMd0pR2my8MThmKQSsOFIbXoUF8mNSt7HpL5 gOj/+c+nGIkyrYBCFhiVM7cQ27F+nQEAIKkWdSHg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jon Hunter , Thierry Reding , Sasha Levin Subject: [PATCH 6.6 142/301] gpu: host1x: Do not setup DMA for virtual devices Date: Tue, 14 May 2024 12:16:53 +0200 Message-ID: <20240514101037.615099959@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101032.219857983@linuxfoundation.org> References: <20240514101032.219857983@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thierry Reding [ Upstream commit 8ab58f6841b19423231c5db3378691ec80c778f8 ] The host1x devices are virtual compound devices and do not perform DMA accesses themselves, so they do not need to be set up for DMA. Ideally we would also not need to set up DMA masks for the virtual devices, but we currently still need those for legacy support on old hardware. Tested-by: Jon Hunter Acked-by: Jon Hunter Signed-off-by: Thierry Reding Link: https://patchwork.freedesktop.org/patch/msgid/20240314154943.2487549-1-thierry.reding@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/host1x/bus.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 84d042796d2e6..3937889fa912d 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -351,11 +351,6 @@ static int host1x_device_uevent(const struct device *dev, return 0; } -static int host1x_dma_configure(struct device *dev) -{ - return of_dma_configure(dev, dev->of_node, true); -} - static const struct dev_pm_ops host1x_device_pm_ops = { .suspend = pm_generic_suspend, .resume = pm_generic_resume, @@ -369,7 +364,6 @@ struct bus_type host1x_bus_type = { .name = "host1x", .match = host1x_device_match, .uevent = host1x_device_uevent, - .dma_configure = host1x_dma_configure, .pm = &host1x_device_pm_ops, }; @@ -458,8 +452,6 @@ static int host1x_device_add(struct host1x *host1x, device->dev.bus = &host1x_bus_type; device->dev.parent = host1x->dev; - of_dma_configure(&device->dev, host1x->dev->of_node, true); - device->dev.dma_parms = &device->dma_parms; dma_set_max_seg_size(&device->dev, UINT_MAX); -- 2.43.0