These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / fb / nv20.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
index e37084b..126865d 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
@@ -23,28 +23,29 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "nv04.h"
+#include "priv.h"
+#include "ram.h"
 
 void
-nv20_fb_tile_init(struct nvkm_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
+nv20_fb_tile_init(struct nvkm_fb *fb, int i, u32 addr, u32 size, u32 pitch,
                  u32 flags, struct nvkm_fb_tile *tile)
 {
        tile->addr  = 0x00000001 | addr;
        tile->limit = max(1u, addr + size) - 1;
        tile->pitch = pitch;
        if (flags & 4) {
-               pfb->tile.comp(pfb, i, size, flags, tile);
+               fb->func->tile.comp(fb, i, size, flags, tile);
                tile->addr |= 2;
        }
 }
 
 static void
-nv20_fb_tile_comp(struct nvkm_fb *pfb, int i, u32 size, u32 flags,
+nv20_fb_tile_comp(struct nvkm_fb *fb, int i, u32 size, u32 flags,
                  struct nvkm_fb_tile *tile)
 {
        u32 tiles = DIV_ROUND_UP(size, 0x40);
-       u32 tags  = round_up(tiles / pfb->ram->parts, 0x40);
-       if (!nvkm_mm_head(&pfb->tags, 0, 1, tags, tags, 1, &tile->tag)) {
+       u32 tags  = round_up(tiles / fb->ram->parts, 0x40);
+       if (!nvkm_mm_head(&fb->ram->tags, 0, 1, tags, tags, 1, &tile->tag)) {
                if (!(flags & 2)) tile->zcomp = 0x00000000; /* Z16 */
                else              tile->zcomp = 0x04000000; /* Z24S8 */
                tile->zcomp |= tile->tag->offset;
@@ -56,39 +57,39 @@ nv20_fb_tile_comp(struct nvkm_fb *pfb, int i, u32 size, u32 flags,
 }
 
 void
-nv20_fb_tile_fini(struct nvkm_fb *pfb, int i, struct nvkm_fb_tile *tile)
+nv20_fb_tile_fini(struct nvkm_fb *fb, int i, struct nvkm_fb_tile *tile)
 {
        tile->addr  = 0;
        tile->limit = 0;
        tile->pitch = 0;
        tile->zcomp = 0;
-       nvkm_mm_free(&pfb->tags, &tile->tag);
+       nvkm_mm_free(&fb->ram->tags, &tile->tag);
 }
 
 void
-nv20_fb_tile_prog(struct nvkm_fb *pfb, int i, struct nvkm_fb_tile *tile)
+nv20_fb_tile_prog(struct nvkm_fb *fb, int i, struct nvkm_fb_tile *tile)
 {
-       nv_wr32(pfb, 0x100244 + (i * 0x10), tile->limit);
-       nv_wr32(pfb, 0x100248 + (i * 0x10), tile->pitch);
-       nv_wr32(pfb, 0x100240 + (i * 0x10), tile->addr);
-       nv_rd32(pfb, 0x100240 + (i * 0x10));
-       nv_wr32(pfb, 0x100300 + (i * 0x04), tile->zcomp);
+       struct nvkm_device *device = fb->subdev.device;
+       nvkm_wr32(device, 0x100244 + (i * 0x10), tile->limit);
+       nvkm_wr32(device, 0x100248 + (i * 0x10), tile->pitch);
+       nvkm_wr32(device, 0x100240 + (i * 0x10), tile->addr);
+       nvkm_rd32(device, 0x100240 + (i * 0x10));
+       nvkm_wr32(device, 0x100300 + (i * 0x04), tile->zcomp);
 }
 
-struct nvkm_oclass *
-nv20_fb_oclass = &(struct nv04_fb_impl) {
-       .base.base.handle = NV_SUBDEV(FB, 0x20),
-       .base.base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv04_fb_ctor,
-               .dtor = _nvkm_fb_dtor,
-               .init = _nvkm_fb_init,
-               .fini = _nvkm_fb_fini,
-       },
-       .base.memtype = nv04_fb_memtype_valid,
-       .base.ram = &nv20_ram_oclass,
+static const struct nvkm_fb_func
+nv20_fb = {
        .tile.regions = 8,
        .tile.init = nv20_fb_tile_init,
        .tile.comp = nv20_fb_tile_comp,
        .tile.fini = nv20_fb_tile_fini,
        .tile.prog = nv20_fb_tile_prog,
-}.base.base;
+       .ram_new = nv20_ram_new,
+       .memtype_valid = nv04_fb_memtype_valid,
+};
+
+int
+nv20_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)
+{
+       return nvkm_fb_new_(&nv20_fb, device, index, pfb);
+}