Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / winsys / drm / nouveau / drm / nouveau_drm_api.c

diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
index 091cbbcfed137cc301eb0ac9081ca92de7526288..f512c0e5f328dba0e802bd4c4c97e579c6c45ada 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
+++ b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
@@ -112,7 +112,7 @@ nouveau_drm_create_screen(struct drm_api *api, int fd,
                return NULL;
        }
 
-       if (arg->mode == DRM_CREATE_DRI1) {
+       if (arg && arg->mode == DRM_CREATE_DRI1) {
                struct nouveau_dri *nvdri = dri1->ddx_info;
                enum pipe_format format;
 
@@ -197,6 +197,7 @@ nouveau_drm_pt_from_name(struct drm_api *api, struct pipe_screen *pscreen,
                         unsigned stride, unsigned handle)
 {
        struct nouveau_device *dev = nouveau_screen(pscreen)->device;
+       struct pipe_texture *pt;
        struct pipe_buffer *pb;
        int ret;
 
@@ -218,7 +219,9 @@ nouveau_drm_pt_from_name(struct drm_api *api, struct pipe_screen *pscreen,
        pb->usage = PIPE_BUFFER_USAGE_GPU_READ_WRITE |
                    PIPE_BUFFER_USAGE_CPU_READ_WRITE;
        pb->size = nouveau_bo(pb)->size;
-       return pscreen->texture_blanket(pscreen, templ, &stride, pb);
+       pt = pscreen->texture_blanket(pscreen, templ, &stride, pb);
+       pipe_buffer_reference(&pb, NULL);
+       return pt;
 }
 
 static boolean
@@ -245,6 +248,7 @@ nouveau_drm_handle_from_pt(struct drm_api *api, struct pipe_screen *pscreen,
                return false;
 
        *handle = mt->bo->handle;
+       *stride = mt->base.nblocksx[0] * mt->base.block.size;
        return true;
 }