From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 6/8] drm/i915: Do not update legacy state any more
Date: Thu, 20 Jul 2017 15:15:17 +0200 [thread overview]
Message-ID: <20170720131519.30104-7-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20170720131519.30104-1-maarten.lankhorst@linux.intel.com>
FBC has been converted to atomic, so updating
some legacy variables is no longer needed.
drm_atomic_helper_update_legacy_modeset_state
does update crtc->x/y anyway, but we shouldn't need it.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d95b3ba1fe47..6e47ee8827ae 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11027,31 +11027,6 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
return ret;
}
-static void
-intel_modeset_update_crtc_state(struct drm_atomic_state *state)
-{
- struct drm_crtc *crtc;
- struct drm_crtc_state *new_crtc_state;
- int i;
-
- /* Double check state. */
- for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
- struct drm_plane_state *plane_state;
- to_intel_crtc(crtc)->config = to_intel_crtc_state(new_crtc_state);
-
- /*
- * Update legacy state to satisfy fbc code. This can
- * be removed when fbc uses the atomic state.
- */
- plane_state = drm_atomic_get_new_plane_state(state, crtc->primary);
- if (plane_state) {
- crtc->primary->fb = plane_state->fb;
- crtc->x = plane_state->src_x >> 16;
- crtc->y = plane_state->src_y >> 16;
- }
- }
-}
-
static bool intel_fuzzy_clock_check(int clock1, int clock2)
{
int diff;
@@ -12438,7 +12413,10 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
/* Only after disabling all output pipelines that will be changed can we
* update the the output configuration. */
- intel_modeset_update_crtc_state(state);
+
+ /* Update legacy crtc->config pointer */
+ for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)
+ to_intel_crtc(crtc)->config = to_intel_crtc_state(new_crtc_state);
if (intel_state->modeset) {
drm_atomic_helper_update_legacy_modeset_state(state->dev, state);
--
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 ` [PATCH 3/8] drm/i915: Use new atomic helpers in intel_plane_atomic_check Maarten Lankhorst
2017-08-01 7:57 ` 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 ` Maarten Lankhorst [this message]
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-7-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