Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
954f9798
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
954f9798
编写于
1月 17, 2019
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/fault/tu102: rename implementation from tu104
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
ef7664d9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
24 addition
and
24 deletion
+24
-24
drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+3
-3
drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c
drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c
+19
-19
未找到文件。
drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
浏览文件 @
954f9798
...
...
@@ -30,5 +30,5 @@ struct nvkm_fault_data {
int
gp100_fault_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fault
**
);
int
gv100_fault_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fault
**
);
int
tu10
4
_fault_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fault
**
);
int
tu10
2
_fault_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fault
**
);
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
浏览文件 @
954f9798
...
...
@@ -2441,7 +2441,7 @@ nv162_chipset = {
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
tu102_devinit_new
,
.
fault
=
tu10
4
_fault_new
,
.
fault
=
tu10
2
_fault_new
,
.
fb
=
gv100_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
gpio
=
gk104_gpio_new
,
...
...
@@ -2473,7 +2473,7 @@ nv164_chipset = {
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
tu102_devinit_new
,
.
fault
=
tu10
4
_fault_new
,
.
fault
=
tu10
2
_fault_new
,
.
fb
=
gv100_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
gpio
=
gk104_gpio_new
,
...
...
@@ -2505,7 +2505,7 @@ nv166_chipset = {
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
tu102_devinit_new
,
.
fault
=
tu10
4
_fault_new
,
.
fault
=
tu10
2
_fault_new
,
.
fb
=
gv100_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
gpio
=
gk104_gpio_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
浏览文件 @
954f9798
nvkm-y += nvkm/subdev/fault/base.o
nvkm-y += nvkm/subdev/fault/gp100.o
nvkm-y += nvkm/subdev/fault/gv100.o
nvkm-y += nvkm/subdev/fault/tu10
4
.o
nvkm-y += nvkm/subdev/fault/tu10
2
.o
drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu10
4
.c
→
drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu10
2
.c
浏览文件 @
954f9798
...
...
@@ -28,7 +28,7 @@
#include <nvif/class.h>
static
void
tu10
4
_fault_buffer_intr
(
struct
nvkm_fault_buffer
*
buffer
,
bool
enable
)
tu10
2
_fault_buffer_intr
(
struct
nvkm_fault_buffer
*
buffer
,
bool
enable
)
{
/*XXX: Earlier versions of RM touched the old regs on Turing,
* which don't appear to actually work anymore, but newer
...
...
@@ -37,7 +37,7 @@ tu104_fault_buffer_intr(struct nvkm_fault_buffer *buffer, bool enable)
}
static
void
tu10
4
_fault_buffer_fini
(
struct
nvkm_fault_buffer
*
buffer
)
tu10
2
_fault_buffer_fini
(
struct
nvkm_fault_buffer
*
buffer
)
{
struct
nvkm_device
*
device
=
buffer
->
fault
->
subdev
.
device
;
const
u32
foff
=
buffer
->
id
*
0x20
;
...
...
@@ -45,7 +45,7 @@ tu104_fault_buffer_fini(struct nvkm_fault_buffer *buffer)
}
static
void
tu10
4
_fault_buffer_init
(
struct
nvkm_fault_buffer
*
buffer
)
tu10
2
_fault_buffer_init
(
struct
nvkm_fault_buffer
*
buffer
)
{
struct
nvkm_device
*
device
=
buffer
->
fault
->
subdev
.
device
;
const
u32
foff
=
buffer
->
id
*
0x20
;
...
...
@@ -57,7 +57,7 @@ tu104_fault_buffer_init(struct nvkm_fault_buffer *buffer)
}
static
void
tu10
4
_fault_buffer_info
(
struct
nvkm_fault_buffer
*
buffer
)
tu10
2
_fault_buffer_info
(
struct
nvkm_fault_buffer
*
buffer
)
{
struct
nvkm_device
*
device
=
buffer
->
fault
->
subdev
.
device
;
const
u32
foff
=
buffer
->
id
*
0x20
;
...
...
@@ -70,7 +70,7 @@ tu104_fault_buffer_info(struct nvkm_fault_buffer *buffer)
}
static
void
tu10
4
_fault_intr_fault
(
struct
nvkm_fault
*
fault
)
tu10
2
_fault_intr_fault
(
struct
nvkm_fault
*
fault
)
{
struct
nvkm_subdev
*
subdev
=
&
fault
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
...
...
@@ -96,14 +96,14 @@ tu104_fault_intr_fault(struct nvkm_fault *fault)
}
static
void
tu10
4
_fault_intr
(
struct
nvkm_fault
*
fault
)
tu10
2
_fault_intr
(
struct
nvkm_fault
*
fault
)
{
struct
nvkm_subdev
*
subdev
=
&
fault
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
u32
stat
=
nvkm_rd32
(
device
,
0xb83094
);
if
(
stat
&
0x80000000
)
{
tu10
4
_fault_intr_fault
(
fault
);
tu10
2
_fault_intr_fault
(
fault
);
nvkm_wr32
(
device
,
0xb83094
,
0x80000000
);
stat
&=
~
0x80000000
;
}
...
...
@@ -129,7 +129,7 @@ tu104_fault_intr(struct nvkm_fault *fault)
}
static
void
tu10
4
_fault_fini
(
struct
nvkm_fault
*
fault
)
tu10
2
_fault_fini
(
struct
nvkm_fault
*
fault
)
{
nvkm_notify_put
(
&
fault
->
nrpfb
);
if
(
fault
->
buffer
[
0
])
...
...
@@ -138,7 +138,7 @@ tu104_fault_fini(struct nvkm_fault *fault)
}
static
void
tu10
4
_fault_init
(
struct
nvkm_fault
*
fault
)
tu10
2
_fault_init
(
struct
nvkm_fault
*
fault
)
{
/*XXX: enable priv faults */
fault
->
func
->
buffer
.
init
(
fault
->
buffer
[
0
]);
...
...
@@ -146,22 +146,22 @@ tu104_fault_init(struct nvkm_fault *fault)
}
static
const
struct
nvkm_fault_func
tu10
4
_fault
=
{
tu10
2
_fault
=
{
.
oneinit
=
gv100_fault_oneinit
,
.
init
=
tu10
4
_fault_init
,
.
fini
=
tu10
4
_fault_fini
,
.
intr
=
tu10
4
_fault_intr
,
.
init
=
tu10
2
_fault_init
,
.
fini
=
tu10
2
_fault_fini
,
.
intr
=
tu10
2
_fault_intr
,
.
buffer
.
nr
=
2
,
.
buffer
.
entry_size
=
32
,
.
buffer
.
info
=
tu10
4
_fault_buffer_info
,
.
buffer
.
init
=
tu10
4
_fault_buffer_init
,
.
buffer
.
fini
=
tu10
4
_fault_buffer_fini
,
.
buffer
.
intr
=
tu10
4
_fault_buffer_intr
,
.
buffer
.
info
=
tu10
2
_fault_buffer_info
,
.
buffer
.
init
=
tu10
2
_fault_buffer_init
,
.
buffer
.
fini
=
tu10
2
_fault_buffer_fini
,
.
buffer
.
intr
=
tu10
2
_fault_buffer_intr
,
};
int
tu10
4
_fault_new
(
struct
nvkm_device
*
device
,
int
index
,
tu10
2
_fault_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_fault
**
pfault
)
{
return
nvkm_fault_new_
(
&
tu10
4
_fault
,
device
,
index
,
pfault
);
return
nvkm_fault_new_
(
&
tu10
2
_fault
,
device
,
index
,
pfault
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录