From patchwork Mon May 11 14:24:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Lankhorst X-Patchwork-Id: 6377991 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3433BEEE1 for ; Mon, 11 May 2015 14:26:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F01C7200F0 for ; Mon, 11 May 2015 14:26:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 67AB920666 for ; Mon, 11 May 2015 14:26:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FD426E456; Mon, 11 May 2015 07:26:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 251D56E3FB for ; Mon, 11 May 2015 07:25:44 -0700 (PDT) Received: from patser.lan (5ED48611.cm-7-5c.dynamic.ziggo.nl [94.212.134.17]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mlankhorst) by mblankhorst.nl (Postfix) with ESMTPSA id EE7D7E0002; Mon, 11 May 2015 16:25:42 +0200 (CEST) From: Maarten Lankhorst To: intel-gfx@lists.freedesktop.org Date: Mon, 11 May 2015 16:24:48 +0200 Message-Id: <1431354318-11995-13-git-send-email-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> Cc: Ander Conselvan de Oliveira Subject: [Intel-gfx] [PATCH 12/42] drm/i915: move swap_state to the right place X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Done as a separate commit to allow better bisecting. Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/i915/intel_display.c | 50 +++++------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a90ebc8eff6f..253d9cd4154a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11437,28 +11437,9 @@ intel_modeset_update_state(struct drm_atomic_state *state) struct drm_crtc *crtc; struct drm_crtc_state *crtc_state; struct drm_connector *connector; - struct drm_connector_state *connector_state; - int i; intel_shared_dpll_commit(dev_priv); - /* - * swap crtc and connector state, plane state is already swapped in - * __intel_set_mode_update_planes. Once .crtc_disable is fixed - * all state should be swapped before disabling crtc's. - */ - for_each_crtc_in_state(state, crtc, crtc_state, i) { - crtc->state->state = state; - swap(state->crtc_states[i], crtc->state); - crtc->state->state = NULL; - } - - for_each_connector_in_state(state, connector, connector_state, i) { - connector->state->state = state; - swap(state->connector_states[i], connector->state); - connector->state->state = NULL; - } - for_each_intel_encoder(dev, intel_encoder) { if (!intel_encoder->base.crtc) continue; @@ -12183,21 +12164,6 @@ static void __intel_set_mode_update_planes(struct drm_device *dev, struct drm_plane *plane; struct drm_crtc *crtc; - /* - * For now only swap plane state, will be replaced with a - * call to drm_atomic_helper_swap_state - */ - for_each_plane_in_state(state, plane, old_plane_state, i) { - struct drm_plane *plane = state->planes[i]; - - if (!plane) - continue; - - plane->state->state = state; - swap(state->plane_states[i], plane->state); - plane->state->state = NULL; - } - for_each_crtc_in_state(state, crtc, crtc_state, i) { const struct drm_crtc_helper_funcs *funcs; @@ -12206,10 +12172,6 @@ static void __intel_set_mode_update_planes(struct drm_device *dev, if (!funcs || !funcs->atomic_begin) continue; - /* XXX: Hack because crtc state is not swapped */ - crtc->state->mode_changed = crtc_state->mode_changed; - crtc->state->active_changed = crtc_state->active_changed; - DRM_DEBUG_ATOMIC("Calling atomic_begin on crtc %i\n", i); funcs->atomic_begin(crtc); } @@ -12287,7 +12249,7 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, struct drm_i915_private *dev_priv = dev->dev_private; struct drm_atomic_state *state = pipe_config->base.state; struct drm_crtc *crtc; - struct drm_crtc_state *crtc_state; + struct drm_crtc_state *old_crtc_state; int ret; int i; @@ -12299,15 +12261,17 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, if (ret) return ret; + drm_atomic_helper_swap_state(dev, state); + __intel_set_mode_update_planes(dev, state); - for_each_crtc_in_state(state, crtc, crtc_state, i) { + for_each_crtc_in_state(state, crtc, old_crtc_state, i) { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - if (!needs_modeset(crtc_state)) + if (!needs_modeset(crtc->state)) continue; - if (!crtc->state->active) + if (!old_crtc_state->active) continue; intel_crtc_dpms_overlay_disable(to_intel_crtc(crtc)); @@ -12329,7 +12293,7 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, modeset_update_crtc_power_domains(state); /* Now enable the clocks, plane, pipe, and connectors that we set up. */ - for_each_crtc_in_state(state, crtc, crtc_state, i) { + for_each_crtc_in_state(state, crtc, old_crtc_state, i) { if (!crtc->state->active) { if (needs_modeset(crtc->state)) intel_update_watermarks(crtc);