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
fd95bfbd
Commit
fd95bfbd
authored
Jan 17, 2019
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/mc/tu102: rename implementation from tu104
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
b51f9dfa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.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/mc/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c
drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c
+5
-5
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
View file @
fd95bfbd
...
...
@@ -31,5 +31,5 @@ int gk104_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
int
gk20a_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gp100_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gp10b_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
tu10
4
_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
tu10
2
_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
fd95bfbd
...
...
@@ -2449,7 +2449,7 @@ nv162_chipset = {
.
ibus
=
gm200_ibus_new
,
.
imem
=
nv50_instmem_new
,
.
ltc
=
gp102_ltc_new
,
.
mc
=
tu10
4
_mc_new
,
.
mc
=
tu10
2
_mc_new
,
.
mmu
=
tu104_mmu_new
,
.
pci
=
gp100_pci_new
,
.
pmu
=
gp102_pmu_new
,
...
...
@@ -2481,7 +2481,7 @@ nv164_chipset = {
.
ibus
=
gm200_ibus_new
,
.
imem
=
nv50_instmem_new
,
.
ltc
=
gp102_ltc_new
,
.
mc
=
tu10
4
_mc_new
,
.
mc
=
tu10
2
_mc_new
,
.
mmu
=
tu104_mmu_new
,
.
pci
=
gp100_pci_new
,
.
pmu
=
gp102_pmu_new
,
...
...
@@ -2513,7 +2513,7 @@ nv166_chipset = {
.
ibus
=
gm200_ibus_new
,
.
imem
=
nv50_instmem_new
,
.
ltc
=
gp102_ltc_new
,
.
mc
=
tu10
4
_mc_new
,
.
mc
=
tu10
2
_mc_new
,
.
mmu
=
tu104_mmu_new
,
.
pci
=
gp100_pci_new
,
.
pmu
=
gp102_pmu_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
View file @
fd95bfbd
...
...
@@ -12,4 +12,4 @@ nvkm-y += nvkm/subdev/mc/gk104.o
nvkm-y += nvkm/subdev/mc/gk20a.o
nvkm-y += nvkm/subdev/mc/gp100.o
nvkm-y += nvkm/subdev/mc/gp10b.o
nvkm-y += nvkm/subdev/mc/tu10
4
.o
nvkm-y += nvkm/subdev/mc/tu10
2
.o
drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu10
4
.c
→
drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu10
2
.c
View file @
fd95bfbd
...
...
@@ -22,7 +22,7 @@
#include "priv.h"
static
void
tu10
4
_mc_intr_hack
(
struct
nvkm_mc
*
mc
,
bool
*
handled
)
tu10
2
_mc_intr_hack
(
struct
nvkm_mc
*
mc
,
bool
*
handled
)
{
struct
nvkm_device
*
device
=
mc
->
subdev
.
device
;
u32
stat
=
nvkm_rd32
(
device
,
0xb81010
);
...
...
@@ -37,19 +37,19 @@ tu104_mc_intr_hack(struct nvkm_mc *mc, bool *handled)
}
static
const
struct
nvkm_mc_func
tu10
4
_mc
=
{
tu10
2
_mc
=
{
.
init
=
nv50_mc_init
,
.
intr
=
gp100_mc_intr
,
.
intr_unarm
=
gp100_mc_intr_unarm
,
.
intr_rearm
=
gp100_mc_intr_rearm
,
.
intr_mask
=
gp100_mc_intr_mask
,
.
intr_stat
=
gf100_mc_intr_stat
,
.
intr_hack
=
tu10
4
_mc_intr_hack
,
.
intr_hack
=
tu10
2
_mc_intr_hack
,
.
reset
=
gk104_mc_reset
,
};
int
tu10
4
_mc_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_mc
**
pmc
)
tu10
2
_mc_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_mc
**
pmc
)
{
return
gp100_mc_new_
(
&
tu10
4
_mc
,
device
,
index
,
pmc
);
return
gp100_mc_new_
(
&
tu10
2
_mc
,
device
,
index
,
pmc
);
}
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