diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-15 23:59:49 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-16 18:50:39 -0500 |
commit | eeea423c48cd5ff1ec40b7dcb84b287fb39cb86e (patch) | |
tree | a5bef81c776f5d6fdfe2ed2439f883700f1b008d | |
parent | e50fcff15fe120ef2103a9e18af6644235c2b14d (diff) |
drm/nouveau/fb/gp102: rename from gp104
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c (renamed from drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp104.c) | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h index 65ce79a85d37..794e432578b2 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | |||
@@ -95,7 +95,7 @@ int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **); | |||
95 | int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **); | 95 | int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **); |
96 | int gm20b_fb_new(struct nvkm_device *, int, struct nvkm_fb **); | 96 | int gm20b_fb_new(struct nvkm_device *, int, struct nvkm_fb **); |
97 | int gp100_fb_new(struct nvkm_device *, int, struct nvkm_fb **); | 97 | int gp100_fb_new(struct nvkm_device *, int, struct nvkm_fb **); |
98 | int gp104_fb_new(struct nvkm_device *, int, struct nvkm_fb **); | 98 | int gp102_fb_new(struct nvkm_device *, int, struct nvkm_fb **); |
99 | 99 | ||
100 | #include <subdev/bios.h> | 100 | #include <subdev/bios.h> |
101 | #include <subdev/bios/ramcfg.h> | 101 | #include <subdev/bios/ramcfg.h> |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index 920e798098da..7d6a012a6b69 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | |||
@@ -2190,7 +2190,7 @@ nv132_chipset = { | |||
2190 | .bios = nvkm_bios_new, | 2190 | .bios = nvkm_bios_new, |
2191 | .bus = gf100_bus_new, | 2191 | .bus = gf100_bus_new, |
2192 | .devinit = gm200_devinit_new, | 2192 | .devinit = gm200_devinit_new, |
2193 | .fb = gp104_fb_new, | 2193 | .fb = gp102_fb_new, |
2194 | .fuse = gm107_fuse_new, | 2194 | .fuse = gm107_fuse_new, |
2195 | .gpio = gk104_gpio_new, | 2195 | .gpio = gk104_gpio_new, |
2196 | .i2c = gm200_i2c_new, | 2196 | .i2c = gm200_i2c_new, |
@@ -2219,7 +2219,7 @@ nv134_chipset = { | |||
2219 | .bios = nvkm_bios_new, | 2219 | .bios = nvkm_bios_new, |
2220 | .bus = gf100_bus_new, | 2220 | .bus = gf100_bus_new, |
2221 | .devinit = gm200_devinit_new, | 2221 | .devinit = gm200_devinit_new, |
2222 | .fb = gp104_fb_new, | 2222 | .fb = gp102_fb_new, |
2223 | .fuse = gm107_fuse_new, | 2223 | .fuse = gm107_fuse_new, |
2224 | .gpio = gk104_gpio_new, | 2224 | .gpio = gk104_gpio_new, |
2225 | .i2c = gm200_i2c_new, | 2225 | .i2c = gm200_i2c_new, |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild index ef47d57fcb87..63566ba12fbb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | |||
@@ -26,7 +26,7 @@ nvkm-y += nvkm/subdev/fb/gm107.o | |||
26 | nvkm-y += nvkm/subdev/fb/gm200.o | 26 | nvkm-y += nvkm/subdev/fb/gm200.o |
27 | nvkm-y += nvkm/subdev/fb/gm20b.o | 27 | nvkm-y += nvkm/subdev/fb/gm20b.o |
28 | nvkm-y += nvkm/subdev/fb/gp100.o | 28 | nvkm-y += nvkm/subdev/fb/gp100.o |
29 | nvkm-y += nvkm/subdev/fb/gp104.o | 29 | nvkm-y += nvkm/subdev/fb/gp102.o |
30 | 30 | ||
31 | nvkm-y += nvkm/subdev/fb/ram.o | 31 | nvkm-y += nvkm/subdev/fb/ram.o |
32 | nvkm-y += nvkm/subdev/fb/ramnv04.o | 32 | nvkm-y += nvkm/subdev/fb/ramnv04.o |
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c index 92cb71861bec..73b4ae1c73dc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <core/memory.h> | 27 | #include <core/memory.h> |
28 | 28 | ||
29 | static const struct nvkm_fb_func | 29 | static const struct nvkm_fb_func |
30 | gp104_fb = { | 30 | gp102_fb = { |
31 | .dtor = gf100_fb_dtor, | 31 | .dtor = gf100_fb_dtor, |
32 | .oneinit = gf100_fb_oneinit, | 32 | .oneinit = gf100_fb_oneinit, |
33 | .init = gp100_fb_init, | 33 | .init = gp100_fb_init, |
@@ -37,7 +37,7 @@ gp104_fb = { | |||
37 | }; | 37 | }; |
38 | 38 | ||
39 | int | 39 | int |
40 | gp104_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb) | 40 | gp102_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb) |
41 | { | 41 | { |
42 | return gf100_fb_new_(&gp104_fb, device, index, pfb); | 42 | return gf100_fb_new_(&gp102_fb, device, index, pfb); |
43 | } | 43 | } |