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
a4fa851c
Commit
a4fa851c
authored
Nov 16, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/ce/gp102: rename from gp104
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
eeea423c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c
drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c
+3
-3
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+8
-8
No files found.
drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
View file @
a4fa851c
...
@@ -8,5 +8,5 @@ int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
...
@@ -8,5 +8,5 @@ int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
int
gm107_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
int
gm107_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
int
gm200_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
int
gm200_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
int
gp100_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
int
gp100_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
int
gp10
4
_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
int
gp10
2
_ce_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_engine
**
);
#endif
#endif
drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
View file @
a4fa851c
...
@@ -4,4 +4,4 @@ nvkm-y += nvkm/engine/ce/gk104.o
...
@@ -4,4 +4,4 @@ nvkm-y += nvkm/engine/ce/gk104.o
nvkm-y += nvkm/engine/ce/gm107.o
nvkm-y += nvkm/engine/ce/gm107.o
nvkm-y += nvkm/engine/ce/gm200.o
nvkm-y += nvkm/engine/ce/gm200.o
nvkm-y += nvkm/engine/ce/gp100.o
nvkm-y += nvkm/engine/ce/gp100.o
nvkm-y += nvkm/engine/ce/gp10
4
.o
nvkm-y += nvkm/engine/ce/gp10
2
.o
drivers/gpu/drm/nouveau/nvkm/engine/ce/gp10
4
.c
→
drivers/gpu/drm/nouveau/nvkm/engine/ce/gp10
2
.c
View file @
a4fa851c
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include <nvif/class.h>
#include <nvif/class.h>
static
const
struct
nvkm_engine_func
static
const
struct
nvkm_engine_func
gp10
4
_ce
=
{
gp10
2
_ce
=
{
.
intr
=
gp100_ce_intr
,
.
intr
=
gp100_ce_intr
,
.
sclass
=
{
.
sclass
=
{
{
-
1
,
-
1
,
PASCAL_DMA_COPY_B
},
{
-
1
,
-
1
,
PASCAL_DMA_COPY_B
},
...
@@ -37,8 +37,8 @@ gp104_ce = {
...
@@ -37,8 +37,8 @@ gp104_ce = {
};
};
int
int
gp10
4
_ce_new
(
struct
nvkm_device
*
device
,
int
index
,
gp10
2
_ce_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_engine
**
pengine
)
struct
nvkm_engine
**
pengine
)
{
{
return
nvkm_engine_new_
(
&
gp10
4
_ce
,
device
,
index
,
true
,
pengine
);
return
nvkm_engine_new_
(
&
gp10
2
_ce
,
device
,
index
,
true
,
pengine
);
}
}
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
a4fa851c
...
@@ -2203,10 +2203,10 @@ nv132_chipset = {
...
@@ -2203,10 +2203,10 @@ nv132_chipset = {
.
pmu
=
gp102_pmu_new
,
.
pmu
=
gp102_pmu_new
,
.
timer
=
gk20a_timer_new
,
.
timer
=
gk20a_timer_new
,
.
top
=
gk104_top_new
,
.
top
=
gk104_top_new
,
.
ce
[
0
]
=
gp10
4
_ce_new
,
.
ce
[
0
]
=
gp10
2
_ce_new
,
.
ce
[
1
]
=
gp10
4
_ce_new
,
.
ce
[
1
]
=
gp10
2
_ce_new
,
.
ce
[
2
]
=
gp10
4
_ce_new
,
.
ce
[
2
]
=
gp10
2
_ce_new
,
.
ce
[
3
]
=
gp10
4
_ce_new
,
.
ce
[
3
]
=
gp10
2
_ce_new
,
.
disp
=
gp104_disp_new
,
.
disp
=
gp104_disp_new
,
.
dma
=
gf119_dma_new
,
.
dma
=
gf119_dma_new
,
.
fifo
=
gp100_fifo_new
,
.
fifo
=
gp100_fifo_new
,
...
@@ -2232,10 +2232,10 @@ nv134_chipset = {
...
@@ -2232,10 +2232,10 @@ nv134_chipset = {
.
pmu
=
gp102_pmu_new
,
.
pmu
=
gp102_pmu_new
,
.
timer
=
gk20a_timer_new
,
.
timer
=
gk20a_timer_new
,
.
top
=
gk104_top_new
,
.
top
=
gk104_top_new
,
.
ce
[
0
]
=
gp10
4
_ce_new
,
.
ce
[
0
]
=
gp10
2
_ce_new
,
.
ce
[
1
]
=
gp10
4
_ce_new
,
.
ce
[
1
]
=
gp10
2
_ce_new
,
.
ce
[
2
]
=
gp10
4
_ce_new
,
.
ce
[
2
]
=
gp10
2
_ce_new
,
.
ce
[
3
]
=
gp10
4
_ce_new
,
.
ce
[
3
]
=
gp10
2
_ce_new
,
.
disp
=
gp104_disp_new
,
.
disp
=
gp104_disp_new
,
.
dma
=
gf119_dma_new
,
.
dma
=
gf119_dma_new
,
.
fifo
=
gp100_fifo_new
,
.
fifo
=
gp100_fifo_new
,
...
...
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