Message ID | d7bc49bfda25a7ea19dc574f8e212cd9e42bf2e2.1637671820.git.robin.murphy@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/9] gpu: host1x: Add missing DMA API include | expand |
On 2021-11-23 14:10, Robin Murphy wrote: > Host1x seems to be relying on picking up dma-mapping.h transitively from > iova.h, which has no reason to include it in the first place. Fix the > former issue before we totally break things by fixing the latter one. > > CC: Thierry Reding <thierry.reding@gmail.com> > CC: Mikko Perttunen <mperttunen@nvidia.com> > CC: dri-devel@lists.freedesktop.org > CC: linux-tegra@vger.kernel.org > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > > Feel free to pick this into drm-misc-next or drm-misc-fixes straight > away if that suits - it's only to avoid a build breakage once the rest > of the series gets queued. Bah, seems like tegra-vic needs the same treatment too, but wasn't in my local config. Should I squash that into a respin of this patch on the grounds of being vaguely related, or would you prefer it separate? (Either way I'll wait a little while to see if the buildbots uncover any more...) Cheers, Robin. > drivers/gpu/host1x/bus.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c > index 218e3718fd68..881fad5c3307 100644 > --- a/drivers/gpu/host1x/bus.c > +++ b/drivers/gpu/host1x/bus.c > @@ -5,6 +5,7 @@ > */ > > #include <linux/debugfs.h> > +#include <linux/dma-mapping.h> > #include <linux/host1x.h> > #include <linux/of.h> > #include <linux/seq_file.h> >
Hi Robin, On Wed, Nov 24, 2021 at 02:05:15PM +0000, Robin Murphy wrote: > Bah, seems like tegra-vic needs the same treatment too, but wasn't in my > local config. Should I squash that into a respin of this patch on the > grounds of being vaguely related, or would you prefer it separate? In case this fix gets queued in the iommu-tree too, please put it all in one patch. Thanks, Joerg
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 218e3718fd68..881fad5c3307 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -5,6 +5,7 @@ */ #include <linux/debugfs.h> +#include <linux/dma-mapping.h> #include <linux/host1x.h> #include <linux/of.h> #include <linux/seq_file.h>
Host1x seems to be relying on picking up dma-mapping.h transitively from iova.h, which has no reason to include it in the first place. Fix the former issue before we totally break things by fixing the latter one. CC: Thierry Reding <thierry.reding@gmail.com> CC: Mikko Perttunen <mperttunen@nvidia.com> CC: dri-devel@lists.freedesktop.org CC: linux-tegra@vger.kernel.org Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- Feel free to pick this into drm-misc-next or drm-misc-fixes straight away if that suits - it's only to avoid a build breakage once the rest of the series gets queued. Robin. drivers/gpu/host1x/bus.c | 1 + 1 file changed, 1 insertion(+)