[PATCH xserver v8 06/14] modesetting: Add support for multi-plane pixmaps when page-flipping

[Daniel Stone]

From: Louis-Francis Ratté-Boulianne 

This allows the uses of CCS compressed or tiled pixmaps as BOs when
page-flipping.

Signed-off-by: Louis-Francis Ratté-Boulianne 
Reviewed-by: Daniel Stone 
---
 hw/xfree86/drivers/modesetting/drmmode_display.c | 49 
 hw/xfree86/drivers/modesetting/drmmode_display.h |  4 ++
 hw/xfree86/drivers/modesetting/pageflip.c| 16 
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c 
b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 8674c2c16..ee9f4d724 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -39,6 +39,8 @@
 #include "micmap.h"
 #include "xf86cmap.h"
 #include "xf86DDC.h"
+#include 
+#include 
 
 #include 
 #include "xf86Crtc.h"
@@ -376,10 +378,57 @@ drmmode_bo_map(drmmode_ptr drmmode, drmmode_bo *bo)
 return bo->dumb->ptr;
 }
 
+int
+drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo,
+  uint32_t *fb_id)
+{
+#ifdef GBM_BO_WITH_MODIFIERS
+if (bo->gbm &&
+gbm_bo_get_modifier(bo->gbm) != DRM_FORMAT_MOD_INVALID) {
+int num_fds;
+
+num_fds = gbm_bo_get_plane_count(bo->gbm);
+if (num_fds > 0) {
+int i;
+uint32_t format;
+uint32_t handles[4];
+uint32_t strides[4];
+uint32_t offsets[4];
+uint64_t modifiers[4];
+
+memset(handles, 0, sizeof(handles));
+memset(strides, 0, sizeof(strides));
+memset(offsets, 0, sizeof(offsets));
+memset(modifiers, 0, sizeof(modifiers));
+
+format = gbm_bo_get_format(bo->gbm);
+for (i = 0; i < num_fds; i++) {
+handles[i] = gbm_bo_get_handle_for_plane(bo->gbm, i).u32;
+strides[i] = gbm_bo_get_stride_for_plane(bo->gbm, i);
+offsets[i] = gbm_bo_get_offset(bo->gbm, i);
+modifiers[i] = gbm_bo_get_modifier(bo->gbm);
+}
+
+return drmModeAddFB2WithModifiers(drmmode->fd, bo->width, 
bo->height,
+  format, handles, strides,
+  offsets, modifiers, fb_id,
+  DRM_MODE_FB_MODIFIERS);
+}
+}
+#endif
+return drmModeAddFB(drmmode->fd, bo->width, bo->height,
+drmmode->scrn->depth, drmmode->scrn->bitsPerPixel,
+drmmode_bo_get_pitch(bo),
+drmmode_bo_get_handle(bo), fb_id);
+}
+
 static Bool
 drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
   unsigned width, unsigned height, unsigned bpp)
 {
+bo->width = width;
+bo->height = height;
+
 #ifdef GLAMOR_HAS_GBM
 if (drmmode->glamor) {
 bo->gbm = gbm_bo_create(drmmode->gbm, width, height,
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.h 
b/hw/xfree86/drivers/modesetting/drmmode_display.h
index 1f24c3a5b..177ccabd7 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.h
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.h
@@ -53,6 +53,8 @@ enum drmmode_plane_type {
 };
 
 typedef struct {
+uint32_t width;
+uint32_t height;
 struct dumb_bo *dumb;
 #ifdef GLAMOR_HAS_GBM
 struct gbm_bo *gbm;
@@ -202,6 +204,8 @@ extern DevPrivateKeyRec msPixmapPrivateKeyRec;
 
 #define msGetPixmapPriv(drmmode, p) 
((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, 
&(drmmode)->pixmapPrivateKeyRec))
 
+int drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo,
+  uint32_t *fb_id);
 int drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo);
 uint32_t drmmode_bo_get_pitch(drmmode_bo *bo);
 uint32_t drmmode_bo_get_handle(drmmode_bo *bo);
diff --git a/hw/xfree86/drivers/modesetting/pageflip.c 
b/hw/xfree86/drivers/modesetting/pageflip.c
index dd296cd12..027ebfe42 100644
--- a/hw/xfree86/drivers/modesetting/pageflip.c
+++ b/hw/xfree86/drivers/modesetting/pageflip.c
@@ -258,6 +258,7 @@ ms_do_pageflip(ScreenPtr screen,
 
 new_front_bo.gbm = glamor_gbm_bo_from_pixmap(screen, new_front);
 new_front_bo.dumb = NULL;
+
 if (!new_front_bo.gbm) {
 xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to get GBM bo for flip to new front.\n");
@@ -288,14 +289,12 @@ ms_do_pageflip(ScreenPtr screen,
 
 /* Create a new handle for the back buffer */
 flipdata->old_fb_id = ms->drmmode.fb_id;
-if (drmModeAddFB(ms->fd, scrn->virtualX, scrn->virtualY,
- scrn->depth, scrn->bitsPerPixel,
- drmmode_bo_get_pitch(_front_bo),
- drmmode_bo_get_handle(_front_bo), 
>drmmode.fb_id)) {
-goto error_out;
-}
 
-drmmode_bo_destroy(>drmmode, _front_bo);
+new_front_bo.width = new_front->drawable.width;
+

[PATCH xserver v8 06/14] modesetting: Add support for multi-plane pixmaps when page-flipping

[Daniel Stone]

From: Louis-Francis Ratté-Boulianne 

This allows the uses of CCS compressed or tiled pixmaps as BOs when
page-flipping.

Signed-off-by: Louis-Francis Ratté-Boulianne 
Reviewed-by: Daniel Stone 
---
 hw/xfree86/drivers/modesetting/drmmode_display.c | 49 
 hw/xfree86/drivers/modesetting/drmmode_display.h |  4 ++
 hw/xfree86/drivers/modesetting/pageflip.c| 16 
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c 
b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 8674c2c16..ee9f4d724 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -39,6 +39,8 @@
 #include "micmap.h"
 #include "xf86cmap.h"
 #include "xf86DDC.h"
+#include 
+#include 
 
 #include 
 #include "xf86Crtc.h"
@@ -376,10 +378,57 @@ drmmode_bo_map(drmmode_ptr drmmode, drmmode_bo *bo)
 return bo->dumb->ptr;
 }
 
+int
+drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo,
+  uint32_t *fb_id)
+{
+#ifdef GBM_BO_WITH_MODIFIERS
+if (bo->gbm &&
+gbm_bo_get_modifier(bo->gbm) != DRM_FORMAT_MOD_INVALID) {
+int num_fds;
+
+num_fds = gbm_bo_get_plane_count(bo->gbm);
+if (num_fds > 0) {
+int i;
+uint32_t format;
+uint32_t handles[4];
+uint32_t strides[4];
+uint32_t offsets[4];
+uint64_t modifiers[4];
+
+memset(handles, 0, sizeof(handles));
+memset(strides, 0, sizeof(strides));
+memset(offsets, 0, sizeof(offsets));
+memset(modifiers, 0, sizeof(modifiers));
+
+format = gbm_bo_get_format(bo->gbm);
+for (i = 0; i < num_fds; i++) {
+handles[i] = gbm_bo_get_handle_for_plane(bo->gbm, i).u32;
+strides[i] = gbm_bo_get_stride_for_plane(bo->gbm, i);
+offsets[i] = gbm_bo_get_offset(bo->gbm, i);
+modifiers[i] = gbm_bo_get_modifier(bo->gbm);
+}
+
+return drmModeAddFB2WithModifiers(drmmode->fd, bo->width, 
bo->height,
+  format, handles, strides,
+  offsets, modifiers, fb_id,
+  DRM_MODE_FB_MODIFIERS);
+}
+}
+#endif
+return drmModeAddFB(drmmode->fd, bo->width, bo->height,
+drmmode->scrn->depth, drmmode->scrn->bitsPerPixel,
+drmmode_bo_get_pitch(bo),
+drmmode_bo_get_handle(bo), fb_id);
+}
+
 static Bool
 drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
   unsigned width, unsigned height, unsigned bpp)
 {
+bo->width = width;
+bo->height = height;
+
 #ifdef GLAMOR_HAS_GBM
 if (drmmode->glamor) {
 bo->gbm = gbm_bo_create(drmmode->gbm, width, height,
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.h 
b/hw/xfree86/drivers/modesetting/drmmode_display.h
index 1f24c3a5b..177ccabd7 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.h
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.h
@@ -53,6 +53,8 @@ enum drmmode_plane_type {
 };
 
 typedef struct {
+uint32_t width;
+uint32_t height;
 struct dumb_bo *dumb;
 #ifdef GLAMOR_HAS_GBM
 struct gbm_bo *gbm;
@@ -202,6 +204,8 @@ extern DevPrivateKeyRec msPixmapPrivateKeyRec;
 
 #define msGetPixmapPriv(drmmode, p) 
((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, 
&(drmmode)->pixmapPrivateKeyRec))
 
+int drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo,
+  uint32_t *fb_id);
 int drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo);
 uint32_t drmmode_bo_get_pitch(drmmode_bo *bo);
 uint32_t drmmode_bo_get_handle(drmmode_bo *bo);
diff --git a/hw/xfree86/drivers/modesetting/pageflip.c 
b/hw/xfree86/drivers/modesetting/pageflip.c
index dd296cd12..027ebfe42 100644
--- a/hw/xfree86/drivers/modesetting/pageflip.c
+++ b/hw/xfree86/drivers/modesetting/pageflip.c
@@ -258,6 +258,7 @@ ms_do_pageflip(ScreenPtr screen,
 
 new_front_bo.gbm = glamor_gbm_bo_from_pixmap(screen, new_front);
 new_front_bo.dumb = NULL;
+
 if (!new_front_bo.gbm) {
 xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to get GBM bo for flip to new front.\n");
@@ -288,14 +289,12 @@ ms_do_pageflip(ScreenPtr screen,
 
 /* Create a new handle for the back buffer */
 flipdata->old_fb_id = ms->drmmode.fb_id;
-if (drmModeAddFB(ms->fd, scrn->virtualX, scrn->virtualY,
- scrn->depth, scrn->bitsPerPixel,
- drmmode_bo_get_pitch(_front_bo),
- drmmode_bo_get_handle(_front_bo), 
>drmmode.fb_id)) {
-goto error_out;
-}
 
-drmmode_bo_destroy(>drmmode, _front_bo);
+new_front_bo.width = new_front->drawable.width;
+