summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drm.c
diff options
context:
space:
mode:
authorAlexandre Courbot2015-09-04 12:59:31 +0200
committerBen Skeggs2015-11-03 06:02:18 +0100
commite396ecd178c6c8373e765d78b5b1a29e38837d3a (patch)
treea74a905a0061f90af0ddeb188dcc8fa366e2f657 /drivers/gpu/drm/nouveau/nouveau_drm.c
parentdrm/nouveau/instmem/gk20a: use direct CPU access (diff)
downloadkernel-qcow2-linux-e396ecd178c6c8373e765d78b5b1a29e38837d3a.tar.gz
kernel-qcow2-linux-e396ecd178c6c8373e765d78b5b1a29e38837d3a.tar.xz
kernel-qcow2-linux-e396ecd178c6c8373e765d78b5b1a29e38837d3a.zip
drm/nouveau/platform: allow to specify the IOMMU bit
Current Tegra code taking advantage of the IOMMU assumes a hardcoded value for the IOMMU bit. Make it a platform property instead for flexibility. v2 (Ben Skeggs): remove nvkm dependence on drm structures Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index f93266582f27..1d3ee5179ab8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -1028,13 +1028,14 @@ nouveau_drm_pci_driver = {
};
struct drm_device *
-nouveau_platform_device_create(struct platform_device *pdev,
+nouveau_platform_device_create(const struct nvkm_device_tegra_func *func,
+ struct platform_device *pdev,
struct nvkm_device **pdevice)
{
struct drm_device *drm;
int err;
- err = nvkm_device_tegra_new(pdev, nouveau_config, nouveau_debug,
+ err = nvkm_device_tegra_new(func, pdev, nouveau_config, nouveau_debug,
true, true, ~0ULL, pdevice);
if (err)
goto err_free;