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

Commit e396ecd1 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

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: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 69c49382

drivers/gpu/drm/nouveau/include/nvif/os.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/agp_backend.h>

#include <linux/reset.h>

#include <linux/iommu.h>

#include <linux/of_device.h>



#include <asm/unaligned.h>

drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h

+12 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <core/mm.h>



struct nvkm_device_tegra {

	const struct nvkm_device_tegra_func *func;

	struct nvkm_device device;

	struct platform_device *pdev;

	int irq;
@@ -28,7 +29,17 @@ struct nvkm_device_tegra { 
	int gpu_speedo;

};



int nvkm_device_tegra_new(struct platform_device *,

struct nvkm_device_tegra_func {

	/*

	 * If an IOMMU is used, indicates which address bit will trigger a

	 * IOMMU translation when set (when this bit is not set, IOMMU is

	 * bypassed). A value of 0 means an IOMMU is never used.

	 */

	u8 iommu_bit;

};



int nvkm_device_tegra_new(const struct nvkm_device_tegra_func *,

			  struct platform_device *,

			  const char *cfg, const char *dbg,

			  bool detect, bool mmio, u64 subdev_mask,

			  struct nvkm_device **);

drivers/gpu/drm/nouveau/nouveau_drm.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/nouveau_drm.h

+4 −1
Original line number Diff line number Diff line
@@ -178,8 +178,11 @@ nouveau_drm(struct drm_device *dev) 
int nouveau_pmops_suspend(struct device *);

int nouveau_pmops_resume(struct device *);



#include <nvkm/core/tegra.h>



struct drm_device *

nouveau_platform_device_create(struct platform_device *, struct nvkm_device **);

nouveau_platform_device_create(const struct nvkm_device_tegra_func *,

			       struct platform_device *, struct nvkm_device **);

void nouveau_drm_device_remove(struct drm_device *dev);



#define NV_PRINTK(l,c,f,a...) do {                                             \

drivers/gpu/drm/nouveau/nouveau_platform.c

+16 −3
Original line number Diff line number Diff line
@@ -23,11 +23,14 @@ 


static int nouveau_platform_probe(struct platform_device *pdev)

{

	const struct nvkm_device_tegra_func *func;

	struct nvkm_device *device;

	struct drm_device *drm;

	int ret;



	drm = nouveau_platform_device_create(pdev, &device);

	func = of_device_get_match_data(&pdev->dev);



	drm = nouveau_platform_device_create(func, pdev, &device);

	if (IS_ERR(drm))

		return PTR_ERR(drm);
@@ -48,9 +51,19 @@ static int nouveau_platform_remove(struct platform_device *pdev) 
}



#if IS_ENABLED(CONFIG_OF)

static const struct nvkm_device_tegra_func gk20a_platform_data = {

	.iommu_bit = 34,

};



static const struct of_device_id nouveau_platform_match[] = {

	{ .compatible = "nvidia,gk20a" },

	{ .compatible = "nvidia,gm20b" },

	{

		.compatible = "nvidia,gk20a",

		.data = &gk20a_platform_data,

	},

	{

		.compatible = "nvidia,gm20b",

		.data = &gk20a_platform_data,

	},

	{ }

};