All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 18/25] drm/i915: extract intel_atomic_plane.h from intel_drv.h
Date: Fri,  5 Apr 2019 00:14:42 +0300	[thread overview]
Message-ID: <0c59a7cc1e32ae024e7e213f774b0d44cc5aae3f.1554411528.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1554411528.git.jani.nikula@intel.com>

It used	to be handy that we only had a couple of headers, but over time
intel_drv.h has	become unwieldy. Extract declarations to a separate
header file corresponding to the implementation	module,	clarifying the
modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.

No functional changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/Makefile.header-test |  1 +
 drivers/gpu/drm/i915/intel_atomic_plane.c | 34 +++++++++----------
 drivers/gpu/drm/i915/intel_atomic_plane.h | 40 +++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_display.c      |  1 +
 drivers/gpu/drm/i915/intel_drv.h          | 24 --------------
 drivers/gpu/drm/i915/intel_sprite.c       |  1 +
 6 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_atomic_plane.h

diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index e78eeaa8ec33..43c939da9665 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -8,6 +8,7 @@ header_test := \
 	i915_priolist_types.h \
 	i915_scheduler_types.h \
 	i915_timeline_types.h \
+	intel_atomic_plane.h \
 	intel_audio.h \
 	intel_color.h \
 	intel_connector.h \
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 42821f8e6031..381234ce1bc4 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -59,6 +59,23 @@ struct intel_plane *intel_plane_alloc(void)
 	return plane;
 }
 
+/**
+ * intel_plane_destroy_state - destroy plane state
+ * @plane: drm plane
+ * @state: state object to destroy
+ *
+ * Destroys the plane state (both common and Intel-specific) for the
+ * specified plane.
+ */
+void
+intel_plane_destroy_state(struct drm_plane *plane,
+			  struct drm_plane_state *state)
+{
+	WARN_ON(to_intel_plane_state(state)->vma);
+
+	drm_atomic_helper_plane_destroy_state(plane, state);
+}
+
 void intel_plane_free(struct intel_plane *plane)
 {
 	intel_plane_destroy_state(&plane->base, plane->base.state);
@@ -95,23 +112,6 @@ intel_plane_duplicate_state(struct drm_plane *plane)
 	return state;
 }
 
-/**
- * intel_plane_destroy_state - destroy plane state
- * @plane: drm plane
- * @state: state object to destroy
- *
- * Destroys the plane state (both common and Intel-specific) for the
- * specified plane.
- */
-void
-intel_plane_destroy_state(struct drm_plane *plane,
-			  struct drm_plane_state *state)
-{
-	WARN_ON(to_intel_plane_state(state)->vma);
-
-	drm_atomic_helper_plane_destroy_state(plane, state);
-}
-
 int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_state,
 					struct intel_crtc_state *new_crtc_state,
 					const struct intel_plane_state *old_plane_state,
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.h b/drivers/gpu/drm/i915/intel_atomic_plane.h
new file mode 100644
index 000000000000..14678620440f
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __INTEL_ATOMIC_PLANE_H__
+#define __INTEL_ATOMIC_PLANE_H__
+
+struct drm_plane;
+struct intel_atomic_state;
+struct intel_crtc;
+struct intel_crtc_state;
+struct intel_plane;
+struct intel_plane_state;
+
+extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
+
+void intel_update_plane(struct intel_plane *plane,
+			const struct intel_crtc_state *crtc_state,
+			const struct intel_plane_state *plane_state);
+void intel_update_slave(struct intel_plane *plane,
+			const struct intel_crtc_state *crtc_state,
+			const struct intel_plane_state *plane_state);
+void intel_disable_plane(struct intel_plane *plane,
+			 const struct intel_crtc_state *crtc_state);
+struct intel_plane *intel_plane_alloc(void);
+void intel_plane_free(struct intel_plane *plane);
+struct drm_plane_state *intel_plane_duplicate_state(struct drm_plane *plane);
+void intel_plane_destroy_state(struct drm_plane *plane,
+			       struct drm_plane_state *state);
+void skl_update_planes_on_crtc(struct intel_atomic_state *state,
+			       struct intel_crtc *crtc);
+void i9xx_update_planes_on_crtc(struct intel_atomic_state *state,
+				struct intel_crtc *crtc);
+int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_state,
+					struct intel_crtc_state *crtc_state,
+					const struct intel_plane_state *old_plane_state,
+					struct intel_plane_state *intel_state);
+
+#endif /* __INTEL_ATOMIC_PLANE_H__ */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 472388592951..54ba021ad4ea 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -48,6 +48,7 @@
 #include "i915_gem_clflush.h"
 #include "i915_reset.h"
 #include "i915_trace.h"
+#include "intel_atomic_plane.h"
 #include "intel_color.h"
 #include "intel_crt.h"
 #include "intel_ddi.h"
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index ae5714ef6c11..9b8435f9ccaf 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -2120,30 +2120,6 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
 			       struct intel_crtc *intel_crtc,
 			       struct intel_crtc_state *crtc_state);
 
-/* intel_atomic_plane.c */
-void intel_update_plane(struct intel_plane *plane,
-			const struct intel_crtc_state *crtc_state,
-			const struct intel_plane_state *plane_state);
-void intel_update_slave(struct intel_plane *plane,
-			const struct intel_crtc_state *crtc_state,
-			const struct intel_plane_state *plane_state);
-void intel_disable_plane(struct intel_plane *plane,
-			 const struct intel_crtc_state *crtc_state);
-struct intel_plane *intel_plane_alloc(void);
-void intel_plane_free(struct intel_plane *plane);
-struct drm_plane_state *intel_plane_duplicate_state(struct drm_plane *plane);
-void intel_plane_destroy_state(struct drm_plane *plane,
-			       struct drm_plane_state *state);
-extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
-void skl_update_planes_on_crtc(struct intel_atomic_state *state,
-			       struct intel_crtc *crtc);
-void i9xx_update_planes_on_crtc(struct intel_atomic_state *state,
-				struct intel_crtc *crtc);
-int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_state,
-					struct intel_crtc_state *crtc_state,
-					const struct intel_plane_state *old_plane_state,
-					struct intel_plane_state *intel_state);
-
 /* intel_pipe_crc.c */
 #ifdef CONFIG_DEBUG_FS
 int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name);
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 0274e70f6034..50ba32eaee9e 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -40,6 +40,7 @@
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"
+#include "intel_atomic_plane.h"
 #include "intel_drv.h"
 #include "intel_frontbuffer.h"
 #include "intel_pm.h"
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-04-04 21:16 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-04 21:14 [PATCH 00/25] drm/i915: the great header refactoring, part one Jani Nikula
2019-04-04 21:14 ` [PATCH 01/25] drm/i915: make intel_frontbuffer.h self-contained Jani Nikula
2019-04-04 21:14 ` [PATCH 02/25] drm/i915: extract intel_audio.h from intel_drv.h Jani Nikula
2019-04-04 21:14 ` [PATCH 03/25] drm/i915: extract intel_crt.h " Jani Nikula
2019-04-04 21:22   ` Jani Nikula
2019-04-04 21:14 ` [PATCH 04/25] drm/i915: extract intel_ddi.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 05/25] drm/i915: extract intel_connector.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 06/25] drm/i915: extract intel_csr.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 07/25] drm/i915: extract intel_fbc.h " Jani Nikula
2019-04-04 21:22   ` Chris Wilson
2019-04-04 21:14 ` [PATCH 08/25] drm/i915: extract intel_psr.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 09/25] drm/i915: extract intel_color.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 10/25] drm/i915: extract intel_lspcon.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 11/25] drm/i915: extract intel_sdvo.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 12/25] drm/i915: extract intel_hdcp.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 13/25] drm/i915: extract intel_panel.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 14/25] drm/i915: extract intel_pm.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 15/25] drm/i915: extract intel_fbdev.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 16/25] drm/i915: extract intel_dp.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 17/25] drm/i915: extract intel_hdmi.h " Jani Nikula
2019-04-04 21:14 ` Jani Nikula [this message]
2019-04-04 21:14 ` [PATCH 19/25] drm/i915: extract intel_pipe_crc.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 20/25] drm/i915: extract intel_tv.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 21/25] drm/i915: extract intel_lvds.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 22/25] drm/i915: extract intel_dvo.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 23/25] drm/i915: extract intel_sprite.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 24/25] drm/i915: extract intel_cdclk.h " Jani Nikula
2019-04-04 21:14 ` [PATCH 25/25] drm/i915/cdclk: have only one init/uninit function Jani Nikula
2019-04-04 21:32 ` [PATCH 00/25] drm/i915: the great header refactoring, part one Chris Wilson
2019-04-05  7:50   ` Joonas Lahtinen
2019-04-04 21:48 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-04-04 22:01 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-04-04 22:07 ` ✓ Fi.CI.BAT: success " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0c59a7cc1e32ae024e7e213f774b0d44cc5aae3f.1554411528.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.