Commit 4019aaa2 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nv50-/devinit: prevent use of engines marked as disabled by hw/vbios 



Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f0d13e3a

drivers/gpu/drm/nouveau/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -72,7 +72,10 @@ nouveau-y += core/subdev/devinit/nv10.o 
nouveau-y += core/subdev/devinit/nv1a.o

nouveau-y += core/subdev/devinit/nv20.o

nouveau-y += core/subdev/devinit/nv50.o

nouveau-y += core/subdev/devinit/nv84.o

nouveau-y += core/subdev/devinit/nv98.o

nouveau-y += core/subdev/devinit/nva3.o

nouveau-y += core/subdev/devinit/nvaf.o

nouveau-y += core/subdev/devinit/nvc0.o

nouveau-y += core/subdev/fb/base.o

nouveau-y += core/subdev/fb/nv04.o

drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c

+0 −6
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ nvc0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nvc0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000100)

		return -ENODEV;



	ret = nouveau_falcon_create(parent, engine, oclass, 0x104000, true,

				    "PCE0", "copy0", &priv);

	*pobject = nv_object(priv);
@@ -133,9 +130,6 @@ nvc0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nvc0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000200)

		return -ENODEV;



	ret = nouveau_falcon_create(parent, engine, oclass, 0x105000, true,

				    "PCE1", "copy1", &priv);

	*pobject = nv_object(priv);

drivers/gpu/drm/nouveau/core/engine/copy/nve0.c

+0 −6
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ nve0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nve0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000100)

		return -ENODEV;



	ret = nouveau_engine_create(parent, engine, oclass, true,

				    "PCE0", "copy0", &priv);

	*pobject = nv_object(priv);
@@ -112,9 +109,6 @@ nve0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nve0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000200)

		return -ENODEV;



	ret = nouveau_engine_create(parent, engine, oclass, true,

				    "PCE1", "copy1", &priv);

	*pobject = nv_object(priv);

drivers/gpu/drm/nouveau/core/engine/device/nv50.c

+10 −10
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -118,7 +118,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -146,7 +146,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv50_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv50_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -174,7 +174,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -202,7 +202,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv94_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -230,7 +230,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -258,7 +258,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv84_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -286,7 +286,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nvaa_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -314,7 +314,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nvaa_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv50_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv98_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
@@ -430,7 +430,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nva3_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvaf_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv98_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv94_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

+0 −3
Original line number Diff line number Diff line
@@ -967,9 +967,6 @@ nvd0_disp_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	int heads = nv_rd32(parent, 0x022448);

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000001)

		return -ENODEV;



	ret = nouveau_disp_create(parent, engine, oclass, heads,

				  "PDISP", "display", &priv);

	*pobject = nv_object(priv);