Mesa (master): lima: handle DRM_FORMAT_MOD_INVALID in resource_from_handle()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 01a451b04d2da9981ea8f16f9d0d6a49fcc6c2df
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01a451b04d2da9981ea8f16f9d0d6a49fcc6c2df

Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Sun Dec  8 12:03:42 2019 -0800

lima: handle DRM_FORMAT_MOD_INVALID in resource_from_handle()

Assume that resource is tiled if we get DRM_FORMAT_MOD_INVALID
in resource_from_handle() and we don't have RO.

Fixes: 8c12f4e5f24f ("lima: enable tiling")
Reviewed-by: Qiang Yu <yuq825 at gmail.com>
Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>

---

 src/gallium/drivers/lima/lima_resource.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
index b5c7d11a83e..1b589ed5279 100644
--- a/src/gallium/drivers/lima/lima_resource.c
+++ b/src/gallium/drivers/lima/lima_resource.c
@@ -329,9 +329,13 @@ lima_resource_from_handle(struct pipe_screen *pscreen,
    case DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED:
       res->tiled = true;
       break;
+   case DRM_FORMAT_MOD_INVALID:
+      res->tiled = screen->ro == NULL;
+      break;
    default:
       fprintf(stderr, "Attempted to import unsupported modifier 0x%llx\n",
                   (long long)handle->modifier);
+      goto err_out;
    }
 
    return pres;