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
b51f9dfa
Commit
b51f9dfa
authored
Jan 17, 2019
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/devinit/tu102: rename implementation from tu104
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
fc782242
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.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/devinit/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c
+7
-7
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
View file @
b51f9dfa
...
@@ -31,5 +31,5 @@ int gf100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
...
@@ -31,5 +31,5 @@ int gf100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
int
gm107_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gm107_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gm200_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gm200_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gv100_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gv100_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
tu10
4
_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
tu10
2
_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
#endif
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
b51f9dfa
...
@@ -2440,7 +2440,7 @@ nv162_chipset = {
...
@@ -2440,7 +2440,7 @@ nv162_chipset = {
.
bar
=
tu104_bar_new
,
.
bar
=
tu104_bar_new
,
.
bios
=
nvkm_bios_new
,
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
tu10
4
_devinit_new
,
.
devinit
=
tu10
2
_devinit_new
,
.
fault
=
tu104_fault_new
,
.
fault
=
tu104_fault_new
,
.
fb
=
gv100_fb_new
,
.
fb
=
gv100_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
fuse
=
gm107_fuse_new
,
...
@@ -2472,7 +2472,7 @@ nv164_chipset = {
...
@@ -2472,7 +2472,7 @@ nv164_chipset = {
.
bar
=
tu104_bar_new
,
.
bar
=
tu104_bar_new
,
.
bios
=
nvkm_bios_new
,
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
tu10
4
_devinit_new
,
.
devinit
=
tu10
2
_devinit_new
,
.
fault
=
tu104_fault_new
,
.
fault
=
tu104_fault_new
,
.
fb
=
gv100_fb_new
,
.
fb
=
gv100_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
fuse
=
gm107_fuse_new
,
...
@@ -2504,7 +2504,7 @@ nv166_chipset = {
...
@@ -2504,7 +2504,7 @@ nv166_chipset = {
.
bar
=
tu104_bar_new
,
.
bar
=
tu104_bar_new
,
.
bios
=
nvkm_bios_new
,
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
tu10
4
_devinit_new
,
.
devinit
=
tu10
2
_devinit_new
,
.
fault
=
tu104_fault_new
,
.
fault
=
tu104_fault_new
,
.
fb
=
gv100_fb_new
,
.
fb
=
gv100_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
fuse
=
gm107_fuse_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
View file @
b51f9dfa
...
@@ -13,4 +13,4 @@ nvkm-y += nvkm/subdev/devinit/gf100.o
...
@@ -13,4 +13,4 @@ nvkm-y += nvkm/subdev/devinit/gf100.o
nvkm-y += nvkm/subdev/devinit/gm107.o
nvkm-y += nvkm/subdev/devinit/gm107.o
nvkm-y += nvkm/subdev/devinit/gm200.o
nvkm-y += nvkm/subdev/devinit/gm200.o
nvkm-y += nvkm/subdev/devinit/gv100.o
nvkm-y += nvkm/subdev/devinit/gv100.o
nvkm-y += nvkm/subdev/devinit/tu10
4
.o
nvkm-y += nvkm/subdev/devinit/tu10
2
.o
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu10
4
.c
→
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu10
2
.c
View file @
b51f9dfa
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include <subdev/clk/pll.h>
#include <subdev/clk/pll.h>
static
int
static
int
tu10
4
_devinit_pll_set
(
struct
nvkm_devinit
*
init
,
u32
type
,
u32
freq
)
tu10
2
_devinit_pll_set
(
struct
nvkm_devinit
*
init
,
u32
type
,
u32
freq
)
{
{
struct
nvkm_subdev
*
subdev
=
&
init
->
subdev
;
struct
nvkm_subdev
*
subdev
=
&
init
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
struct
nvkm_device
*
device
=
subdev
->
device
;
...
@@ -66,7 +66,7 @@ tu104_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
...
@@ -66,7 +66,7 @@ tu104_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
}
}
static
int
static
int
tu10
4
_devinit_post
(
struct
nvkm_devinit
*
base
,
bool
post
)
tu10
2
_devinit_post
(
struct
nvkm_devinit
*
base
,
bool
post
)
{
{
struct
nv50_devinit
*
init
=
nv50_devinit
(
base
);
struct
nv50_devinit
*
init
=
nv50_devinit
(
base
);
gm200_devinit_preos
(
init
,
post
);
gm200_devinit_preos
(
init
,
post
);
...
@@ -74,16 +74,16 @@ tu104_devinit_post(struct nvkm_devinit *base, bool post)
...
@@ -74,16 +74,16 @@ tu104_devinit_post(struct nvkm_devinit *base, bool post)
}
}
static
const
struct
nvkm_devinit_func
static
const
struct
nvkm_devinit_func
tu10
4
_devinit
=
{
tu10
2
_devinit
=
{
.
init
=
nv50_devinit_init
,
.
init
=
nv50_devinit_init
,
.
post
=
tu10
4
_devinit_post
,
.
post
=
tu10
2
_devinit_post
,
.
pll_set
=
tu10
4
_devinit_pll_set
,
.
pll_set
=
tu10
2
_devinit_pll_set
,
.
disable
=
gm107_devinit_disable
,
.
disable
=
gm107_devinit_disable
,
};
};
int
int
tu10
4
_devinit_new
(
struct
nvkm_device
*
device
,
int
index
,
tu10
2
_devinit_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_devinit
**
pinit
)
struct
nvkm_devinit
**
pinit
)
{
{
return
nv50_devinit_new_
(
&
tu10
4
_devinit
,
device
,
index
,
pinit
);
return
nv50_devinit_new_
(
&
tu10
2
_devinit
,
device
,
index
,
pinit
);
}
}
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