openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2011-05-24 14:37:41 +10:00
parent 068da16198
commit 847adea2c7
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/nouveau/nvc0_graph.c
View File

@ -675,13 +675,10 @@ nvc0_graph_create(struct drm_device *dev)
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nvc0_graph_priv *priv; struct nvc0_graph_priv *priv;
int ret, gpc, i; int ret, gpc, i;
u32 fermi;
switch (dev_priv->chipset) { fermi = nvc0_graph_class(dev);
case 0xc0: if (!fermi) {
case 0xc3:
case 0xc4:
break;
default:
NV_ERROR(dev, "PGRAPH: unsupported chipset, please report!\n"); NV_ERROR(dev, "PGRAPH: unsupported chipset, please report!\n");
return 0; return 0;
} }
@ -770,6 +767,10 @@ nvc0_graph_create(struct drm_device *dev)
NVOBJ_CLASS(dev, 0x9039, GR); /* M2MF */ NVOBJ_CLASS(dev, 0x9039, GR); /* M2MF */
NVOBJ_MTHD (dev, 0x9039, 0x0500, nvc0_graph_mthd_page_flip); NVOBJ_MTHD (dev, 0x9039, 0x0500, nvc0_graph_mthd_page_flip);
NVOBJ_CLASS(dev, 0x9097, GR); /* 3D */ 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 */ NVOBJ_CLASS(dev, 0x90c0, GR); /* COMPUTE */
return 0; return 0;

22
drivers/gpu/drm/nouveau/nvc0_graph.h
View File

@ -72,4 +72,26 @@ struct nvc0_graph_chan {
int nvc0_grctx_generate(struct nouveau_channel *); 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 #endif