drm/nouveau/fb: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index 16da56c..344cc99 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -46,7 +46,7 @@ struct nvkm_fb_tile {
 };
 
 struct nvkm_fb {
-       struct nvkm_subdev base;
+       struct nvkm_subdev subdev;
 
        bool (*memtype_valid)(struct nvkm_fb *, u32 memtype);
 

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_gem.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_ttm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv10.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv25.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv35.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv36.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv41.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv46.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv10.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv41.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv49.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv4e.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
Simple merge