All of lore.kernel.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [CI 08/12] drm/i915: Add aliases for uapi and hw to plane_state
Date: Tue, 29 Oct 2019 08:22:25 +0100	[thread overview]
Message-ID: <20191029072229.27092-8-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20191029072229.27092-1-maarten.lankhorst@linux.intel.com>

Prepare to split up hw and uapi machinally, by adding a uapi and
hw alias. We will remove the base in a bit. This is a split from the
original uapi/hw patch, which did it all in one go.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 .../gpu/drm/i915/display/intel_atomic_plane.c    | 16 ++++++++--------
 .../gpu/drm/i915/display/intel_display_types.h   |  8 ++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 78e145e7c04d..0bfaeb9b7eb9 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -80,22 +80,20 @@ void intel_plane_free(struct intel_plane *plane)
 struct drm_plane_state *
 intel_plane_duplicate_state(struct drm_plane *plane)
 {
-	struct drm_plane_state *state;
 	struct intel_plane_state *intel_state;
 
-	intel_state = kmemdup(plane->state, sizeof(*intel_state), GFP_KERNEL);
+	intel_state = to_intel_plane_state(plane->state);
+	intel_state = kmemdup(intel_state, sizeof(*intel_state), GFP_KERNEL);
 
 	if (!intel_state)
 		return NULL;
 
-	state = &intel_state->base;
-
-	__drm_atomic_helper_plane_duplicate_state(plane, state);
+	__drm_atomic_helper_plane_duplicate_state(plane, &intel_state->base);
 
 	intel_state->vma = NULL;
 	intel_state->flags = 0;
 
-	return state;
+	return &intel_state->base;
 }
 
 /**
@@ -110,9 +108,11 @@ void
 intel_plane_destroy_state(struct drm_plane *plane,
 			  struct drm_plane_state *state)
 {
-	WARN_ON(to_intel_plane_state(state)->vma);
+	struct intel_plane_state *plane_state = to_intel_plane_state(state);
+	WARN_ON(plane_state->vma);
 
-	drm_atomic_helper_plane_destroy_state(plane, state);
+	__drm_atomic_helper_plane_destroy_state(&plane_state->base);
+	kfree(plane_state);
 }
 
 unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index bcf5f7640307..e43d5a09550d 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -523,7 +523,11 @@ struct intel_atomic_state {
 };
 
 struct intel_plane_state {
-	struct drm_plane_state base;
+	union {
+		struct drm_plane_state base;
+		struct drm_plane_state uapi;
+		struct drm_plane_state hw;
+	};
 	struct i915_ggtt_view view;
 	struct i915_vma *vma;
 	unsigned long flags;
@@ -1143,7 +1147,7 @@ struct cxsr_latency {
 #define to_intel_encoder(x) container_of(x, struct intel_encoder, base)
 #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base)
 #define to_intel_plane(x) container_of(x, struct intel_plane, base)
-#define to_intel_plane_state(x) container_of(x, struct intel_plane_state, base)
+#define to_intel_plane_state(x) container_of(x, struct intel_plane_state, uapi)
 #define intel_fb_obj(x) ((x) ? to_intel_bo((x)->obj[0]) : NULL)
 
 struct intel_hdmi {
-- 
2.23.0

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

WARNING: multiple messages have this Message-ID (diff)
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [CI 08/12] drm/i915: Add aliases for uapi and hw to plane_state
Date: Tue, 29 Oct 2019 08:22:25 +0100	[thread overview]
Message-ID: <20191029072229.27092-8-maarten.lankhorst@linux.intel.com> (raw)
Message-ID: <20191029072225.gdUilGuwBDysHu2x3wd9Q27knsmRCoHAFYpGpnf5qmo@z> (raw)
In-Reply-To: <20191029072229.27092-1-maarten.lankhorst@linux.intel.com>

Prepare to split up hw and uapi machinally, by adding a uapi and
hw alias. We will remove the base in a bit. This is a split from the
original uapi/hw patch, which did it all in one go.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 .../gpu/drm/i915/display/intel_atomic_plane.c    | 16 ++++++++--------
 .../gpu/drm/i915/display/intel_display_types.h   |  8 ++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 78e145e7c04d..0bfaeb9b7eb9 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -80,22 +80,20 @@ void intel_plane_free(struct intel_plane *plane)
 struct drm_plane_state *
 intel_plane_duplicate_state(struct drm_plane *plane)
 {
-	struct drm_plane_state *state;
 	struct intel_plane_state *intel_state;
 
-	intel_state = kmemdup(plane->state, sizeof(*intel_state), GFP_KERNEL);
+	intel_state = to_intel_plane_state(plane->state);
+	intel_state = kmemdup(intel_state, sizeof(*intel_state), GFP_KERNEL);
 
 	if (!intel_state)
 		return NULL;
 
-	state = &intel_state->base;
-
-	__drm_atomic_helper_plane_duplicate_state(plane, state);
+	__drm_atomic_helper_plane_duplicate_state(plane, &intel_state->base);
 
 	intel_state->vma = NULL;
 	intel_state->flags = 0;
 
-	return state;
+	return &intel_state->base;
 }
 
 /**
@@ -110,9 +108,11 @@ void
 intel_plane_destroy_state(struct drm_plane *plane,
 			  struct drm_plane_state *state)
 {
-	WARN_ON(to_intel_plane_state(state)->vma);
+	struct intel_plane_state *plane_state = to_intel_plane_state(state);
+	WARN_ON(plane_state->vma);
 
-	drm_atomic_helper_plane_destroy_state(plane, state);
+	__drm_atomic_helper_plane_destroy_state(&plane_state->base);
+	kfree(plane_state);
 }
 
 unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index bcf5f7640307..e43d5a09550d 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -523,7 +523,11 @@ struct intel_atomic_state {
 };
 
 struct intel_plane_state {
-	struct drm_plane_state base;
+	union {
+		struct drm_plane_state base;
+		struct drm_plane_state uapi;
+		struct drm_plane_state hw;
+	};
 	struct i915_ggtt_view view;
 	struct i915_vma *vma;
 	unsigned long flags;
@@ -1143,7 +1147,7 @@ struct cxsr_latency {
 #define to_intel_encoder(x) container_of(x, struct intel_encoder, base)
 #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base)
 #define to_intel_plane(x) container_of(x, struct intel_plane, base)
-#define to_intel_plane_state(x) container_of(x, struct intel_plane_state, base)
+#define to_intel_plane_state(x) container_of(x, struct intel_plane_state, uapi)
 #define intel_fb_obj(x) ((x) ? to_intel_bo((x)->obj[0]) : NULL)
 
 struct intel_hdmi {
-- 
2.23.0

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

  parent reply	other threads:[~2019-10-29  7:22 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29  7:22 [CI 01/12] drm/i915: Introduce intel_atomic_get_plane_state_after_check(), v2 Maarten Lankhorst
2019-10-29  7:22 ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 02/12] drm/i915: Handle a few more cases for crtc hw/uapi split, v3 Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 03/12] drm/i915: Add aliases for uapi and hw to crtc_state Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 04/12] drm/i915: Perform manual conversions for crtc uapi/hw split, v2 Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29 13:23   ` Ville Syrjälä
2019-10-29 13:23     ` [Intel-gfx] " Ville Syrjälä
2019-10-30 10:12     ` Maarten Lankhorst
2019-10-30 10:12       ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 05/12] drm/i915: Perform automated conversions for crtc uapi/hw split, base -> hw Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 06/12] drm/i915: Perform automated conversions for crtc uapi/hw split, base -> uapi Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 07/12] drm/i915: Complete crtc hw/uapi split, v4 Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29 14:33   ` Ville Syrjälä
2019-10-29 14:33     ` [Intel-gfx] " Ville Syrjälä
2019-10-29 14:37     ` Ville Syrjälä
2019-10-29 14:37       ` [Intel-gfx] " Ville Syrjälä
2019-10-29  7:22 ` Maarten Lankhorst [this message]
2019-10-29  7:22   ` [Intel-gfx] [CI 08/12] drm/i915: Add aliases for uapi and hw to plane_state Maarten Lankhorst
2019-10-29  7:22 ` [CI 09/12] drm/i915: Perform manual conversions for plane uapi/hw split Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 10/12] drm/i915: Perform automated conversions for plane uapi/hw split, base -> hw Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29 15:35   ` Ville Syrjälä
2019-10-29 15:35     ` [Intel-gfx] " Ville Syrjälä
2019-10-29  7:22 ` [CI 11/12] drm/i915: Perform automated conversions for plane uapi/hw split, base -> uapi Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29 15:43   ` Ville Syrjälä
2019-10-29 15:43     ` [Intel-gfx] " Ville Syrjälä
2019-10-30 13:10     ` Maarten Lankhorst
2019-10-30 13:10       ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  7:22 ` [CI 12/12] drm/i915: Complete plane hw and uapi split, v2 Maarten Lankhorst
2019-10-29  7:22   ` [Intel-gfx] " Maarten Lankhorst
2019-10-29 18:34   ` Ville Syrjälä
2019-10-29 18:34     ` [Intel-gfx] " Ville Syrjälä
2019-10-30  9:51     ` Maarten Lankhorst
2019-10-30  9:51       ` [Intel-gfx] " Maarten Lankhorst
2019-10-29  8:45 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,01/12] drm/i915: Introduce intel_atomic_get_plane_state_after_check(), v2 Patchwork
2019-10-29  8:45   ` [Intel-gfx] " Patchwork
2019-10-29  9:05 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-10-29  9:05   ` [Intel-gfx] " Patchwork
2019-10-29 18:35 ` [CI 01/12] " Ville Syrjälä
2019-10-29 18:35   ` [Intel-gfx] " Ville Syrjälä
2019-10-30  9:17   ` Maarten Lankhorst
2019-10-30  9:17     ` [Intel-gfx] " Maarten Lankhorst
2019-10-30 13:37     ` Ville Syrjälä
2019-10-30 13:37       ` [Intel-gfx] " Ville Syrjälä

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=20191029072229.27092-8-maarten.lankhorst@linux.intel.com \
    --to=maarten.lankhorst@linux.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.