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
Kirill Smelkov
linux
Commits
547dd271
Commit
547dd271
authored
Jan 04, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/clk: remove references to "daemon"
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
caf2be8a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
+3
-3
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
+3
-3
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
+1
-1
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
View file @
547dd271
...
...
@@ -38,7 +38,7 @@ enum nv_clk_src {
nv_clk_src_hubk06
,
nv_clk_src_hubk07
,
nv_clk_src_copy
,
nv_clk_src_
daemon
,
nv_clk_src_
pmu
,
nv_clk_src_disp
,
nv_clk_src_vdec
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
View file @
547dd271
...
...
@@ -188,7 +188,7 @@ gf100_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
return
read_clk
(
clk
,
0x08
);
case
nv_clk_src_copy
:
return
read_clk
(
clk
,
0x09
);
case
nv_clk_src_
daemon
:
case
nv_clk_src_
pmu
:
return
read_clk
(
clk
,
0x0c
);
case
nv_clk_src_vdec
:
return
read_clk
(
clk
,
0x0e
);
...
...
@@ -325,7 +325,7 @@ gf100_clk_calc(struct nvkm_clk *base, struct nvkm_cstate *cstate)
(
ret
=
calc_clk
(
clk
,
cstate
,
0x07
,
nv_clk_src_hubk06
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x08
,
nv_clk_src_hubk01
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x09
,
nv_clk_src_copy
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x0c
,
nv_clk_src_
daemon
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x0c
,
nv_clk_src_
pmu
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x0e
,
nv_clk_src_vdec
)))
return
ret
;
...
...
@@ -447,7 +447,7 @@ gf100_clk = {
{
nv_clk_src_rop
,
0x04
},
{
nv_clk_src_mem
,
0x05
,
0
,
"memory"
,
1000
},
{
nv_clk_src_vdec
,
0x06
},
{
nv_clk_src_
daemon
,
0x0a
},
{
nv_clk_src_
pmu
,
0x0a
},
{
nv_clk_src_hubk07
,
0x0b
},
{
nv_clk_src_max
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
View file @
547dd271
...
...
@@ -209,7 +209,7 @@ gk104_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
return
read_clk
(
clk
,
0x07
);
case
nv_clk_src_hubk01
:
return
read_clk
(
clk
,
0x08
);
case
nv_clk_src_
daemon
:
case
nv_clk_src_
pmu
:
return
read_clk
(
clk
,
0x0c
);
case
nv_clk_src_vdec
:
return
read_clk
(
clk
,
0x0e
);
...
...
@@ -346,7 +346,7 @@ gk104_clk_calc(struct nvkm_clk *base, struct nvkm_cstate *cstate)
(
ret
=
calc_clk
(
clk
,
cstate
,
0x02
,
nv_clk_src_hubk07
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x07
,
nv_clk_src_hubk06
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x08
,
nv_clk_src_hubk01
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x0c
,
nv_clk_src_
daemon
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x0c
,
nv_clk_src_
pmu
))
||
(
ret
=
calc_clk
(
clk
,
cstate
,
0x0e
,
nv_clk_src_vdec
)))
return
ret
;
...
...
@@ -492,7 +492,7 @@ gk104_clk = {
{
nv_clk_src_hubk06
,
0x04
,
NVKM_CLK_DOM_FLAG_CORE
},
{
nv_clk_src_hubk01
,
0x05
},
{
nv_clk_src_vdec
,
0x06
},
{
nv_clk_src_
daemon
,
0x07
},
{
nv_clk_src_
pmu
,
0x07
},
{
nv_clk_src_max
}
}
};
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
View file @
547dd271
...
...
@@ -158,7 +158,7 @@ gt215_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
return
read_clk
(
clk
,
0x20
,
false
);
case
nv_clk_src_vdec
:
return
read_clk
(
clk
,
0x21
,
false
);
case
nv_clk_src_
daemon
:
case
nv_clk_src_
pmu
:
return
read_clk
(
clk
,
0x25
,
false
);
case
nv_clk_src_host
:
hsrc
=
(
nvkm_rd32
(
device
,
0xc040
)
&
0x30000000
)
>>
28
;
...
...
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