xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Marcin Slusarz
2012-12-25 17:50:43 +01:00
committed by Ben Skeggs
parent a624bafbf1
commit a4cea27b69
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,18 +27,7 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
#include "nouveau_dma.h" #include "nouveau_dma.h"
#include "nouveau_fence.h" #include "nv10_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;
};
int int
nv10_fence_emit(struct nouveau_fence *fence) nv10_fence_emit(struct nouveau_fence *fence)

19
drivers/gpu/drm/nouveau/nv10_fence.h Normal file
View File

@@ -0,0 +1,19 @@
#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

19
drivers/gpu/drm/nouveau/nv50_fence.c
View File

@@ -27,27 +27,16 @@
#include "nouveau_drm.h" #include "nouveau_drm.h"
#include "nouveau_dma.h" #include "nouveau_dma.h"
#include "nouveau_fence.h" #include "nv10_fence.h"
#include "nv50_display.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 static int
nv50_fence_context_new(struct nouveau_channel *chan) nv50_fence_context_new(struct nouveau_channel *chan)
{ {
struct drm_device *dev = chan->drm->dev; struct drm_device *dev = chan->drm->dev;
struct nv50_fence_priv *priv = chan->drm->fence; struct nv10_fence_priv *priv = chan->drm->fence;
struct nv50_fence_chan *fctx; struct nv10_fence_chan *fctx;
struct ttm_mem_reg *mem = &priv->bo->bo.mem; struct ttm_mem_reg *mem = &priv->bo->bo.mem;
struct nouveau_object *object; struct nouveau_object *object;
int ret, i; int ret, i;
@@ -91,7 +80,7 @@ nv50_fence_context_new(struct nouveau_channel *chan)
int int
nv50_fence_create(struct nouveau_drm *drm) nv50_fence_create(struct nouveau_drm *drm)
{ {
struct nv50_fence_priv *priv; struct nv10_fence_priv *priv;
int ret = 0; int ret = 0;
priv = drm->fence = kzalloc(sizeof(*priv), GFP_KERNEL); priv = drm->fence = kzalloc(sizeof(*priv), GFP_KERNEL);