X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnv50%2Fnv50_miptree.c;h=bc81604508b3a92cc62b3d2daabef0695fdd8e5a;hb=56503fd13847ae5072af761ac69b923323e053f8;hp=b7cd92158febb35c55b138d29d3ad7e80a27e7bd;hpb=35489ef285f1fde234b2b9bbb91fdc41fddefc02;p=mesa.git

diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index b7cd92158fe..bc81604508b 100644
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -27,291 +27,406 @@
 
 #include "nv50_context.h"
 #include "nv50_resource.h"
-#include "nv50_transfer.h"
 
-/* The restrictions in tile mode selection probably aren't necessary. */
 static INLINE uint32_t
-get_tile_mode(unsigned ny, unsigned d)
+nv50_tex_choose_tile_dims(unsigned nx, unsigned ny, unsigned nz)
 {
-	uint32_t tile_mode = 0x00;
-
-	if (ny > 32) tile_mode = 0x04; /* height 64 tiles */
-	else
-	if (ny > 16) tile_mode = 0x03; /* height 32 tiles */
-	else
-	if (ny >  8) tile_mode = 0x02; /* height 16 tiles */
-	else
-	if (ny >  4) tile_mode = 0x01; /* height 8 tiles */
-
-	if (d == 1)
-		return tile_mode;
-	else
-	if (tile_mode > 0x02)
-		tile_mode = 0x02;
-
-	if (d > 16 && tile_mode < 0x02)
-		return tile_mode | 0x50; /* depth 32 tiles */
-	if (d >  8) return tile_mode | 0x40; /* depth 16 tiles */
-	if (d >  4) return tile_mode | 0x30; /* depth 8 tiles */
-	if (d >  2) return tile_mode | 0x20; /* depth 4 tiles */
-
-	return tile_mode | 0x10;
+   return nvc0_tex_choose_tile_dims(nx, ny * 2, nz) >> 4;
 }
 
-static INLINE unsigned
-get_zslice_offset(unsigned tile_mode, unsigned z, unsigned pitch, unsigned nb_h)
+static uint32_t
+nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
 {
-	unsigned tile_h = get_tile_height(tile_mode);
-	unsigned tile_d = get_tile_depth(tile_mode);
+   const unsigned ms = util_logbase2(mt->base.base.nr_samples);
+
+   uint32_t tile_flags;
+
+   if (mt->base.base.bind & PIPE_BIND_CURSOR)
+      return NOUVEAU_BO_TILE_SCANOUT;
+
+   switch (mt->base.base.format) {
+   case PIPE_FORMAT_Z16_UNORM:
+      tile_flags = 0x6c00 + (ms << 8);
+      break;
+   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
+      tile_flags = 0x1800 + (ms << 8);
+      break;
+   case PIPE_FORMAT_Z24X8_UNORM:
+   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
+      tile_flags = 0x22800 + (ms << 8);
+      break;
+   case PIPE_FORMAT_Z32_FLOAT:
+      tile_flags = 0x4000 + (ms << 8);
+      break;
+   case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:
+      tile_flags = 0x6000 + (ms << 8);
+      break;
+   default:
+      switch (util_format_get_blocksizebits(mt->base.base.format)) {
+      case 128:
+         assert(ms < 3);
+         tile_flags = 0x7400;
+         break;
+      case 64:
+         switch (ms) {
+         case 2: tile_flags = 0x17c00; break;
+         case 3: tile_flags = 0x17d00; break;
+         default:
+            tile_flags = 0x7000;
+            break;
+         }
+         break;
+      case 32:
+         if (mt->base.base.bind & PIPE_BIND_SCANOUT) {
+            assert(ms == 0);
+            tile_flags = 0x7a00;
+         } else {
+            switch (ms) {
+            case 2: tile_flags = 0x17800; break;
+            case 3: tile_flags = 0x17900; break;
+            default:
+               tile_flags = 0x7000;
+               break;
+            }
+         }
+         break;
+      case 16:
+      case 8:
+         tile_flags = 0x7000;
+         break;
+      default:
+         return 0;
+      }
+      if (mt->base.base.bind & PIPE_BIND_CURSOR)
+         tile_flags = 0;
+   }
+
+   if (mt->base.base.bind & (PIPE_BIND_SCANOUT | PIPE_BIND_CURSOR))
+      tile_flags |= NOUVEAU_BO_TILE_SCANOUT;
+
+   if (!compressed)
+      tile_flags &= ~0x30000;
+
+   return tile_flags;
+}
+
+void
+nv50_miptree_destroy(struct pipe_screen *pscreen, struct pipe_resource *pt)
+{
+   struct nv50_miptree *mt = nv50_miptree(pt);
 
-	/* pitch_2d == to next slice within this volume-tile */
-	/* pitch_3d == size (in bytes) of a volume-tile */
-	unsigned pitch_2d = tile_h * 64;
-	unsigned pitch_3d = tile_d * align(nb_h, tile_h) * pitch;
+   nouveau_screen_bo_release(pscreen, mt->base.bo);
 
-	return (z % tile_d) * pitch_2d + (z / tile_d) * pitch_3d;
+   FREE(mt);
 }
 
+boolean
+nv50_miptree_get_handle(struct pipe_screen *pscreen,
+                        struct pipe_resource *pt,
+                        struct winsys_handle *whandle)
+{
+   struct nv50_miptree *mt = nv50_miptree(pt);
+   unsigned stride;
 
+   if (!mt || !mt->base.bo)
+      return FALSE;
 
+   stride = util_format_get_stride(mt->base.base.format,
+                                   mt->base.base.width0);
 
-static void
-nv50_miptree_destroy(struct pipe_screen *pscreen,
-		     struct pipe_resource *pt)
-{
-	struct nv50_miptree *mt = nv50_miptree(pt);
-	unsigned l;
+   return nouveau_screen_bo_get_handle(pscreen,
+                                       mt->base.bo,
+                                       stride,
+                                       whandle);
+}
 
-	for (l = 0; l <= pt->last_level; ++l)
-		FREE(mt->level[l].image_offset);
+const struct u_resource_vtbl nv50_miptree_vtbl =
+{
+   nv50_miptree_get_handle,         /* get_handle */
+   nv50_miptree_destroy,            /* resource_destroy */
+   nv50_miptree_transfer_new,       /* get_transfer */
+   nv50_miptree_transfer_del,       /* transfer_destroy */
+   nv50_miptree_transfer_map,       /* transfer_map */
+   u_default_transfer_flush_region, /* transfer_flush_region */
+   nv50_miptree_transfer_unmap,     /* transfer_unmap */
+   u_default_transfer_inline_write  /* transfer_inline_write */
+};
 
-	nouveau_screen_bo_release(pscreen, mt->base.bo);
-	FREE(mt);
+static INLINE boolean
+nv50_miptree_init_ms_mode(struct nv50_miptree *mt)
+{
+   switch (mt->base.base.nr_samples) {
+   case 8:
+      mt->ms_mode = NV50_3D_MULTISAMPLE_MODE_MS8;
+      mt->ms_x = 2;
+      mt->ms_y = 1;
+      break;
+   case 4:
+      mt->ms_mode = NV50_3D_MULTISAMPLE_MODE_MS4;
+      mt->ms_x = 1;
+      mt->ms_y = 1;
+      break;
+   case 2:
+      mt->ms_mode = NV50_3D_MULTISAMPLE_MODE_MS2;
+      mt->ms_x = 1;
+      break;
+   case 1:
+   case 0:
+      mt->ms_mode = NV50_3D_MULTISAMPLE_MODE_MS1;
+      break;
+   default:
+      NOUVEAU_ERR("invalid nr_samples: %u\n", mt->base.base.nr_samples);
+      return FALSE;
+   }
+   return TRUE;
 }
 
-static boolean
-nv50_miptree_get_handle(struct pipe_screen *pscreen,
-			struct pipe_resource *pt,
-			struct winsys_handle *whandle)
+boolean
+nv50_miptree_init_layout_linear(struct nv50_miptree *mt)
 {
-	struct nv50_miptree *mt = nv50_miptree(pt);
-	unsigned stride;
+   struct pipe_resource *pt = &mt->base.base;
 
+   if (util_format_is_depth_or_stencil(pt->format))
+      return FALSE;
 
-	if (!mt || !mt->base.bo)
-		return FALSE;
+   if ((pt->last_level > 0) || (pt->depth0 > 1) || (pt->array_size > 1))
+      return FALSE;
+   if (mt->ms_x | mt->ms_y)
+      return FALSE;
 
-	stride = util_format_get_stride(mt->base.base.format,
-					mt->base.base.width0);
+   mt->level[0].pitch = align(pt->width0, 64);
 
-	return nouveau_screen_bo_get_handle(pscreen,
-					    mt->base.bo,
-					    stride,
-					    whandle);
-}
+   mt->total_size = mt->level[0].pitch * pt->height0;
 
+   return TRUE;
+}
 
-const struct u_resource_vtbl nv50_miptree_vtbl =
+static void
+nv50_miptree_init_layout_tiled(struct nv50_miptree *mt)
 {
-   nv50_miptree_get_handle,	      /* get_handle */
-   nv50_miptree_destroy,	      /* resource_destroy */
-   NULL,			      /* is_resource_referenced */
-   nv50_miptree_transfer_new,	      /* get_transfer */
-   nv50_miptree_transfer_del,     /* transfer_destroy */
-   nv50_miptree_transfer_map,	      /* transfer_map */
-   u_default_transfer_flush_region,   /* transfer_flush_region */
-   nv50_miptree_transfer_unmap,	      /* transfer_unmap */
-   u_default_transfer_inline_write    /* transfer_inline_write */
-};
+   struct pipe_resource *pt = &mt->base.base;
+   unsigned w, h, d, l;
+   const unsigned blocksize = util_format_get_blocksize(pt->format);
+
+   mt->layout_3d = pt->target == PIPE_TEXTURE_3D;
+
+   w = pt->width0 << mt->ms_x;
+   h = pt->height0 << mt->ms_y;
 
+   /* For 3D textures, a mipmap is spanned by all the layers, for array
+    * textures and cube maps, each layer contains its own mipmaps.
+    */
+   d = mt->layout_3d ? pt->depth0 : 1;
 
+   for (l = 0; l <= pt->last_level; ++l) {
+      struct nv50_miptree_level *lvl = &mt->level[l];
+      unsigned tsx, tsy, tsz;
+      unsigned nbx = util_format_get_nblocksx(pt->format, w);
+      unsigned nby = util_format_get_nblocksy(pt->format, h);
+
+      lvl->offset = mt->total_size;
+
+      lvl->tile_mode = nv50_tex_choose_tile_dims(nbx, nby, d);
+
+      tsx = NV50_TILE_SIZE_X(lvl->tile_mode); /* x is tile row pitch in bytes */
+      tsy = NV50_TILE_SIZE_Y(lvl->tile_mode);
+      tsz = NV50_TILE_SIZE_Z(lvl->tile_mode);
+
+      lvl->pitch = align(nbx * blocksize, tsx);
+
+      mt->total_size += lvl->pitch * align(nby, tsy) * align(d, tsz);
+
+      w = u_minify(w, 1);
+      h = u_minify(h, 1);
+      d = u_minify(d, 1);
+   }
+
+   if (pt->array_size > 1) {
+      mt->layer_stride = align(mt->total_size,
+                               NV50_TILE_SIZE(mt->level[0].tile_mode));
+      mt->total_size = mt->layer_stride * pt->array_size;
+   }
+}
 
 struct pipe_resource *
-nv50_miptree_create(struct pipe_screen *pscreen, const struct pipe_resource *tmp)
+nv50_miptree_create(struct pipe_screen *pscreen,
+                    const struct pipe_resource *templ)
 {
-	struct nouveau_device *dev = nouveau_screen(pscreen)->device;
-	struct nv50_miptree *mt = CALLOC_STRUCT(nv50_miptree);
-	struct pipe_resource *pt = &mt->base.base;
-	unsigned width = tmp->width0, height = tmp->height0;
-	unsigned depth = tmp->depth0, image_alignment;
-	uint32_t tile_flags;
-	int ret, i, l;
-
-	if (!mt)
-		return NULL;
-
-	*pt = *tmp;
-	mt->base.vtbl = &nv50_miptree_vtbl;
-	pipe_reference_init(&pt->reference, 1);
-	pt->screen = pscreen;
-
-	switch (pt->format) {
-	case PIPE_FORMAT_Z32_FLOAT:
-		tile_flags = 0x4800;
-		break;
-	case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
-		tile_flags = 0x1800;
-		break;
-	case PIPE_FORMAT_Z16_UNORM:
-		tile_flags = 0x6c00;
-		break;
-	case PIPE_FORMAT_Z24X8_UNORM:
-	case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
-		tile_flags = 0x2800;
-		break;
-	case PIPE_FORMAT_R32G32B32A32_FLOAT:
-	case PIPE_FORMAT_R32G32B32_FLOAT:
-		tile_flags = 0x7400;
-		break;
-	default:
-		if ((pt->bind & PIPE_BIND_SCANOUT) &&
-		    util_format_get_blocksizebits(pt->format) == 32)
-			tile_flags = 0x7a00;
-		else
-			tile_flags = 0x7000;
-		break;
-	}
-
-	/* XXX: texture arrays */
-	mt->image_nr = (pt->target == PIPE_TEXTURE_CUBE) ? 6 : 1;
-
-	for (l = 0; l <= pt->last_level; l++) {
-		struct nv50_miptree_level *lvl = &mt->level[l];
-		unsigned nblocksy = util_format_get_nblocksy(pt->format, height);
-
-		lvl->image_offset = CALLOC(mt->image_nr, sizeof(int));
-		lvl->pitch = align(util_format_get_stride(pt->format, width), 64);
-		lvl->tile_mode = get_tile_mode(nblocksy, depth);
-
-		width = u_minify(width, 1);
-		height = u_minify(height, 1);
-		depth = u_minify(depth, 1);
-	}
-
-	image_alignment  = get_tile_height(mt->level[0].tile_mode) * 64;
-	image_alignment *= get_tile_depth(mt->level[0].tile_mode);
-
-	/* NOTE the distinction between arrays of mip-mapped 2D textures and
-	 * mip-mapped 3D textures. We can't use image_nr == depth for 3D mip.
-	 */
-	for (i = 0; i < mt->image_nr; i++) {
-		for (l = 0; l <= pt->last_level; l++) {
-			struct nv50_miptree_level *lvl = &mt->level[l];
-			int size;
-			unsigned tile_h = get_tile_height(lvl->tile_mode);
-			unsigned tile_d = get_tile_depth(lvl->tile_mode);
-
-			size  = lvl->pitch;
-			size *= align(util_format_get_nblocksy(pt->format, u_minify(pt->height0, l)), tile_h);
-			size *= align(u_minify(pt->depth0, l), tile_d);
-
-			lvl->image_offset[i] = mt->total_size;
-
-			mt->total_size += size;
-		}
-		mt->total_size = align(mt->total_size, image_alignment);
-	}
-
-	ret = nouveau_bo_new_tile(dev, NOUVEAU_BO_VRAM, 256, mt->total_size,
-				  mt->level[0].tile_mode, tile_flags,
-				  &mt->base.bo);
-	if (ret) {
-		for (l = 0; l <= pt->last_level; ++l)
-			FREE(mt->level[l].image_offset);
-		FREE(mt);
-		return NULL;
-	}
-
-	return pt;
+   struct nouveau_device *dev = nouveau_screen(pscreen)->device;
+   struct nv50_miptree *mt = CALLOC_STRUCT(nv50_miptree);
+   struct pipe_resource *pt = &mt->base.base;
+   int ret;
+   uint32_t tile_flags;
+
+   if (!mt)
+      return NULL;
+
+   mt->base.vtbl = &nv50_miptree_vtbl;
+   *pt = *templ;
+   pipe_reference_init(&pt->reference, 1);
+   pt->screen = pscreen;
+
+   tile_flags = nv50_mt_choose_storage_type(mt, TRUE);
+
+   if (!nv50_miptree_init_ms_mode(mt)) {
+      FREE(mt);
+      return NULL;
+   }
+
+   if (tile_flags & NOUVEAU_BO_TILE_LAYOUT_MASK) {
+      nv50_miptree_init_layout_tiled(mt);
+   } else
+   if (!nv50_miptree_init_layout_linear(mt)) {
+      FREE(mt);
+      return NULL;
+   }
+
+   ret = nouveau_bo_new_tile(dev, NOUVEAU_BO_VRAM, 4096,
+                             mt->total_size,
+                             mt->level[0].tile_mode, tile_flags,
+                             &mt->base.bo);
+   if (ret) {
+      FREE(mt);
+      return NULL;
+   }
+   mt->base.domain = NOUVEAU_BO_VRAM;
+
+   return pt;
 }
 
-
 struct pipe_resource *
 nv50_miptree_from_handle(struct pipe_screen *pscreen,
-			 const struct pipe_resource *template,
-			 struct winsys_handle *whandle)
+                         const struct pipe_resource *templ,
+                         struct winsys_handle *whandle)
 {
-	struct nv50_miptree *mt;
-	unsigned stride;
-
-	/* Only supports 2D, non-mipmapped textures for the moment */
-	if (template->target != PIPE_TEXTURE_2D ||
-	    template->last_level != 0 ||
-	    template->depth0 != 1)
-		return NULL;
-
-	mt = CALLOC_STRUCT(nv50_miptree);
-	if (!mt)
-		return NULL;
-
-	mt->base.bo = nouveau_screen_bo_from_handle(pscreen, whandle, &stride);
-	if (mt->base.bo == NULL) {
-		FREE(mt);
-		return NULL;
-	}
-
-
-	mt->base.base = *template;
-	mt->base.vtbl = &nv50_miptree_vtbl;
-	pipe_reference_init(&mt->base.base.reference, 1);
-	mt->base.base.screen = pscreen;
-	mt->image_nr = 1;
-	mt->level[0].pitch = stride;
-	mt->level[0].image_offset = CALLOC(1, sizeof(unsigned));
-	mt->level[0].tile_mode = mt->base.bo->tile_mode;
-
-	/* XXX: Need to adjust bo refcount??
-	 */
-	/* nouveau_bo_ref(bo, &mt->base.bo); */
-	return &mt->base.base;
+   struct nv50_miptree *mt;
+   unsigned stride;
+
+   /* only supports 2D, non-mipmapped textures for the moment */
+   if ((templ->target != PIPE_TEXTURE_2D &&
+        templ->target != PIPE_TEXTURE_RECT) ||
+       templ->last_level != 0 ||
+       templ->depth0 != 1 ||
+       templ->array_size > 1)
+      return NULL;
+
+   mt = CALLOC_STRUCT(nv50_miptree);
+   if (!mt)
+      return NULL;
+
+   mt->base.bo = nouveau_screen_bo_from_handle(pscreen, whandle, &stride);
+   if (mt->base.bo == NULL) {
+      FREE(mt);
+      return NULL;
+   }
+
+   mt->base.base = *templ;
+   mt->base.vtbl = &nv50_miptree_vtbl;
+   pipe_reference_init(&mt->base.base.reference, 1);
+   mt->base.base.screen = pscreen;
+   mt->level[0].pitch = stride;
+   mt->level[0].offset = 0;
+   mt->level[0].tile_mode = mt->base.bo->tile_mode;
+
+   /* no need to adjust bo reference count */
+   return &mt->base.base;
 }
 
 
+/* Offset of zslice @z from start of level @l. */
+INLINE unsigned
+nv50_mt_zslice_offset(const struct nv50_miptree *mt, unsigned l, unsigned z)
+{
+   const struct pipe_resource *pt = &mt->base.base;
+
+   unsigned tds = NV50_TILE_SHIFT_Z(mt->level[l].tile_mode);
+   unsigned ths = NV50_TILE_SHIFT_Y(mt->level[l].tile_mode);
+
+   unsigned nby = util_format_get_nblocksy(pt->format,
+                                           u_minify(pt->height0, l));
+
+   /* to next 2D tile slice within a 3D tile */
+   unsigned stride_2d = NV50_TILE_SIZE_2D(mt->level[l].tile_mode);
+
+   /* to slice in the next (in z direction) 3D tile */
+   unsigned stride_3d = (align(nby, (1 << ths)) * mt->level[l].pitch) << tds;
+
+   return (z & ((1 << tds) - 1)) * stride_2d + (z >> tds) * stride_3d;
+}
 
-/* Surface functions
+/* Surface functions.
  */
 
+struct nv50_surface *
+nv50_surface_from_miptree(struct nv50_miptree *mt,
+                          const struct pipe_surface *templ)
+{
+   struct pipe_surface *ps;
+   struct nv50_surface *ns = CALLOC_STRUCT(nv50_surface);
+   if (!ns)
+      return NULL;
+   ps = &ns->base;
+
+   pipe_reference_init(&ps->reference, 1);
+   pipe_resource_reference(&ps->texture, &mt->base.base);
+
+   ps->format = templ->format;
+   ps->usage = templ->usage;
+   ps->u.tex.level = templ->u.tex.level;
+   ps->u.tex.first_layer = templ->u.tex.first_layer;
+   ps->u.tex.last_layer = templ->u.tex.last_layer;
+
+   ns->width = u_minify(mt->base.base.width0, ps->u.tex.level);
+   ns->height = u_minify(mt->base.base.height0, ps->u.tex.level);
+   ns->depth = ps->u.tex.last_layer - ps->u.tex.first_layer + 1;
+   ns->offset = mt->level[templ->u.tex.level].offset;
+
+   /* comment says there are going to be removed, but they're used by the st */
+   ps->width = ns->width;
+   ps->height = ns->height;
+
+   ns->width <<= mt->ms_x;
+   ns->height <<= mt->ms_y;
+
+   return ns;
+}
+
 struct pipe_surface *
-nv50_miptree_surface_new(struct pipe_screen *pscreen, struct pipe_resource *pt,
-			 unsigned face, unsigned level, unsigned zslice,
-			 unsigned flags)
+nv50_miptree_surface_new(struct pipe_context *pipe,
+                         struct pipe_resource *pt,
+                         const struct pipe_surface *templ)
 {
-	struct nv50_miptree *mt = nv50_miptree(pt);
-	struct nv50_miptree_level *lvl = &mt->level[level];
-	struct pipe_surface *ps;
-	unsigned img = 0;
-
-	if (pt->target == PIPE_TEXTURE_CUBE)
-		img = face;
-
-	ps = CALLOC_STRUCT(pipe_surface);
-	if (!ps)
-		return NULL;
-	pipe_resource_reference(&ps->texture, pt);
-	ps->format = pt->format;
-	ps->width = u_minify(pt->width0, level);
-	ps->height = u_minify(pt->height0, level);
-	ps->usage = flags;
-	pipe_reference_init(&ps->reference, 1);
-	ps->face = face;
-	ps->level = level;
-	ps->zslice = zslice;
-	ps->offset = lvl->image_offset[img];
-
-	if (pt->target == PIPE_TEXTURE_3D) {
-		unsigned nb_h = util_format_get_nblocksy(pt->format, ps->height);
-		ps->offset += get_zslice_offset(lvl->tile_mode, zslice,
-						lvl->pitch, nb_h);
-	}
-
-	return ps;
+   struct nv50_miptree *mt = nv50_miptree(pt);
+   struct nv50_surface *ns = nv50_surface_from_miptree(mt, templ);
+   if (!ns)
+      return NULL;
+   ns->base.context = pipe;
+
+   if (ns->base.u.tex.first_layer) {
+      const unsigned l = ns->base.u.tex.level;
+      const unsigned z = ns->base.u.tex.first_layer;
+
+      if (mt->layout_3d) {
+         ns->offset += nv50_mt_zslice_offset(mt, l, z);
+
+         /* TODO: switch to depth 1 tiles; but actually this shouldn't happen */
+         if (ns->depth > 1 &&
+             (z & (NV50_TILE_SIZE_Z(mt->level[l].tile_mode) - 1)))
+            NOUVEAU_ERR("Creating unsupported 3D surface !\n");
+      } else {
+         ns->offset += mt->layer_stride * z;
+      }
+   }
+
+   return &ns->base;
 }
 
 void
-nv50_miptree_surface_del(struct pipe_surface *ps)
+nv50_miptree_surface_del(struct pipe_context *pipe, struct pipe_surface *ps)
 {
-	struct nv50_surface *s = nv50_surface(ps);
+   struct nv50_surface *s = nv50_surface(ps);
+
+   pipe_resource_reference(&ps->texture, NULL);
 
-	pipe_resource_reference(&ps->texture, NULL);
-	FREE(s);
+   FREE(s);
 }