Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/nouveau: remove duplicate copy of nv44_graph_class 



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

drivers/gpu/drm/nouveau/core/engine/graph/nv40.h

+3 −0
Original line number Original line Diff line number Diff line 
#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

 */

 */

drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -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,