hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau: remove duplicate copy of nv44_graph_class 

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ilia Mirkin 2013-07-29 19:05:16 -04:00 committed by Ben Skeggs
parent ef7d64e5c2
commit c98b819468
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/core/engine/graph/nv40.h
View File

@ -1,6 +1,9 @@
#ifndef __NV40_GRAPH_H__ #ifndef __NV40_GRAPH_H__
#define __NV40_GRAPH_H__ #define __NV40_GRAPH_H__
#include <core/device.h>
#include <core/gpuobj.h>
/* returns 1 if device is one of the nv4x using the 0x4497 object class, /* returns 1 if device is one of the nv4x using the 0x4497 object class,
* helpful to determine a number of other hardware features * helpful to determine a number of other hardware features
*/ */

10
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
View File

@ -22,15 +22,9 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include "nv04.h" #include <engine/graph/nv40.h>
static inline int #include "nv04.h"
nv44_graph_class(struct nv04_instmem_priv *priv)
{
if ((nv_device(priv)->chipset & 0xf0) == 0x60)
return 1;
return !(0x0baf & (1 << (nv_device(priv)->chipset & 0x0f)));
}
static int static int
nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine, nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine,