From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 3/8] drm/i915: Use new atomic helpers in intel_plane_atomic_check
Date: Thu, 20 Jul 2017 15:15:14 +0200 [thread overview]
Message-ID: <20170720131519.30104-4-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20170720131519.30104-1-maarten.lankhorst@linux.intel.com>
Remove the use of plane->state and drm_atomic_get_existing_state,
instead use the new helpers, and also add
intel_atomic_get_new_crtc_state as it's needed.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_atomic_plane.c | 22 +++++++++++++---------
drivers/gpu/drm/i915/intel_drv.h | 14 ++++++++++++++
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index ee76fab7bb6f..1081d0b63b6e 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -198,12 +198,17 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state,
}
static int intel_plane_atomic_check(struct drm_plane *plane,
- struct drm_plane_state *state)
+ struct drm_plane_state *new_plane_state)
{
- struct drm_crtc *crtc = state->crtc;
- struct drm_crtc_state *drm_crtc_state;
+ struct drm_atomic_state *state = new_plane_state->state;
+ struct intel_crtc *crtc;
+ struct intel_crtc_state *new_crtc_state;
+ struct drm_plane_state *old_plane_state;
+ struct intel_plane_state *new_intel_plane_state;
- crtc = crtc ? crtc : plane->state->crtc;
+ old_plane_state = drm_atomic_get_old_plane_state(state, plane);
+
+ crtc = to_intel_crtc(new_plane_state->crtc ?: old_plane_state->crtc);
/*
* Both crtc and plane->crtc could be NULL if we're updating a
@@ -214,12 +219,11 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
if (!crtc)
return 0;
- drm_crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc);
- if (WARN_ON(!drm_crtc_state))
- return -EINVAL;
+ new_crtc_state = intel_atomic_get_new_crtc_state(state, crtc);
+ new_intel_plane_state = to_intel_plane_state(new_plane_state);
- return intel_plane_atomic_check_with_state(to_intel_crtc_state(drm_crtc_state),
- to_intel_plane_state(state));
+ return intel_plane_atomic_check_with_state(new_crtc_state,
+ new_intel_plane_state);
}
static void intel_plane_atomic_update(struct drm_plane *plane,
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 3723ee443faa..98851ed5ec2b 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1957,6 +1957,20 @@ intel_atomic_get_old_crtc_state(struct drm_atomic_state *state,
return NULL;
}
+static inline struct intel_crtc_state *
+intel_atomic_get_new_crtc_state(struct drm_atomic_state *state,
+ struct intel_crtc *crtc)
+{
+ struct drm_crtc_state *crtc_state;
+
+ crtc_state = drm_atomic_get_new_crtc_state(state, &crtc->base);
+
+ if (crtc_state)
+ return to_intel_crtc_state(crtc_state);
+ else
+ return NULL;
+}
+
static inline struct intel_plane_state *
intel_atomic_get_new_plane_state(struct drm_atomic_state *state,
struct intel_plane *plane)
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-07-20 13:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-20 13:15 [PATCH 0/8] drm/i915: Stop using get_existing_state Maarten Lankhorst
2017-07-20 13:15 ` [PATCH 1/8] drm/i915: Change use get_new_plane_state instead of existing plane state Maarten Lankhorst
2017-08-01 6:36 ` Mahesh Kumar
2017-08-01 7:55 ` Maarten Lankhorst
2017-07-20 13:15 ` [PATCH 2/8] drm/i915: Change get_existing_crtc_state to old state Maarten Lankhorst
2017-08-01 6:46 ` Mahesh Kumar
2017-08-01 7:53 ` Maarten Lankhorst
2017-08-01 8:04 ` Mahesh Kumar
2017-07-20 13:15 ` Maarten Lankhorst [this message]
2017-08-01 7:57 ` [PATCH 3/8] drm/i915: Use new atomic helpers in intel_plane_atomic_check Mahesh Kumar
2017-07-20 13:15 ` [PATCH 4/8] drm/i915: Use intel_atomic_get_new_crtc_state in intel_fbc.c Maarten Lankhorst
2017-08-01 8:00 ` Mahesh Kumar
2017-07-20 13:15 ` [PATCH 5/8] drm/i915: Remove last references to drm_atomic_get_existing* macros Maarten Lankhorst
2017-07-20 13:15 ` [PATCH 6/8] drm/i915: Do not update legacy state any more Maarten Lankhorst
2017-07-20 13:15 ` [RFC PATCH 7/8] drm/i915: Calculate ironlake intermediate watermarks correctly, v2 Maarten Lankhorst
2017-07-20 13:15 ` [RFC PATCH 8/8] drm/i915: Calculate vlv/chv intermediate watermarks correctly, v3 Maarten Lankhorst
2017-07-20 16:26 ` Maarten Lankhorst
2017-07-20 15:40 ` ✓ Fi.CI.BAT: success for drm/i915: Stop using get_existing_state 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=20170720131519.30104-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox