From 60fd80b61620fb25015ce1ad946a452a09ad70f0 Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Wed, 10 Jan 2024 15:00:44 +0100
Subject: [PATCH] crtc-kms: Get rid of meta_crtc_kms_get_modifiers

Instead get the assigned primary plane and use
meta_kms_plane_get_modifiers_for_format.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3512>
---
 src/backends/native/meta-crtc-kms.c        | 24 ----------------------
 src/backends/native/meta-crtc-kms.h        |  3 ---
 src/backends/native/meta-onscreen-native.c |  5 ++++-
 src/wayland/meta-wayland-dma-buf.c         |  6 +++++-
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/backends/native/meta-crtc-kms.c b/src/backends/native/meta-crtc-kms.c
index 74c572121..f853f697a 100644
--- a/src/backends/native/meta-crtc-kms.c
+++ b/src/backends/native/meta-crtc-kms.c
@@ -428,30 +428,6 @@ meta_crtc_kms_get_kms_crtc (MetaCrtcKms *crtc_kms)
   return crtc_kms->kms_crtc;
 }
 
-/**
- * meta_crtc_kms_get_modifiers:
- * @crtc_kms: a #MetaCrtc object that has to be a #MetaCrtcKms
- * @format: a DRM pixel format
- *
- * Returns a pointer to a #GArray containing all the supported
- * modifiers for the given DRM pixel format on the CRTC's primary
- * plane. The array element type is uint64_t.
- *
- * The caller must not modify or destroy the array or its contents.
- *
- * Returns NULL if the modifiers are not known or the format is not
- * supported.
- */
-GArray *
-meta_crtc_kms_get_modifiers (MetaCrtcKms *crtc_kms,
-                             uint32_t     format)
-{
-  g_return_val_if_fail (crtc_kms->assigned_primary_plane, NULL);
-
-  return meta_kms_plane_get_modifiers_for_format (crtc_kms->assigned_primary_plane,
-                                                  format);
-}
-
 /**
  * meta_crtc_kms_supports_format:
  * @crtc_kms: a #MetaCrtcKms
diff --git a/src/backends/native/meta-crtc-kms.h b/src/backends/native/meta-crtc-kms.h
index 33609ba5e..10b4b86dc 100644
--- a/src/backends/native/meta-crtc-kms.h
+++ b/src/backends/native/meta-crtc-kms.h
@@ -47,9 +47,6 @@ void meta_crtc_kms_set_mode (MetaCrtcKms   *crtc_kms,
 META_EXPORT_TEST
 MetaKmsCrtc * meta_crtc_kms_get_kms_crtc (MetaCrtcKms *crtc_kms);
 
-GArray * meta_crtc_kms_get_modifiers (MetaCrtcKms *crtc_kms,
-                                      uint32_t     format);
-
 gboolean
 meta_crtc_kms_supports_format (MetaCrtcKms *crtc_kms,
                                uint32_t     drm_format);
diff --git a/src/backends/native/meta-onscreen-native.c b/src/backends/native/meta-onscreen-native.c
index 6f4bbc721..0e0c0da63 100644
--- a/src/backends/native/meta-onscreen-native.c
+++ b/src/backends/native/meta-onscreen-native.c
@@ -1801,11 +1801,14 @@ static GArray *
 get_supported_kms_modifiers (MetaCrtcKms *crtc_kms,
                              uint32_t     format)
 {
+  MetaKmsPlane *plane = meta_crtc_kms_get_assigned_primary_plane (crtc_kms);
   GArray *modifiers;
   GArray *crtc_mods;
   unsigned int i;
 
-  crtc_mods = meta_crtc_kms_get_modifiers (crtc_kms, format);
+  g_return_val_if_fail (plane, NULL);
+
+  crtc_mods = meta_kms_plane_get_modifiers_for_format (plane, format);
   if (!crtc_mods)
     return NULL;
 
diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c
index 00a663e42..4b91242c6 100644
--- a/src/wayland/meta-wayland-dma-buf.c
+++ b/src/wayland/meta-wayland-dma-buf.c
@@ -60,6 +60,7 @@
 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-drm-buffer-gbm.h"
 #include "backends/native/meta-kms-device.h"
+#include "backends/native/meta-kms-plane.h"
 #include "backends/native/meta-kms-utils.h"
 #include "backends/native/meta-onscreen-native.h"
 #include "backends/native/meta-renderer-native.h"
@@ -1266,9 +1267,12 @@ crtc_supports_modifier (MetaCrtcKms *crtc_kms,
                         uint32_t     drm_format,
                         uint64_t     drm_modifier)
 {
+  MetaKmsPlane *plane = meta_crtc_kms_get_assigned_primary_plane (crtc_kms);
   GArray *crtc_modifiers;
 
-  crtc_modifiers = meta_crtc_kms_get_modifiers (crtc_kms, drm_format);
+  g_return_val_if_fail (plane, FALSE);
+
+  crtc_modifiers = meta_kms_plane_get_modifiers_for_format (plane, drm_format);
   if (!crtc_modifiers)
     return FALSE;