isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-18 06:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

renderer/native: initialize egldevice on secondary cards

Browse Source 
If possible initialize the egldevice renderer on secondary
cards.
This commit is contained in:
Ray Strode 2018-09-13 08:07:37 -04:00
parent b61c2f2120
commit 5d8248d65b
1 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/backends/native/meta-renderer-native.c
View File

@ -113,6 +113,10 @@ typedef struct _MetaRendererNativeGpuData
struct { struct {
MetaSharedFramebufferCopyMode copy_mode; MetaSharedFramebufferCopyMode copy_mode;
#ifdef HAVE_EGL_DEVICE
EGLDisplay egl_display;
#endif
/* For GPU blit mode */ /* For GPU blit mode */
EGLContext egl_context; EGLContext egl_context;
EGLConfig egl_config; EGLConfig egl_config;
@ -251,6 +255,27 @@ meta_renderer_native_gpu_data_free (MetaRendererNativeGpuData *renderer_gpu_data
if (renderer_gpu_data->egl_display != EGL_NO_DISPLAY) if (renderer_gpu_data->egl_display != EGL_NO_DISPLAY)
meta_egl_terminate (egl, renderer_gpu_data->egl_display, NULL); meta_egl_terminate (egl, renderer_gpu_data->egl_display, NULL);
#ifdef HAVE_EGL_DEVICE
if (renderer_gpu_data->secondary.egl_display != EGL_NO_DISPLAY)
{
GError *error = NULL;
if (meta_egl_make_current (egl,
renderer_gpu_data->secondary.egl_display,
EGL_NO_SURFACE, EGL_NO_SURFACE,
renderer_gpu_data->secondary.egl_context,
&error))
{
meta_egl_terminate (egl, renderer_gpu_data->secondary.egl_display, NULL);
}
else
{
g_warning ("could not switch to secondary gpu: %s",
error->message);
g_clear_error (&error);
}
}
#endif
g_clear_pointer (&renderer_gpu_data->gbm.device, gbm_device_destroy); g_clear_pointer (&renderer_gpu_data->gbm.device, gbm_device_destroy);
g_free (renderer_gpu_data); g_free (renderer_gpu_data);
} }
@ -3292,15 +3317,20 @@ init_renderer_gpu_data_gbm (MetaRendererNative *renderer_native,
if (!meta_egl_initialize (egl, egl_display, error)) if (!meta_egl_initialize (egl, egl_display, error))
return FALSE; return FALSE;
renderer_gpu_data->renderer_native = renderer_native;
renderer_gpu_data->gbm.device = gbm_device; renderer_gpu_data->gbm.device = gbm_device;
renderer_gpu_data->mode = META_RENDERER_NATIVE_MODE_GBM; renderer_gpu_data->mode = META_RENDERER_NATIVE_MODE_GBM;
renderer_gpu_data->egl_display = egl_display; renderer_gpu_data->egl_display = egl_display;
if (renderer_gpu_data->renderer_native == NULL)
{
renderer_gpu_data->renderer_native = renderer_native;
monitor_manager_kms = renderer_native->monitor_manager_kms; monitor_manager_kms = renderer_native->monitor_manager_kms;
primary_gpu = meta_monitor_manager_kms_get_primary_gpu (monitor_manager_kms); primary_gpu = meta_monitor_manager_kms_get_primary_gpu (monitor_manager_kms);
if (gpu_kms != primary_gpu) if (gpu_kms != primary_gpu)
renderer_gpu_data->secondary.mode = META_RENDERER_NATIVE_MODE_GBM; renderer_gpu_data->secondary.mode = META_RENDERER_NATIVE_MODE_GBM;
}
return TRUE; return TRUE;
} }
@ -3443,15 +3473,6 @@ init_renderer_gpu_data_egl_device (MetaRendererNative *renderer_native,
return FALSE; return FALSE;
} }
primary_gpu = meta_monitor_manager_kms_get_primary_gpu (monitor_manager_kms);
if (gpu_kms != primary_gpu)
{
g_set_error (error, G_IO_ERROR,
G_IO_ERROR_FAILED,
"EGLDevice currently only works with single GPU systems");
return FALSE;
}
egl_device = find_egl_device (renderer_native, gpu_kms, error); egl_device = find_egl_device (renderer_native, gpu_kms, error);
if (egl_device == EGL_NO_DEVICE_EXT) if (egl_device == EGL_NO_DEVICE_EXT)
return FALSE; return FALSE;
@ -3490,8 +3511,20 @@ init_renderer_gpu_data_egl_device (MetaRendererNative *renderer_native,
renderer_gpu_data->renderer_native = renderer_native; renderer_gpu_data->renderer_native = renderer_native;
renderer_gpu_data->egl.device = egl_device; renderer_gpu_data->egl.device = egl_device;
primary_gpu = meta_monitor_manager_kms_get_primary_gpu (monitor_manager_kms);
if (gpu_kms != primary_gpu)
{
renderer_gpu_data->egl_display = EGL_NO_DISPLAY;
renderer_gpu_data->secondary.mode = META_RENDERER_NATIVE_MODE_EGL_DEVICE;
renderer_gpu_data->secondary.egl_display = egl_display;
}
else
{
renderer_gpu_data->mode = META_RENDERER_NATIVE_MODE_EGL_DEVICE; renderer_gpu_data->mode = META_RENDERER_NATIVE_MODE_EGL_DEVICE;
renderer_gpu_data->egl_display = egl_display; renderer_gpu_data->egl_display = egl_display;
renderer_gpu_data->secondary.egl_display = EGL_NO_DISPLAY;
}
return TRUE; return TRUE;
} }
@ -3521,7 +3554,12 @@ meta_renderer_native_create_renderer_gpu_data (MetaRendererNative *renderer_nat
renderer_gpu_data, renderer_gpu_data,
gpu_kms, gpu_kms,
&egl_device_error); &egl_device_error);
if (initialized)
/* we currently only support eglstreams for the sole display
* or the secondary display. If we're using it for the primary
* display, assume non-hybrid graphics.
*/
if (initialized && renderer_gpu_data->egl_display != EGL_NO_DISPLAY)
return renderer_gpu_data; return renderer_gpu_data;
#endif #endif