From b23fc9965555d5aff346e8fcb7f3edd0a82190bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 31 Oct 2019 10:38:19 +0100
Subject: [PATCH] kms/plane: Move _new() function to private header

Code outside of the MetaKms namespace is not expected to create plane
objects, so move it to a private header. More things will be added to
this header later.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/930
---
 src/backends/native/meta-kms-impl-device.c   |  1 +
 src/backends/native/meta-kms-plane-private.h | 33 ++++++++++++++++++++
 src/backends/native/meta-kms-plane.c         |  2 +-
 src/backends/native/meta-kms-plane.h         |  5 ---
 src/meson.build                              |  1 +
 5 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 src/backends/native/meta-kms-plane-private.h

diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c
index 922aca103..92b7bd37b 100644
--- a/src/backends/native/meta-kms-impl-device.c
+++ b/src/backends/native/meta-kms-impl-device.c
@@ -30,6 +30,7 @@
 #include "backends/native/meta-kms-crtc.h"
 #include "backends/native/meta-kms-impl.h"
 #include "backends/native/meta-kms-page-flip-private.h"
+#include "backends/native/meta-kms-plane-private.h"
 #include "backends/native/meta-kms-plane.h"
 #include "backends/native/meta-kms-private.h"
 #include "backends/native/meta-kms-update.h"
diff --git a/src/backends/native/meta-kms-plane-private.h b/src/backends/native/meta-kms-plane-private.h
new file mode 100644
index 000000000..741c05f4d
--- /dev/null
+++ b/src/backends/native/meta-kms-plane-private.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018-2019 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_KMS_PLANE_PRIVATE_H
+#define META_KMS_PLANE_PRIVATE_H
+
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
+#include "backends/native/meta-kms-plane.h"
+#include "backends/native/meta-kms-types.h"
+
+MetaKmsPlane * meta_kms_plane_new (MetaKmsPlaneType         type,
+                                   MetaKmsImplDevice       *impl_device,
+                                   drmModePlane            *drm_plane,
+                                   drmModeObjectProperties *drm_plane_props);
+#endif /* META_KMS_PLANE_PRIVATE_H */
diff --git a/src/backends/native/meta-kms-plane.c b/src/backends/native/meta-kms-plane.c
index 291206393..4eb75f290 100644
--- a/src/backends/native/meta-kms-plane.c
+++ b/src/backends/native/meta-kms-plane.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "backends/native/meta-kms-plane.h"
+#include "backends/native/meta-kms-plane-private.h"
 
 #include <drm_fourcc.h>
 #include <stdio.h>
diff --git a/src/backends/native/meta-kms-plane.h b/src/backends/native/meta-kms-plane.h
index e360f83ca..aaa1790a6 100644
--- a/src/backends/native/meta-kms-plane.h
+++ b/src/backends/native/meta-kms-plane.h
@@ -38,11 +38,6 @@ typedef enum _MetaKmsPlaneType
 G_DECLARE_FINAL_TYPE (MetaKmsPlane, meta_kms_plane,
                       META, KMS_PLANE, GObject)
 
-MetaKmsPlane * meta_kms_plane_new (MetaKmsPlaneType         type,
-                                   MetaKmsImplDevice       *impl_device,
-                                   drmModePlane            *drm_plane,
-                                   drmModeObjectProperties *drm_plane_props);
-
 MetaKmsDevice * meta_kms_plane_get_device (MetaKmsPlane *plane);
 
 uint32_t meta_kms_plane_get_id (MetaKmsPlane *plane);
diff --git a/src/meson.build b/src/meson.build
index e44366944..c5a91d981 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -648,6 +648,7 @@ if have_native_backend
     'backends/native/meta-kms-page-flip.c',
     'backends/native/meta-kms-page-flip-private.h',
     'backends/native/meta-kms-plane.c',
+    'backends/native/meta-kms-plane-private.h',
     'backends/native/meta-kms-plane.h',
     'backends/native/meta-kms-private.h',
     'backends/native/meta-kms-types.h',