[mutter] Revert "crtc-kms: Make KMS CRTC mode a type inheriting MetaCrtcMode"
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Revert "crtc-kms: Make KMS CRTC mode a type inheriting MetaCrtcMode"
- Date: Thu, 11 Jun 2020 02:16:00 +0000 (UTC)
commit 49408e8f9ff4a14561e74480490223f3f48416e0
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Jun 10 23:11:21 2020 -0300
Revert "crtc-kms: Make KMS CRTC mode a type inheriting MetaCrtcMode"
This reverts commit 09078762a, which breaks Mutter.
src/backends/meta-crtc-mode.c | 3 ++
src/backends/meta-crtc-mode.h | 19 ++++---
src/backends/native/meta-crtc-kms.c | 6 +--
src/backends/native/meta-crtc-mode-kms.c | 88 --------------------------------
src/backends/native/meta-crtc-mode-kms.h | 38 --------------
src/backends/native/meta-gpu-kms.c | 17 ++++--
src/backends/native/meta-kms-update.c | 8 +--
src/backends/native/meta-kms-update.h | 8 +--
src/backends/native/meta-output-kms.c | 6 +--
src/meson.build | 2 -
10 files changed, 37 insertions(+), 158 deletions(-)
---
diff --git a/src/backends/meta-crtc-mode.c b/src/backends/meta-crtc-mode.c
index 6d2de4b745..7481457479 100644
--- a/src/backends/meta-crtc-mode.c
+++ b/src/backends/meta-crtc-mode.c
@@ -152,6 +152,9 @@ meta_crtc_mode_finalize (GObject *object)
MetaCrtcMode *crtc_mode = META_CRTC_MODE (object);
MetaCrtcModePrivate *priv = meta_crtc_mode_get_instance_private (crtc_mode);
+ if (crtc_mode->driver_notify)
+ crtc_mode->driver_notify (crtc_mode);
+
g_clear_pointer (&priv->name, g_free);
g_clear_pointer (&priv->info, meta_crtc_mode_info_unref);
diff --git a/src/backends/meta-crtc-mode.h b/src/backends/meta-crtc-mode.h
index 87778b8662..b7165265e5 100644
--- a/src/backends/meta-crtc-mode.h
+++ b/src/backends/meta-crtc-mode.h
@@ -57,17 +57,20 @@ typedef struct _MetaCrtcModeInfo
MetaCrtcModeFlag flags;
} MetaCrtcModeInfo;
-#define META_TYPE_CRTC_MODE (meta_crtc_mode_get_type ())
-META_EXPORT_TEST
-G_DECLARE_DERIVABLE_TYPE (MetaCrtcMode, meta_crtc_mode,
- META, CRTC_MODE,
- GObject)
-
-struct _MetaCrtcModeClass
+struct _MetaCrtcMode
{
- GObjectClass parent_class;
+ GObject parent;
+
+ gpointer driver_private;
+ GDestroyNotify driver_notify;
};
+#define META_TYPE_CRTC_MODE (meta_crtc_mode_get_type ())
+META_EXPORT_TEST
+G_DECLARE_FINAL_TYPE (MetaCrtcMode, meta_crtc_mode,
+ META, CRTC_MODE,
+ GObject)
+
#define META_TYPE_CRTC_MODE_INFO (meta_crtc_mode_info_get_type ())
GType meta_crtc_mode_info_get_type (void);
diff --git a/src/backends/native/meta-crtc-kms.c b/src/backends/native/meta-crtc-kms.c
index 89d6f40a89..5860f42a24 100644
--- a/src/backends/native/meta-crtc-kms.c
+++ b/src/backends/native/meta-crtc-kms.c
@@ -26,7 +26,6 @@
#include "backends/meta-backend-private.h"
#include "backends/meta-logical-monitor.h"
-#include "backends/native/meta-crtc-mode-kms.h"
#include "backends/native/meta-gpu-kms.h"
#include "backends/native/meta-output-kms.h"
#include "backends/native/meta-kms-device.h"
@@ -173,16 +172,15 @@ meta_crtc_kms_set_mode (MetaCrtcKms *crtc_kms,
MetaCrtc *crtc = META_CRTC (crtc_kms);
MetaGpu *gpu = meta_crtc_get_gpu (crtc);
GList *connectors;
- const drmModeModeInfo *mode;
+ drmModeModeInfo *mode;
connectors = generate_crtc_connector_list (gpu, crtc);
if (connectors)
{
const MetaCrtcConfig *crtc_config = meta_crtc_get_config (crtc);
- MetaCrtcModeKms *crtc_mode_kms = META_CRTC_MODE_KMS (crtc_config->mode);
- mode = meta_crtc_mode_kms_get_drm_mode (crtc_mode_kms);
+ mode = crtc_config->mode->driver_private;
g_debug ("Setting CRTC (%ld) mode to %s",
meta_crtc_get_id (crtc), mode->name);
diff --git a/src/backends/native/meta-gpu-kms.c b/src/backends/native/meta-gpu-kms.c
index f587c2d0f9..18f7d80366 100644
--- a/src/backends/native/meta-gpu-kms.c
+++ b/src/backends/native/meta-gpu-kms.c
@@ -38,7 +38,6 @@
#include "backends/meta-output.h"
#include "backends/native/meta-backend-native.h"
#include "backends/native/meta-crtc-kms.h"
-#include "backends/native/meta-crtc-mode-kms.h"
#include "backends/native/meta-kms-connector.h"
#include "backends/native/meta-kms-device.h"
#include "backends/native/meta-kms-update.h"
@@ -274,6 +273,12 @@ compare_outputs (gconstpointer one,
return strcmp (output_info_one->name, output_info_two->name);
}
+static void
+meta_crtc_mode_destroy_notify (MetaCrtcMode *mode)
+{
+ g_slice_free (drmModeModeInfo, mode->driver_private);
+}
+
gboolean
meta_drm_mode_equal (const drmModeModeInfo *one,
const drmModeModeInfo *two)
@@ -324,11 +329,10 @@ meta_gpu_kms_get_mode_from_drm_mode (MetaGpuKms *gpu_kms,
for (l = meta_gpu_get_modes (gpu); l; l = l->next)
{
- MetaCrtcModeKms *crtc_mode_kms = l->data;
+ MetaCrtcMode *mode = l->data;
- if (meta_drm_mode_equal (drm_mode,
- meta_crtc_mode_kms_get_drm_mode (crtc_mode_kms)))
- return META_CRTC_MODE (crtc_mode_kms);
+ if (meta_drm_mode_equal (drm_mode, mode->driver_private))
+ return mode;
}
g_assert_not_reached ();
@@ -357,6 +361,9 @@ create_mode (const drmModeModeInfo *drm_mode,
"info", crtc_mode_info,
NULL);
+ mode->driver_private = g_slice_dup (drmModeModeInfo, drm_mode);
+ mode->driver_notify = (GDestroyNotify) meta_crtc_mode_destroy_notify;
+
return mode;
}
diff --git a/src/backends/native/meta-kms-update.c b/src/backends/native/meta-kms-update.c
index d1092b43fc..5ace830216 100644
--- a/src/backends/native/meta-kms-update.c
+++ b/src/backends/native/meta-kms-update.c
@@ -208,10 +208,10 @@ meta_kms_update_unassign_plane (MetaKmsUpdate *update,
}
void
-meta_kms_update_mode_set (MetaKmsUpdate *update,
- MetaKmsCrtc *crtc,
- GList *connectors,
- const drmModeModeInfo *drm_mode)
+meta_kms_update_mode_set (MetaKmsUpdate *update,
+ MetaKmsCrtc *crtc,
+ GList *connectors,
+ drmModeModeInfo *drm_mode)
{
MetaKmsModeSet *mode_set;
diff --git a/src/backends/native/meta-kms-update.h b/src/backends/native/meta-kms-update.h
index 1727c1974a..13dff16ddf 100644
--- a/src/backends/native/meta-kms-update.h
+++ b/src/backends/native/meta-kms-update.h
@@ -79,10 +79,10 @@ MetaKmsUpdate * meta_kms_update_new (void);
void meta_kms_update_free (MetaKmsUpdate *update);
-void meta_kms_update_mode_set (MetaKmsUpdate *update,
- MetaKmsCrtc *crtc,
- GList *connectors,
- const drmModeModeInfo *drm_mode);
+void meta_kms_update_mode_set (MetaKmsUpdate *update,
+ MetaKmsCrtc *crtc,
+ GList *connectors,
+ drmModeModeInfo *drm_mode);
MetaKmsPlaneAssignment * meta_kms_update_assign_plane (MetaKmsUpdate *update,
MetaKmsCrtc *crtc,
diff --git a/src/backends/native/meta-output-kms.c b/src/backends/native/meta-output-kms.c
index 2f27029ce8..906833a156 100644
--- a/src/backends/native/meta-output-kms.c
+++ b/src/backends/native/meta-output-kms.c
@@ -32,7 +32,6 @@
#include "backends/native/meta-kms-connector.h"
#include "backends/native/meta-kms-utils.h"
#include "backends/native/meta-crtc-kms.h"
-#include "backends/native/meta-crtc-mode-kms.h"
#include "meta-default-modes.h"
@@ -154,10 +153,7 @@ add_common_modes (MetaOutputInfo *output_info,
for (i = 0; i < output_info->n_modes; i++)
{
- MetaCrtcMode *crtc_mode = output_info->modes[i];
- MetaCrtcModeKms *crtc_mode_kms = META_CRTC_MODE_KMS (crtc_mode);
-
- drm_mode = meta_crtc_mode_kms_get_drm_mode (crtc_mode_kms);
+ drm_mode = output_info->modes[i]->driver_private;
refresh_rate = meta_calculate_drm_mode_refresh_rate (drm_mode);
max_hdisplay = MAX (max_hdisplay, drm_mode->hdisplay);
max_vdisplay = MAX (max_vdisplay, drm_mode->vdisplay);
diff --git a/src/meson.build b/src/meson.build
index ae286526e6..56c47faa2a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -632,8 +632,6 @@ if have_native_backend
'backends/native/meta-clutter-backend-native.h',
'backends/native/meta-crtc-kms.c',
'backends/native/meta-crtc-kms.h',
- 'backends/native/meta-crtc-mode-kms.c',
- 'backends/native/meta-crtc-mode-kms.h',
'backends/native/meta-cursor-renderer-native.c',
'backends/native/meta-cursor-renderer-native.h',
'backends/native/meta-drm-buffer-dumb.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
