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
eeea423c
Commit
eeea423c
authored
Nov 16, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/fb/gp102: rename from gp104
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
e50fcff1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+2
-2
drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
+3
-3
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
View file @
eeea423c
...
...
@@ -95,7 +95,7 @@ int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int
gm200_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
int
gm20b_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
int
gp100_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
int
gp10
4
_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
int
gp10
2
_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
#include <subdev/bios.h>
#include <subdev/bios/ramcfg.h>
...
...
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
eeea423c
...
...
@@ -2190,7 +2190,7 @@ nv132_chipset = {
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
gm200_devinit_new
,
.
fb
=
gp10
4
_fb_new
,
.
fb
=
gp10
2
_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
gpio
=
gk104_gpio_new
,
.
i2c
=
gm200_i2c_new
,
...
...
@@ -2219,7 +2219,7 @@ nv134_chipset = {
.
bios
=
nvkm_bios_new
,
.
bus
=
gf100_bus_new
,
.
devinit
=
gm200_devinit_new
,
.
fb
=
gp10
4
_fb_new
,
.
fb
=
gp10
2
_fb_new
,
.
fuse
=
gm107_fuse_new
,
.
gpio
=
gk104_gpio_new
,
.
i2c
=
gm200_i2c_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
View file @
eeea423c
...
...
@@ -26,7 +26,7 @@ nvkm-y += nvkm/subdev/fb/gm107.o
nvkm-y += nvkm/subdev/fb/gm200.o
nvkm-y += nvkm/subdev/fb/gm20b.o
nvkm-y += nvkm/subdev/fb/gp100.o
nvkm-y += nvkm/subdev/fb/gp10
4
.o
nvkm-y += nvkm/subdev/fb/gp10
2
.o
nvkm-y += nvkm/subdev/fb/ram.o
nvkm-y += nvkm/subdev/fb/ramnv04.o
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10
4
.c
→
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10
2
.c
View file @
eeea423c
...
...
@@ -27,7 +27,7 @@
#include <core/memory.h>
static
const
struct
nvkm_fb_func
gp10
4
_fb
=
{
gp10
2
_fb
=
{
.
dtor
=
gf100_fb_dtor
,
.
oneinit
=
gf100_fb_oneinit
,
.
init
=
gp100_fb_init
,
...
...
@@ -37,7 +37,7 @@ gp104_fb = {
};
int
gp10
4
_fb_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_fb
**
pfb
)
gp10
2
_fb_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_fb
**
pfb
)
{
return
gf100_fb_new_
(
&
gp10
4
_fb
,
device
,
index
,
pfb
);
return
gf100_fb_new_
(
&
gp10
2
_fb
,
device
,
index
,
pfb
);
}
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