projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/nouveau/fb: convert to new-style nvkm_subdev
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
subdev
/
fb
/
ramfuc.h
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
index f343682b1387eb9c3f999ee4aceab4d9696d0235..9ef9d6aa3721efae65344565fd55d596609caa91 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
@@
-1,10
+1,11
@@
#ifndef __NVKM_FBRAM_FUC_H__
#define __NVKM_FBRAM_FUC_H__
#ifndef __NVKM_FBRAM_FUC_H__
#define __NVKM_FBRAM_FUC_H__
+#include <subdev/fb.h>
#include <subdev/pmu.h>
struct ramfuc {
struct nvkm_memx *memx;
#include <subdev/pmu.h>
struct ramfuc {
struct nvkm_memx *memx;
- struct nvkm_fb *
p
fb;
+ struct nvkm_fb *fb;
int sequence;
};
int sequence;
};
@@
-54,17
+55,14
@@
ramfuc_reg(u32 addr)
}
static inline int
}
static inline int
-ramfuc_init(struct ramfuc *ram, struct nvkm_fb *
p
fb)
+ramfuc_init(struct ramfuc *ram, struct nvkm_fb *fb)
{
{
- struct nvkm_pmu *pmu = nvkm_pmu(pfb);
- int ret;
-
- ret = nvkm_memx_init(pmu, &ram->memx);
+ int ret = nvkm_memx_init(fb->subdev.device->pmu, &ram->memx);
if (ret)
return ret;
ram->sequence++;
if (ret)
return ret;
ram->sequence++;
- ram->
pfb = p
fb;
+ ram->
fb =
fb;
return 0;
}
return 0;
}
@@
-72,9
+70,9
@@
static inline int
ramfuc_exec(struct ramfuc *ram, bool exec)
{
int ret = 0;
ramfuc_exec(struct ramfuc *ram, bool exec)
{
int ret = 0;
- if (ram->
p
fb) {
+ if (ram->fb) {
ret = nvkm_memx_fini(&ram->memx, exec);
ret = nvkm_memx_fini(&ram->memx, exec);
- ram->
p
fb = NULL;
+ ram->fb = NULL;
}
return ret;
}
}
return ret;
}
@@
-82,8
+80,9
@@
ramfuc_exec(struct ramfuc *ram, bool exec)
static inline u32
ramfuc_rd32(struct ramfuc *ram, struct ramfuc_reg *reg)
{
static inline u32
ramfuc_rd32(struct ramfuc *ram, struct ramfuc_reg *reg)
{
+ struct nvkm_device *device = ram->fb->subdev.device;
if (reg->sequence != ram->sequence)
if (reg->sequence != ram->sequence)
- reg->data = nv
_rd32(ram->pfb
, reg->addr);
+ reg->data = nv
km_rd32(device
, reg->addr);
return reg->data;
}
return reg->data;
}
@@
-144,11
+143,9
@@
ramfuc_train(struct ramfuc *ram)
}
static inline int
}
static inline int
-ramfuc_train_result(struct nvkm_fb *
p
fb, u32 *result, u32 rsize)
+ramfuc_train_result(struct nvkm_fb *fb, u32 *result, u32 rsize)
{
{
- struct nvkm_pmu *pmu = nvkm_pmu(pfb);
-
- return nvkm_memx_train_result(pmu, result, rsize);
+ return nvkm_memx_train_result(fb->subdev.device->pmu, result, rsize);
}
static inline void
}
static inline void
This page took
0.025831 seconds
and
5
git commands to generate.