Re: linux-next: Tree for Sep 19 (drivers/gpu/drm/i915/i915_gem.c)

From: Randy Dunlap
Date: Tue Sep 19 2017 - 11:49:42 EST


On 09/18/17 21:15, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20170918:
>
> Linus' tree still had its build failure for which I reverted a commit.
>
> The drm-intel tree gained conflicts against Linus' tree.
>

on x86_64:

In file included from ../drivers/gpu/drm/i915/i915_gem.c:5342:0:
../drivers/gpu/drm/i915/selftests/mock_gem_device.c: In function 'mock_gem_device':
../drivers/gpu/drm/i915/selftests/mock_gem_device.c:150:20: error: 'struct dev_archdata' has no member named 'iommu'
pdev->dev.archdata.iommu = (void *)-1;
^

when IOMMU_SUPPORT, INTEL_IOMMU, and AMD_IOMMU are not enabled.

struct dev_archdata {
#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU)
void *iommu; /* hook for IOMMU specific extension */
#endif
};



--
~Randy