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
c011b254
Commit
c011b254
authored
Jan 17, 2019
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/mmu/tu102: rename implementation from tu104
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
fd95bfbd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
16 deletions
+16
-16
drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.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/mmu/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
+2
-2
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c
+4
-4
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu102.c
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu102.c
+5
-5
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
View file @
c011b254
...
...
@@ -130,5 +130,5 @@ int gm20b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
int
gp100_mmu_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mmu
**
);
int
gp10b_mmu_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mmu
**
);
int
gv100_mmu_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mmu
**
);
int
tu10
4
_mmu_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mmu
**
);
int
tu10
2
_mmu_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mmu
**
);
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
c011b254
...
...
@@ -2450,7 +2450,7 @@ nv162_chipset = {
.
imem
=
nv50_instmem_new
,
.
ltc
=
gp102_ltc_new
,
.
mc
=
tu102_mc_new
,
.
mmu
=
tu10
4
_mmu_new
,
.
mmu
=
tu10
2
_mmu_new
,
.
pci
=
gp100_pci_new
,
.
pmu
=
gp102_pmu_new
,
.
therm
=
gp100_therm_new
,
...
...
@@ -2482,7 +2482,7 @@ nv164_chipset = {
.
imem
=
nv50_instmem_new
,
.
ltc
=
gp102_ltc_new
,
.
mc
=
tu102_mc_new
,
.
mmu
=
tu10
4
_mmu_new
,
.
mmu
=
tu10
2
_mmu_new
,
.
pci
=
gp100_pci_new
,
.
pmu
=
gp102_pmu_new
,
.
therm
=
gp100_therm_new
,
...
...
@@ -2514,7 +2514,7 @@ nv166_chipset = {
.
imem
=
nv50_instmem_new
,
.
ltc
=
gp102_ltc_new
,
.
mc
=
tu102_mc_new
,
.
mmu
=
tu10
4
_mmu_new
,
.
mmu
=
tu10
2
_mmu_new
,
.
pci
=
gp100_pci_new
,
.
pmu
=
gp102_pmu_new
,
.
therm
=
gp100_therm_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
View file @
c011b254
...
...
@@ -13,7 +13,7 @@ nvkm-y += nvkm/subdev/mmu/gm20b.o
nvkm-y += nvkm/subdev/mmu/gp100.o
nvkm-y += nvkm/subdev/mmu/gp10b.o
nvkm-y += nvkm/subdev/mmu/gv100.o
nvkm-y += nvkm/subdev/mmu/tu10
4
.o
nvkm-y += nvkm/subdev/mmu/tu10
2
.o
nvkm-y += nvkm/subdev/mmu/mem.o
nvkm-y += nvkm/subdev/mmu/memnv04.o
...
...
@@ -34,7 +34,7 @@ nvkm-y += nvkm/subdev/mmu/vmmgm20b.o
nvkm-y += nvkm/subdev/mmu/vmmgp100.o
nvkm-y += nvkm/subdev/mmu/vmmgp10b.o
nvkm-y += nvkm/subdev/mmu/vmmgv100.o
nvkm-y += nvkm/subdev/mmu/vmmtu10
4
.o
nvkm-y += nvkm/subdev/mmu/vmmtu10
2
.o
nvkm-y += nvkm/subdev/mmu/umem.o
nvkm-y += nvkm/subdev/mmu/ummu.o
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu10
4
.c
→
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu10
2
.c
View file @
c011b254
...
...
@@ -27,17 +27,17 @@
#include <nvif/class.h>
static
const
struct
nvkm_mmu_func
tu10
4
_mmu
=
{
tu10
2
_mmu
=
{
.
dma_bits
=
47
,
.
mmu
=
{{
-
1
,
-
1
,
NVIF_CLASS_MMU_GF100
}},
.
mem
=
{{
-
1
,
0
,
NVIF_CLASS_MEM_GF100
},
gf100_mem_new
,
gf100_mem_map
},
.
vmm
=
{{
-
1
,
0
,
NVIF_CLASS_VMM_GP100
},
tu10
4
_vmm_new
},
.
vmm
=
{{
-
1
,
0
,
NVIF_CLASS_VMM_GP100
},
tu10
2
_vmm_new
},
.
kind
=
gm200_mmu_kind
,
.
kind_sys
=
true
,
};
int
tu10
4
_mmu_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_mmu
**
pmmu
)
tu10
2
_mmu_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_mmu
**
pmmu
)
{
return
nvkm_mmu_new_
(
&
tu10
4
_mmu
,
device
,
index
,
pmmu
);
return
nvkm_mmu_new_
(
&
tu10
2
_mmu
,
device
,
index
,
pmmu
);
}
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
View file @
c011b254
...
...
@@ -242,7 +242,7 @@ int gp10b_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,
int
gv100_vmm_new
(
struct
nvkm_mmu
*
,
u64
,
u64
,
void
*
,
u32
,
struct
lock_class_key
*
,
const
char
*
,
struct
nvkm_vmm
**
);
int
tu10
4
_vmm_new
(
struct
nvkm_mmu
*
,
u64
,
u64
,
void
*
,
u32
,
int
tu10
2
_vmm_new
(
struct
nvkm_mmu
*
,
u64
,
u64
,
void
*
,
u32
,
struct
lock_class_key
*
,
const
char
*
,
struct
nvkm_vmm
**
);
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu10
4
.c
→
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu10
2
.c
View file @
c011b254
...
...
@@ -24,7 +24,7 @@
#include <subdev/timer.h>
static
void
tu10
4
_vmm_flush
(
struct
nvkm_vmm
*
vmm
,
int
depth
)
tu10
2
_vmm_flush
(
struct
nvkm_vmm
*
vmm
,
int
depth
)
{
struct
nvkm_subdev
*
subdev
=
&
vmm
->
mmu
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
...
...
@@ -50,12 +50,12 @@ tu104_vmm_flush(struct nvkm_vmm *vmm, int depth)
}
static
const
struct
nvkm_vmm_func
tu10
4
_vmm
=
{
tu10
2
_vmm
=
{
.
join
=
gv100_vmm_join
,
.
part
=
gf100_vmm_part
,
.
aper
=
gf100_vmm_aper
,
.
valid
=
gp100_vmm_valid
,
.
flush
=
tu10
4
_vmm_flush
,
.
flush
=
tu10
2
_vmm_flush
,
.
page
=
{
{
47
,
&
gp100_vmm_desc_16
[
4
],
NVKM_VMM_PAGE_Sxxx
},
{
38
,
&
gp100_vmm_desc_16
[
3
],
NVKM_VMM_PAGE_Sxxx
},
...
...
@@ -68,10 +68,10 @@ tu104_vmm = {
};
int
tu10
4
_vmm_new
(
struct
nvkm_mmu
*
mmu
,
u64
addr
,
u64
size
,
tu10
2
_vmm_new
(
struct
nvkm_mmu
*
mmu
,
u64
addr
,
u64
size
,
void
*
argv
,
u32
argc
,
struct
lock_class_key
*
key
,
const
char
*
name
,
struct
nvkm_vmm
**
pvmm
)
{
return
nv04_vmm_new_
(
&
tu10
4
_vmm
,
mmu
,
0
,
addr
,
size
,
return
nv04_vmm_new_
(
&
tu10
2
_vmm
,
mmu
,
0
,
addr
,
size
,
argv
,
argc
,
key
,
name
,
pvmm
);
}
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