Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
294af04b
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
161
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
294af04b
编写于
3月 11, 2016
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/core: add nvenc plumbing
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
c0c914ec
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
41 addition
and
21 deletion
+41
-21
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+7
-0
drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
+4
-0
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
+2
-0
drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+25
-21
drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild
drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild
+1
-0
未找到文件。
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
浏览文件 @
294af04b
...
...
@@ -46,6 +46,11 @@ enum nvkm_devidx {
NVKM_ENGINE_MSPDEC
,
NVKM_ENGINE_MSPPP
,
NVKM_ENGINE_MSVLD
,
NVKM_ENGINE_NVENC0
,
NVKM_ENGINE_NVENC1
,
NVKM_ENGINE_NVENC_LAST
=
NVKM_ENGINE_NVENC1
,
NVKM_ENGINE_PM
,
NVKM_ENGINE_SEC
,
NVKM_ENGINE_SW
,
...
...
@@ -141,6 +146,7 @@ struct nvkm_device {
struct
nvkm_engine
*
mspdec
;
struct
nvkm_engine
*
msppp
;
struct
nvkm_engine
*
msvld
;
struct
nvkm_engine
*
nvenc
[
2
];
struct
nvkm_pm
*
pm
;
struct
nvkm_engine
*
sec
;
struct
nvkm_sw
*
sw
;
...
...
@@ -208,6 +214,7 @@ struct nvkm_device_chip {
int
(
*
mspdec
)(
struct
nvkm_device
*
,
int
idx
,
struct
nvkm_engine
**
);
int
(
*
msppp
)(
struct
nvkm_device
*
,
int
idx
,
struct
nvkm_engine
**
);
int
(
*
msvld
)(
struct
nvkm_device
*
,
int
idx
,
struct
nvkm_engine
**
);
int
(
*
nvenc
[
2
])(
struct
nvkm_device
*
,
int
idx
,
struct
nvkm_engine
**
);
int
(
*
pm
)(
struct
nvkm_device
*
,
int
idx
,
struct
nvkm_pm
**
);
int
(
*
sec
)(
struct
nvkm_device
*
,
int
idx
,
struct
nvkm_engine
**
);
int
(
*
sw
)(
struct
nvkm_device
*
,
int
idx
,
struct
nvkm_sw
**
);
...
...
drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
0 → 100644
浏览文件 @
294af04b
#ifndef __NVKM_NVENC_H__
#define __NVKM_NVENC_H__
#include <core/engine.h>
#endif
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
浏览文件 @
294af04b
...
...
@@ -67,6 +67,8 @@ nvkm_subdev_name[NVKM_SUBDEV_NR] = {
[
NVKM_ENGINE_MSPDEC
]
=
"mspdec"
,
[
NVKM_ENGINE_MSPPP
]
=
"msppp"
,
[
NVKM_ENGINE_MSVLD
]
=
"msvld"
,
[
NVKM_ENGINE_NVENC0
]
=
"nvenc0"
,
[
NVKM_ENGINE_NVENC1
]
=
"nvenc1"
,
[
NVKM_ENGINE_PM
]
=
"pm"
,
[
NVKM_ENGINE_SEC
]
=
"sec"
,
[
NVKM_ENGINE_SW
]
=
"sw"
,
...
...
drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
浏览文件 @
294af04b
...
...
@@ -14,6 +14,7 @@ include $(src)/nvkm/engine/msenc/Kbuild
include $(src)/nvkm/engine/mspdec/Kbuild
include $(src)/nvkm/engine/msppp/Kbuild
include $(src)/nvkm/engine/msvld/Kbuild
include $(src)/nvkm/engine/nvenc/Kbuild
include $(src)/nvkm/engine/pm/Kbuild
include $(src)/nvkm/engine/sec/Kbuild
include $(src)/nvkm/engine/sw/Kbuild
...
...
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
浏览文件 @
294af04b
...
...
@@ -2167,27 +2167,29 @@ nvkm_device_engine(struct nvkm_device *device, int index)
switch
(
index
)
{
#define _(n,p,m) case NVKM_ENGINE_##n: if (p) return (m); break
_
(
BSP
,
device
->
bsp
,
device
->
bsp
);
_
(
CE0
,
device
->
ce
[
0
]
,
device
->
ce
[
0
]);
_
(
CE1
,
device
->
ce
[
1
]
,
device
->
ce
[
1
]);
_
(
CE2
,
device
->
ce
[
2
]
,
device
->
ce
[
2
]);
_
(
CIPHER
,
device
->
cipher
,
device
->
cipher
);
_
(
DISP
,
device
->
disp
,
&
device
->
disp
->
engine
);
_
(
DMAOBJ
,
device
->
dma
,
&
device
->
dma
->
engine
);
_
(
FIFO
,
device
->
fifo
,
&
device
->
fifo
->
engine
);
_
(
GR
,
device
->
gr
,
&
device
->
gr
->
engine
);
_
(
IFB
,
device
->
ifb
,
device
->
ifb
);
_
(
ME
,
device
->
me
,
device
->
me
);
_
(
MPEG
,
device
->
mpeg
,
device
->
mpeg
);
_
(
MSENC
,
device
->
msenc
,
device
->
msenc
);
_
(
MSPDEC
,
device
->
mspdec
,
device
->
mspdec
);
_
(
MSPPP
,
device
->
msppp
,
device
->
msppp
);
_
(
MSVLD
,
device
->
msvld
,
device
->
msvld
);
_
(
PM
,
device
->
pm
,
&
device
->
pm
->
engine
);
_
(
SEC
,
device
->
sec
,
device
->
sec
);
_
(
SW
,
device
->
sw
,
&
device
->
sw
->
engine
);
_
(
VIC
,
device
->
vic
,
device
->
vic
);
_
(
VP
,
device
->
vp
,
device
->
vp
);
_
(
BSP
,
device
->
bsp
,
device
->
bsp
);
_
(
CE0
,
device
->
ce
[
0
]
,
device
->
ce
[
0
]);
_
(
CE1
,
device
->
ce
[
1
]
,
device
->
ce
[
1
]);
_
(
CE2
,
device
->
ce
[
2
]
,
device
->
ce
[
2
]);
_
(
CIPHER
,
device
->
cipher
,
device
->
cipher
);
_
(
DISP
,
device
->
disp
,
&
device
->
disp
->
engine
);
_
(
DMAOBJ
,
device
->
dma
,
&
device
->
dma
->
engine
);
_
(
FIFO
,
device
->
fifo
,
&
device
->
fifo
->
engine
);
_
(
GR
,
device
->
gr
,
&
device
->
gr
->
engine
);
_
(
IFB
,
device
->
ifb
,
device
->
ifb
);
_
(
ME
,
device
->
me
,
device
->
me
);
_
(
MPEG
,
device
->
mpeg
,
device
->
mpeg
);
_
(
MSENC
,
device
->
msenc
,
device
->
msenc
);
_
(
MSPDEC
,
device
->
mspdec
,
device
->
mspdec
);
_
(
MSPPP
,
device
->
msppp
,
device
->
msppp
);
_
(
MSVLD
,
device
->
msvld
,
device
->
msvld
);
_
(
NVENC0
,
device
->
nvenc
[
0
],
device
->
nvenc
[
0
]);
_
(
NVENC1
,
device
->
nvenc
[
1
],
device
->
nvenc
[
1
]);
_
(
PM
,
device
->
pm
,
&
device
->
pm
->
engine
);
_
(
SEC
,
device
->
sec
,
device
->
sec
);
_
(
SW
,
device
->
sw
,
&
device
->
sw
->
engine
);
_
(
VIC
,
device
->
vic
,
device
->
vic
);
_
(
VP
,
device
->
vp
,
device
->
vp
);
#undef _
default:
WARN_ON
(
1
);
...
...
@@ -2616,6 +2618,8 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
_
(
NVKM_ENGINE_MSPDEC
,
mspdec
);
_
(
NVKM_ENGINE_MSPPP
,
msppp
);
_
(
NVKM_ENGINE_MSVLD
,
msvld
);
_
(
NVKM_ENGINE_NVENC0
,
nvenc
[
0
]);
_
(
NVKM_ENGINE_NVENC1
,
nvenc
[
1
]);
_
(
NVKM_ENGINE_PM
,
pm
);
_
(
NVKM_ENGINE_SEC
,
sec
);
_
(
NVKM_ENGINE_SW
,
sw
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
浏览文件 @
294af04b
...
...
@@ -36,6 +36,7 @@
#include <engine/mspdec.h>
#include <engine/msppp.h>
#include <engine/msvld.h>
#include <engine/nvenc.h>
#include <engine/pm.h>
#include <engine/sec.h>
#include <engine/sw.h>
...
...
drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild
0 → 100644
浏览文件 @
294af04b
#nvkm-y += nvkm/engine/nvenc/base.o
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录