Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cd614ba authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

gpu: host1x: Do not setup DMA for virtual devices 



[ 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: default avatarJon Hunter <jonathanh@nvidia.com>
Acked-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240314154943.2487549-1-thierry.reding@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a6601878

drivers/gpu/host1x/bus.c

+0 −8
Original line number Diff line number Diff line
@@ -335,11 +335,6 @@ static int host1x_device_uevent(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,
@@ -353,7 +348,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,

};
@@ -442,8 +436,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, SZ_4M);