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

Commit a4cea27b authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

drm/nouveau: share fence structures between nv10+ and nv50 implementations 



We already rely on them having the same fields and layout.

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a624bafb

drivers/gpu/drm/nouveau/nv10_fence.c

+1 −12
Original line number Diff line number Diff line
@@ -27,18 +27,7 @@ 


#include "nouveau_drm.h"

#include "nouveau_dma.h"

#include "nouveau_fence.h"



struct nv10_fence_chan {

	struct nouveau_fence_chan base;

};



struct nv10_fence_priv {

	struct nouveau_fence_priv base;

	struct nouveau_bo *bo;

	spinlock_t lock;

	u32 sequence;

};

#include "nv10_fence.h"



int

nv10_fence_emit(struct nouveau_fence *fence)

drivers/gpu/drm/nouveau/nv10_fence.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#ifndef __NV10_FENCE_H_

#define __NV10_FENCE_H_



#include <core/os.h>

#include "nouveau_fence.h"

#include "nouveau_bo.h"



struct nv10_fence_chan {

	struct nouveau_fence_chan base;

};



struct nv10_fence_priv {

	struct nouveau_fence_priv base;

	struct nouveau_bo *bo;

	spinlock_t lock;

	u32 sequence;

};



#endif

drivers/gpu/drm/nouveau/nv50_fence.c

+4 −15
Original line number Diff line number Diff line
@@ -27,27 +27,16 @@ 


#include "nouveau_drm.h"

#include "nouveau_dma.h"

#include "nouveau_fence.h"

#include "nv10_fence.h"



#include "nv50_display.h"



struct nv50_fence_chan {

	struct nouveau_fence_chan base;

};



struct nv50_fence_priv {

	struct nouveau_fence_priv base;

	struct nouveau_bo *bo;

	spinlock_t lock;

	u32 sequence;

};



static int

nv50_fence_context_new(struct nouveau_channel *chan)

{

	struct drm_device *dev = chan->drm->dev;

	struct nv50_fence_priv *priv = chan->drm->fence;

	struct nv50_fence_chan *fctx;

	struct nv10_fence_priv *priv = chan->drm->fence;

	struct nv10_fence_chan *fctx;

	struct ttm_mem_reg *mem = &priv->bo->bo.mem;

	struct nouveau_object *object;

	int ret, i;
@@ -91,7 +80,7 @@ nv50_fence_context_new(struct nouveau_channel *chan) 
int

nv50_fence_create(struct nouveau_drm *drm)

{

	struct nv50_fence_priv *priv;

	struct nv10_fence_priv *priv;

	int ret = 0;



	priv = drm->fence = kzalloc(sizeof(*priv), GFP_KERNEL);