diff options
| author | Ilia Mirkin | 2013-07-30 01:05:16 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2013-09-04 05:46:19 +0200 |
| commit | c98b81946827fe04c36bfa6bb376ffa739b0c2d0 (patch) | |
| tree | a3700deb1aa156b109e80d9cef0193cb7b8893c2 | |
| parent | drm/nouveau/vdec: implement support for VP3 engines (diff) | |
| download | kernel-qcow2-linux-c98b81946827fe04c36bfa6bb376ffa739b0c2d0.tar.gz kernel-qcow2-linux-c98b81946827fe04c36bfa6bb376ffa739b0c2d0.tar.xz kernel-qcow2-linux-c98b81946827fe04c36bfa6bb376ffa739b0c2d0.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/nv40.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv40.h b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.h index 7da35a4e7970..ad8209377529 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/nv40.h +++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.h @@ -1,6 +1,9 @@ #ifndef __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, * helpful to determine a number of other hardware features */ diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c index 716bf41bc3c1..b10a143787a7 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c @@ -22,15 +22,9 @@ * Authors: Ben Skeggs */ -#include "nv04.h" +#include <engine/graph/nv40.h> -static inline int -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))); -} +#include "nv04.h" static int nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine, |