Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
933ad445
Commit
933ad445
authored
Apr 14, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/gr/gf100-: remove hardcoded idle_timeout values
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
0cdc3fdf
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
19 deletions
+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
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
View file @
933ad445
...
@@ -1238,6 +1238,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
;
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
nvkm_mc_unk260
(
device
->
mc
,
0
);
nvkm_mc_unk260
(
device
->
mc
,
0
);
...
@@ -1247,7 +1248,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
grctx
->
pagepool
(
info
);
...
@@ -1261,7 +1262,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -1261,7 +1262,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_grctx_generate_r406800
(
gr
);
gf100_grctx_generate_r406800
(
gr
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
View file @
933ad445
...
@@ -223,6 +223,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
;
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
int
i
;
int
i
;
nvkm_mc_unk260
(
device
->
mc
,
0
);
nvkm_mc_unk260
(
device
->
mc
,
0
);
...
@@ -233,7 +234,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
grctx
->
pagepool
(
info
);
...
@@ -250,7 +251,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -250,7 +251,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
nvkm_wr32
(
device
,
0x4064d0
+
(
i
*
0x04
),
0x00000000
);
nvkm_wr32
(
device
,
0x4064d0
+
(
i
*
0x04
),
0x00000000
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
View file @
933ad445
...
@@ -956,6 +956,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
;
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
int
i
;
int
i
;
nvkm_mc_unk260
(
device
->
mc
,
0
);
nvkm_mc_unk260
(
device
->
mc
,
0
);
...
@@ -966,7 +967,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
grctx
->
pagepool
(
info
);
...
@@ -986,7 +987,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -986,7 +987,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
nvkm_mask
(
device
,
0x419f78
,
0x00000001
,
0x00000000
);
nvkm_mask
(
device
,
0x419f78
,
0x00000001
,
0x00000000
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
nvkm_mc_unk260
(
device
->
mc
,
1
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
View file @
933ad445
...
@@ -29,15 +29,14 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
;
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
int
idle_timeout_save
;
u32
idle_timeout
;
int
i
;
int
i
;
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
gf100_gr_wait_idle
(
gr
);
gf100_gr_wait_idle
(
gr
);
idle_timeout_save
=
nvkm_rd32
(
device
,
0x404154
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
grctx
->
attrib
(
info
);
grctx
->
attrib
(
info
);
...
@@ -59,7 +58,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -59,7 +58,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_wait_idle
(
gr
);
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_wait_idle
(
gr
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
View file @
933ad445
...
@@ -957,6 +957,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
;
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
idle_timeout
;
int
i
;
int
i
;
gf100_gr_mmio
(
gr
,
grctx
->
hub
);
gf100_gr_mmio
(
gr
,
grctx
->
hub
);
...
@@ -965,7 +966,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
->
tpc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
gf100_gr_mmio
(
gr
,
grctx
->
ppc
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
grctx
->
bundle
(
info
);
grctx
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
grctx
->
pagepool
(
info
);
...
@@ -987,7 +988,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -987,7 +988,7 @@ gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gk104_grctx_generate_rop_active_fbps
(
gr
);
gk104_grctx_generate_rop_active_fbps
(
gr
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
gf100_gr_icmd
(
gr
,
grctx
->
icmd
);
nvkm_wr32
(
device
,
0x404154
,
0x00000400
);
nvkm_wr32
(
device
,
0x404154
,
idle_timeout
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
gf100_gr_mthd
(
gr
,
grctx
->
mthd
);
nvkm_mask
(
device
,
0x419e00
,
0x00808080
,
0x00808080
);
nvkm_mask
(
device
,
0x419e00
,
0x00808080
,
0x00808080
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
View file @
933ad445
...
@@ -91,12 +91,12 @@ gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
;
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
u32
tmp
;
u32
idle_timeout
,
tmp
;
int
i
;
int
i
;
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
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
->
bundle
(
info
);
grctx
->
pagepool
(
info
);
grctx
->
pagepool
(
info
);
...
@@ -122,7 +122,7 @@ gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -122,7 +122,7 @@ gm200_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gm200_grctx_generate_405b60
(
gr
);
gm200_grctx_generate_405b60
(
gr
);
gf100_gr_icmd
(
gr
,
gr
->
fuc_bundle
);
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
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
nvkm_mask
(
device
,
0x418e94
,
0xffffffff
,
0xc4230000
);
nvkm_mask
(
device
,
0x418e94
,
0xffffffff
,
0xc4230000
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
View file @
933ad445
...
@@ -40,15 +40,14 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -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
;
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
const
struct
gf100_grctx_func
*
grctx
=
gr
->
func
->
grctx
;
int
idle_timeout_save
;
u32
idle_timeout
;
int
i
,
tmp
;
int
i
,
tmp
;
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
gf100_gr_mmio
(
gr
,
gr
->
fuc_sw_ctx
);
gf100_gr_wait_idle
(
gr
);
gf100_gr_wait_idle
(
gr
);
idle_timeout_save
=
nvkm_rd32
(
device
,
0x404154
);
idle_timeout
=
nvkm_mask
(
device
,
0x404154
,
0xffffffff
,
0x00000000
);
nvkm_wr32
(
device
,
0x404154
,
0x00000000
);
grctx
->
attrib
(
info
);
grctx
->
attrib
(
info
);
...
@@ -74,7 +73,7 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -74,7 +73,7 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_gr_wait_idle
(
gr
);
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_wait_idle
(
gr
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
gf100_gr_mthd
(
gr
,
gr
->
fuc_method
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment