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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c
index 09ebb94..2a7c483 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c
@@ -23,20 +23,19 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include "nv04.h"
-
-#include <core/device.h>
+#include "priv.h"
+#include "ram.h"
 
 void
-nv30_fb_tile_init(struct nvkm_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
+nv30_fb_tile_init(struct nvkm_fb *fb, int i, u32 addr, u32 size, u32 pitch,
                  u32 flags, struct nvkm_fb_tile *tile)
 {
        /* for performance, select alternate bank offset for zeta */
        if (!(flags & 4)) {
                tile->addr = (0 << 4);
        } else {
-               if (pfb->tile.comp) /* z compression */
-                       pfb->tile.comp(pfb, i, size, flags, tile);
+               if (fb->func->tile.comp) /* z compression */
+                       fb->func->tile.comp(fb, i, size, flags, tile);
                tile->addr = (1 << 4);
        }
 
@@ -47,12 +46,12 @@ nv30_fb_tile_init(struct nvkm_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
 }
 
 static void
-nv30_fb_tile_comp(struct nvkm_fb *pfb, int i, u32 size, u32 flags,
+nv30_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 |= 0x01000000; /* Z16 */
                else           tile->zcomp |= 0x02000000; /* Z24S8 */
                tile->zcomp |= ((tile->tag->offset           ) >> 6);
@@ -64,23 +63,24 @@ nv30_fb_tile_comp(struct nvkm_fb *pfb, int i, u32 size, u32 flags,
 }
 
 static int
-calc_bias(struct nv04_fb_priv *priv, int k, int i, int j)
+calc_bias(struct nvkm_fb *fb, int k, int i, int j)
 {
-       struct nvkm_device *device = nv_device(priv);
+       struct nvkm_device *device = fb->subdev.device;
        int b = (device->chipset > 0x30 ?
-                nv_rd32(priv, 0x122c + 0x10 * k + 0x4 * j) >> (4 * (i ^ 1)) :
+                nvkm_rd32(device, 0x122c + 0x10 * k + 0x4 * j) >>
+                       (4 * (i ^ 1)) :
                 0) & 0xf;
 
        return 2 * (b & 0x8 ? b - 0x10 : b);
 }
 
 static int
-calc_ref(struct nv04_fb_priv *priv, int l, int k, int i)
+calc_ref(struct nvkm_fb *fb, int l, int k, int i)
 {
        int j, x = 0;
 
        for (j = 0; j < 4; j++) {
-               int m = (l >> (8 * i) & 0xff) + calc_bias(priv, k, i, j);
+               int m = (l >> (8 * i) & 0xff) + calc_bias(fb, k, i, j);
 
                x |= (0x80 | clamp(m, 0, 0x1f)) << (8 * j);
        }
@@ -88,16 +88,11 @@ calc_ref(struct nv04_fb_priv *priv, int l, int k, int i)
        return x;
 }
 
-int
-nv30_fb_init(struct nvkm_object *object)
+void
+nv30_fb_init(struct nvkm_fb *fb)
 {
-       struct nvkm_device *device = nv_device(object);
-       struct nv04_fb_priv *priv = (void *)object;
-       int ret, i, j;
-
-       ret = nvkm_fb_init(&priv->base);
-       if (ret)
-               return ret;
+       struct nvkm_device *device = fb->subdev.device;
+       int i, j;
 
        /* Init the memory timing regs at 0x10037c/0x1003ac */
        if (device->chipset == 0x30 ||
@@ -105,36 +100,34 @@ nv30_fb_init(struct nvkm_object *object)
            device->chipset == 0x35) {
                /* Related to ROP count */
                int n = (device->chipset == 0x31 ? 2 : 4);
-               int l = nv_rd32(priv, 0x1003d0);
+               int l = nvkm_rd32(device, 0x1003d0);
 
                for (i = 0; i < n; i++) {
                        for (j = 0; j < 3; j++)
-                               nv_wr32(priv, 0x10037c + 0xc * i + 0x4 * j,
-                                       calc_ref(priv, l, 0, j));
+                               nvkm_wr32(device, 0x10037c + 0xc * i + 0x4 * j,
+                                         calc_ref(fb, l, 0, j));
 
                        for (j = 0; j < 2; j++)
-                               nv_wr32(priv, 0x1003ac + 0x8 * i + 0x4 * j,
-                                       calc_ref(priv, l, 1, j));
+                               nvkm_wr32(device, 0x1003ac + 0x8 * i + 0x4 * j,
+                                         calc_ref(fb, l, 1, j));
                }
        }
-
-       return 0;
 }
 
-struct nvkm_oclass *
-nv30_fb_oclass = &(struct nv04_fb_impl) {
-       .base.base.handle = NV_SUBDEV(FB, 0x30),
-       .base.base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv04_fb_ctor,
-               .dtor = _nvkm_fb_dtor,
-               .init = nv30_fb_init,
-               .fini = _nvkm_fb_fini,
-       },
-       .base.memtype = nv04_fb_memtype_valid,
-       .base.ram = &nv20_ram_oclass,
+static const struct nvkm_fb_func
+nv30_fb = {
+       .init = nv30_fb_init,
        .tile.regions = 8,
        .tile.init = nv30_fb_tile_init,
        .tile.comp = nv30_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
+nv30_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)
+{
+       return nvkm_fb_new_(&nv30_fb, device, index, pfb);
+}