1 files changed, 107 insertions, 67 deletions

diff --git a/src/newt/native/egl_gbm.c b/src/newt/native/egl_gbm.c
index d4b56378c..afbab9ef2 100644
--- a/src/newt/native/egl_gbm.c
+++ b/src/newt/native/egl_gbm.c
@@ -1,39 +1,12 @@
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include "jogamp_newt_driver_egl_gbm_DisplayDriver.h"
-#include "jogamp_newt_driver_egl_gbm_ScreenDriver.h"
-#include "jogamp_newt_driver_egl_gbm_WindowDriver.h"
-
-#include <xf86drm.h>
-#include <xf86drmMode.h>
-#include <gbm.h>
-
-#define VERBOSE_ON 1
-
-#ifdef VERBOSE_ON
-    #define DBG_PRINT(...) fprintf(stderr, __VA_ARGS__); fflush(stderr) 
-#else
-    #define DBG_PRINT(...)
-#endif
-#define ERR_PRINT(...) fprintf(stderr, __VA_ARGS__); fflush(stderr) 
-
-typedef struct {
-    int fd; // drmClose
-    drmModeRes *resources; // drmModeFreeResources
-    drmModeConnector *connector; // drmModeFreeConnector
-    drmModeEncoder *encoder; // drmModeFreeEncoder
-    drmModeModeInfo *current_mode;
-} DRM_HANDLE;
-
-typedef struct {
-    struct gbm_bo *bo;
-    uint32_t fb_id;
-} DRM_GBM_FB;
+#include "egl_gbm.h"
 
 static jmethodID notifyScreenModeID = NULL;
 
+static jmethodID sizeChangedID = NULL;
+static jmethodID positionChangedID = NULL;
+static jmethodID visibleChangedID = NULL;
+static jmethodID windowDestroyNotifyID = NULL;
+
 /**
  * Display
  */
@@ -48,10 +21,6 @@ static void freeDrm(DRM_HANDLE *drm) {
             drmModeFreeConnector(drm->connector);
             drm->connector = NULL;
         }
-        if( NULL != drm->resources ) {
-            drmModeFreeResources(drm->resources);
-            drm->resources = NULL;
-        }
         if( 0 <= drm->fd ) {
             drmClose(drm->fd);
             drm->fd = -1;
@@ -70,23 +39,35 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initIDs
 JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initDrm
   (JNIEnv *env, jclass clazz, jboolean verbose)
 {
+    static const char *linux_dri_card0 = "/dev/dri/card0";
     static const char *modules[] = {
-            "/dev/dri/card0", "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "msm"
+            "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "msm"
     };
     int module_count = sizeof(modules) / sizeof(const char*);
     const char * module_used = NULL;
-    int i, j, area;
+    int ret, i, j, area;
     DRM_HANDLE *drm = calloc(1, sizeof(DRM_HANDLE));
+    drmModeRes *resources = NULL;
 
 #ifdef VERBOSE_ON
     verbose = JNI_TRUE;
 #endif
 
     if( verbose ) {
-        ERR_PRINT( "EGL_GBM.Display initDrm start (testing %d modules)\n", module_count );
+        ERR_PRINT( "EGL_GBM.Display initDrm start\n");
     }
 
-    for (i = 0; i < module_count; i++) {
+    drm->fd = -1;
+
+#if 1
+    // try linux_dri_card0 first
+    drm->fd = open(linux_dri_card0, O_RDWR);
+    ERR_PRINT("EGL_GBM.Display trying to open '%s': success %d\n", 
+        linux_dri_card0, 0<=drm->fd);
+#endif
+
+    // try drm modules
+    for (i = 0; 0>drm->fd && i < module_count; i++) {
         if( verbose ) {
             ERR_PRINT("EGL_GBM.Display trying to load module[%d/%d] %s...", 
                 i, module_count, modules[i]);
@@ -101,7 +82,6 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initDrm
                 ERR_PRINT("success.\n");
             }
             module_used = modules[i];
-            break;
         }
     }
     if (drm->fd < 0) {
@@ -109,27 +89,38 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initDrm
         goto error;
     }
 
-    drm->resources = drmModeGetResources(drm->fd);
-    if ( NULL == drm->resources ) {
+#if 1
+    ret = drmSetMaster(drm->fd);
+    if(ret) {
+        //drmDropMaster(int fd);
+        DBG_PRINT( "EGL_GBM.Display drmSetMaster fd %d: FAILED: %d %s\n", 
+            drm->fd, ret, strerror(errno));
+    } else {
+        DBG_PRINT( "EGL_GBM.Display drmSetMaster fd %d: OK\n", drm->fd);
+    }
+#endif
+
+    resources = drmModeGetResources(drm->fd);
+    if ( NULL == resources ) {
         ERR_PRINT("EGL_GBM.Display drmModeGetResources failed on module %s: %s\n", 
             module_used, strerror(errno));
         goto error;
     }
 
     if( verbose ) {
-        for (i = 0; i < drm->resources->count_connectors; i++) {
-            drmModeConnector * c = drmModeGetConnector(drm->fd, drm->resources->connectors[i]);
+        for (i = 0; i < resources->count_connectors; i++) {
+            drmModeConnector * c = drmModeGetConnector(drm->fd, resources->connectors[i]);
             int chosen = DRM_MODE_CONNECTED == c->connection;
-            ERR_PRINT( "EGL_GBM.Display Connector %d/%d chosen %d: id[con 0x%X, enc 0x%X], type %d[id 0x%X], connection %d, dim %dx%x mm, modes %d, encoders %d\n",
-                i, drm->resources->count_connectors, chosen,
+            ERR_PRINT( "EGL_GBM.Display Connector %d/%d chosen %d: id[con 0x%x, enc 0x%x], type %d[id 0x%x], connection %d, dim %dx%x mm, modes %d, encoders %d\n",
+                i, resources->count_connectors, chosen,
                 c->connector_id, c->encoder_id, c->connector_type, c->connector_type_id, 
                 c->connection, c->mmWidth, c->mmHeight, c->count_modes, c->count_encoders);
             drmModeFreeConnector(c);
         }
     }
     /* find a connected connector: */
-    for (i = 0; i < drm->resources->count_connectors; i++) {
-        drm->connector = drmModeGetConnector(drm->fd, drm->resources->connectors[i]);
+    for (i = 0; i < resources->count_connectors; i++) {
+        drm->connector = drmModeGetConnector(drm->fd, resources->connectors[i]);
         if( DRM_MODE_CONNECTED == drm->connector->connection ) {
             break;
         } else {
@@ -137,12 +128,12 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initDrm
             drm->connector = NULL;
         }
     }
-    if( i >= drm->resources->count_connectors ) {
+    if( i >= resources->count_connectors ) {
         /* we could be fancy and listen for hotplug events and wait for
          * a connector..
          */
         ERR_PRINT("EGL_GBM.Display no connected connector (connector count %d, module %s)!\n", 
-            drm->resources->count_connectors, module_used);
+            resources->count_connectors, module_used);
         goto error;
     }
 
@@ -168,19 +159,19 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initDrm
     }
 
     if( verbose ) {
-        for (i = 0; i < drm->resources->count_encoders; i++) {
-            drmModeEncoder * e = drmModeGetEncoder(drm->fd, drm->resources->encoders[i]);
+        for (i = 0; i < resources->count_encoders; i++) {
+            drmModeEncoder * e = drmModeGetEncoder(drm->fd, resources->encoders[i]);
             int chosen = e->encoder_id == drm->connector->encoder_id;
-            ERR_PRINT( "EGL_GBM.Display Encoder %d/%d chosen %d: id 0x%X, type %d, crtc_id 0x%X, possible[crtcs %d, clones %d]\n",
-                i, drm->resources->count_encoders, chosen,
+            ERR_PRINT( "EGL_GBM.Display Encoder %d/%d chosen %d: id 0x%x, type %d, crtc_id 0x%x, possible[crtcs %d, clones %d]\n",
+                i, resources->count_encoders, chosen,
                 e->encoder_id, e->encoder_type, e->crtc_id,
                 e->possible_crtcs, e->possible_clones);
             drmModeFreeEncoder(e);
         }
     }
     /* find encoder: */
-    for (i = 0; i < drm->resources->count_encoders; i++) {
-        drm->encoder = drmModeGetEncoder(drm->fd, drm->resources->encoders[i]);
+    for (i = 0; i < resources->count_encoders; i++) {
+        drm->encoder = drmModeGetEncoder(drm->fd, resources->encoders[i]);
         if( drm->encoder->encoder_id == drm->connector->encoder_id ) {
             break;
         } else {
@@ -188,13 +179,23 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_initDrm
             drm->encoder = NULL;
         }
     }
-    if ( i >= drm->resources->count_encoders ) {
+    if ( i >= resources->count_encoders ) {
         ERR_PRINT("EGL_GBM.Display no encoder (module %s)!\n", module_used);
         goto error;
     }
+    for (i = 0; i < resources->count_crtcs; i++) {
+        if (resources->crtcs[i] == drm->encoder->crtc_id) {
+            drm->crtc_index = i;
+            break;
+        }
+    }
+
+    drmModeFreeResources(resources);
+    resources = NULL;
 
     if( verbose ) {
-        DBG_PRINT( "EGL_GBM.Display initDrm end.X0 OK\n");
+        DBG_PRINT( "EGL_GBM.Display initDrm end.X0 OK: fd %d, enc_id 0x%x, crtc_id 0x%x, conn_id 0x%x, curMode %s\n",
+            drm->fd, drm->encoder->encoder_id, drm->encoder->crtc_id, drm->connector->connector_id, drm->current_mode->name);
     }
 
     // drm->crtc_id = encoder->crtc_id;
@@ -205,6 +206,8 @@ error:
     if( verbose ) {
         DBG_PRINT( "EGL_GBM.Display initDrm end.X2 ERROR\n");
     }
+    drmModeFreeResources(resources);
+    resources = NULL;
     freeDrm(drm);
     return 0;
 }
@@ -219,6 +222,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_OpenGBMDis
 {
     DRM_HANDLE *drm = (DRM_HANDLE*) (intptr_t) jdrm;
     struct gbm_device * dev = gbm_create_device(drm->fd);
+    DBG_PRINT( "EGL_GBM.Display OpenGBMDisplay0 handle %p\n", dev);
     return (jlong) (intptr_t) dev;
 }
 
@@ -226,6 +230,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_DisplayDriver_CloseGBMDis
   (JNIEnv *env, jclass clazz, jlong jgbm)
 {
     struct gbm_device * dev = (struct gbm_device *) (intptr_t) jgbm;
+    DBG_PRINT( "EGL_GBM.Display CloseGBMDisplay0 handle %p\n", dev);
     gbm_device_destroy(dev);
 }
 
@@ -283,24 +288,58 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_ScreenDriver_initNative
 JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_initIDs
   (JNIEnv *env, jclass clazz)
 {
+    sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(ZIIZ)V");
+    positionChangedID = (*env)->GetMethodID(env, clazz, "positionChanged", "(ZII)V");
+    visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V");
+    windowDestroyNotifyID = (*env)->GetMethodID(env, clazz, "windowDestroyNotify", "(Z)Z");
+    if (sizeChangedID == NULL ||
+        positionChangedID == NULL ||
+        visibleChangedID == NULL ||
+        windowDestroyNotifyID == NULL) {
+        DBG_PRINT( "initIDs failed\n" );
+        return JNI_FALSE;
+    }
     DBG_PRINT( "EGL_GBM.Window initIDs ok\n" );
     return JNI_TRUE;
 }
 
+#ifndef DRM_FORMAT_MOD_LINEAR
+    #define DRM_FORMAT_MOD_LINEAR 0
+#endif
+
+WEAK struct gbm_surface *
+gbm_surface_create_with_modifiers(struct gbm_device *gbm,
+                                  uint32_t width, uint32_t height,
+                                  uint32_t format,
+                                  const uint64_t *modifiers,
+                                  const unsigned int count);
+
 JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_CreateWindow0
-  (JNIEnv *env, jobject obj, jlong jdrm, jlong jgbm, jint x, jint y, jint width, jint height, jboolean opaque, jint alphaBits)
+  (JNIEnv *env, jobject obj, jlong jdrm, jlong jgbm, jint x, jint y, jint width, jint height, jint visual_id)
 {
     DRM_HANDLE *drm = (DRM_HANDLE*) (intptr_t) jdrm;
     struct gbm_device *dev = (struct gbm_device *) (intptr_t) jgbm;
+    uint64_t modifier = DRM_FORMAT_MOD_LINEAR;
+    struct gbm_surface *surface = NULL;
 
-    struct gbm_surface *surface = gbm_surface_create(dev,
-              drm->current_mode->hdisplay, drm->current_mode->vdisplay,
-              opaque ? GBM_FORMAT_XRGB8888 : GBM_BO_FORMAT_ARGB8888,
-              GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+    if( gbm_surface_create_with_modifiers ) {
+        surface = gbm_surface_create_with_modifiers(dev, width, height, visual_id, &modifier, 1);
+    }
+    if( NULL == surface ) {
+        if( gbm_surface_create_with_modifiers ) {
+            DBG_PRINT( "EGL_GBM.Window CreateWindow0 gbm_surface_create_with_modifiers failed\n");
+        }
+        surface = gbm_surface_create(dev, width, height, visual_id, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+    }
     if ( NULL == surface ) {
-        DBG_PRINT("failed to create gbm surface\n");
-        return -1;
+        DBG_PRINT( "EGL_GBM.Window CreateWindow0 gbm_surface_create failed\n");
+        return 0;
     }
+
+    // Done in Java code ..
+    // (*env)->CallVoidMethod(env, obj, visibleChangedID, JNI_TRUE);
+
+    DBG_PRINT( "EGL_GBM.Window CreateWindow0 handle %p\n", surface);
     return (jlong) (intptr_t) surface;
 }
 
@@ -308,6 +347,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_egl_gbm_WindowDriver_CloseWindow0
   (JNIEnv *env, jobject obj, jlong display, jlong window)
 {
     struct gbm_surface *surface = (struct gbm_surface *) (intptr_t) window;
+    DBG_PRINT( "EGL_GBM.Window CloseWindow0 handle %p\n", surface);
     gbm_surface_destroy(surface);
 }