Commit 847adea2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvc0/gr: macro to determine fermi class, will use it in a few places 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 068da161

drivers/gpu/drm/nouveau/nvc0_graph.c

+7 −6
Original line number Diff line number Diff line
@@ -675,13 +675,10 @@ nvc0_graph_create(struct drm_device *dev) 
	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nvc0_graph_priv *priv;

	int ret, gpc, i;

	u32 fermi;



	switch (dev_priv->chipset) {

	case 0xc0:

	case 0xc3:

	case 0xc4:

		break;

	default:

	fermi = nvc0_graph_class(dev);

	if (!fermi) {

		NV_ERROR(dev, "PGRAPH: unsupported chipset, please report!\n");

		return 0;

	}
@@ -770,6 +767,10 @@ nvc0_graph_create(struct drm_device *dev) 
	NVOBJ_CLASS(dev, 0x9039, GR); /* M2MF */

	NVOBJ_MTHD (dev, 0x9039, 0x0500, nvc0_graph_mthd_page_flip);

	NVOBJ_CLASS(dev, 0x9097, GR); /* 3D */

	if (fermi >= 0x9197)

		NVOBJ_CLASS(dev, 0x9197, GR); /* 3D (NVC1-) */

	if (fermi >= 0x9297)

		NVOBJ_CLASS(dev, 0x9297, GR); /* 3D (NVC8-) */

	NVOBJ_CLASS(dev, 0x90c0, GR); /* COMPUTE */

	return 0;

drivers/gpu/drm/nouveau/nvc0_graph.h

+22 −0
Original line number Diff line number Diff line
@@ -72,4 +72,26 @@ struct nvc0_graph_chan { 


int nvc0_grctx_generate(struct nouveau_channel *);



/* nvc0_graph.c uses this also to determine supported chipsets */

static inline u32

nvc0_graph_class(struct drm_device *dev)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;



	switch (dev_priv->chipset) {

	case 0xc0:

	case 0xc3:

	case 0xc4:

		return 0x9097;

#if 0

	case 0xc1:

		return 0x9197;

	case 0xc8:

		return 0x9297;

#endif

	default:

		return 0;

	}

}



#endif