support android-rpi

android-rpi · Mar 18, 2022 · a359844 · a359844
1 parent 8c14a28
commit a359844
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/meson_options.txt b/meson_options.txt
@@ -482,7 +482,7 @@ option(
   'platform-sdk-version',
   type : 'integer',
   min : 25,
-  max : 31,
+  max : 32,
   value : 25,
   description : 'Android Platform SDK version. Default: Nougat version.'
 )

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
@@ -239,7 +239,7 @@ get_yuv_buffer_info(struct dri2_egl_display *dri2_dpy,
       .drm_fourcc = drm_fourcc,
       .num_planes = ycbcr.chroma_step == 2 ? 2 : 3,
       .fds = { -1, -1, -1, -1 },
-      .modifier = DRM_FORMAT_MOD_INVALID,
+      .modifier = DRM_FORMAT_MOD_LINEAR,
       .yuv_color_space = EGL_ITU_REC601_EXT,
       .sample_range = EGL_YUV_NARROW_RANGE_EXT,
       .horizontal_siting = EGL_YUV_CHROMA_SITING_0_EXT,
@@ -337,7 +337,7 @@ native_window_buffer_get_buffer_info(struct dri2_egl_display *dri2_dpy,
       .drm_fourcc = drm_fourcc,
       .num_planes = num_planes,
       .fds = { fds[0], -1, -1, -1 },
-      .modifier = DRM_FORMAT_MOD_INVALID,
+      .modifier = DRM_FORMAT_MOD_LINEAR,
       .offsets = { 0, 0, 0, 0 },
       .pitches = { pitch, 0, 0, 0 },
       .yuv_color_space = EGL_ITU_REC601_EXT,

diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c
@@ -198,13 +198,13 @@ backend_from_driver_name(int fd)
    if (!v)
       return NULL;
 
-   lib = loader_open_driver_lib(v->name, BACKEND_LIB_SUFFIX,
+   lib = loader_open_driver_lib("kmsro", BACKEND_LIB_SUFFIX,
                                 backend_search_path_vars,
                                 DEFAULT_BACKENDS_PATH,
                                 false);
 
    if (lib)
-      dev = load_backend(lib, fd, v->name);
+      dev = load_backend(lib, fd, "kmsro");
 
    drmFreeVersion(v);