Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
933ad445
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
933ad445
编写于
4月 14, 2016
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/gr/gf100-: remove hardcoded idle_timeout values
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
0cdc3fdf
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
21 addition
and
19 deletion
+21
-19
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
+3
-4
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
+3
-3
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
+3
-4
未找到文件。
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
浏览文件 @
933ad445
...
...
@@ -1238,6 +1238,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
nvkm_mc_unk260
(
device
->
mc
,
0
);
...
...
@@ -1247,7 +1248,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_mmio
(
gr
,
grctx
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
...
...
@@ -1261,7 +1262,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_grctx_generate_r406800
(
gr
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
浏览文件 @
933ad445
...
...
@@ -223,6 +223,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
int
i
;
nvkm_mc_unk260
(
device
->
mc
,
0
);
...
...
@@ -233,7 +234,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_mmio
(
gr
,
grctx
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
...
...
@@ -250,7 +251,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
nvkm_wr32
(
device
,
0x4064d0
+
(
i
*
0x04
),
0x00000000
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
浏览文件 @
933ad445
...
...
@@ -956,6 +956,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
int
i
;
nvkm_mc_unk260
(
device
->
mc
,
0
);
...
...
@@ -966,7 +967,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_mmio
(
gr
,
grctx
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
...
...
@@ -986,7 +987,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
nvkm_mask
(
device
,
0x419f78
,
0x00000001
,
0x00000000
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
浏览文件 @
933ad445
...
...
@@ -29,15 +29,14 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
int
idle_timeout_save
;
u32
idle_timeout
;
int
i
;
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
gf100_gr_wait_idle
(
gr
);
idle_timeout_save
=
nvkm_rd32
(
device
,
0x404154
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
attrib
(
info
);
...
...
@@ -59,7 +58,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_wait_idle
(
gr
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
_save
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_wait_idle
(
gr
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
浏览文件 @
933ad445
...
...
@@ -957,6 +957,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
int
i
;
gf100_gr_mmio
(
gr
,
grctx
->
hub
);
...
...
@@ -965,7 +966,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_mmio
(
gr
,
grctx
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
...
...
@@ -987,7 +988,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gk104_grctx_generate_rop_active_fbps
(
gr
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mask
(
device
,
0x419e00
,
0x00808080
,
0x00808080
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
浏览文件 @
933ad445
...
...
@@ -91,12 +91,12 @@ gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
tmp
;
u32
idle_timeout
,
tmp
;
int
i
;
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
...
...
@@ -122,7 +122,7 @@ gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gm200_grctx_generate_405b60
(
gr
);
gf100_gr_icmd
(
gr
,
gr
->
fuc_bundle
);
nvkm_wr32
(
device
,
0x404154
,
0x00000800
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
nvkm_mask
(
device
,
0x418e94
,
0xffffffff
,
0xc4230000
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
浏览文件 @
933ad445
...
...
@@ -40,15 +40,14 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
int
idle_timeout_save
;
u32
idle_timeout
;
int
i
,
tmp
;
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
gf100_gr_wait_idle
(
gr
);
idle_timeout_save
=
nvkm_rd32
(
device
,
0x404154
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
attrib
(
info
);
...
...
@@ -74,7 +73,7 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_wait_idle
(
gr
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
_save
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_wait_idle
(
gr
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录