From patchwork Mon Sep 10 19:58:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1433381 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 17062DF28C for ; Mon, 10 Sep 2012 19:43:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8B70A026C for ; Mon, 10 Sep 2012 12:43:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 0738D9F771 for ; Mon, 10 Sep 2012 12:41:18 -0700 (PDT) Received: by wgbdr1 with SMTP id dr1so1849153wgb.12 for ; Mon, 10 Sep 2012 12:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=7/PGLe9gZKG1Imgu5eawApxrjlpvQGttp9Mx6F7abJM=; b=VESaBJXI++J7BTclgn1R3ZScRgd8OE6dLM/emEwW8RuWMSJBdajSa/Sdqyc5CVEicA L/XyJZ9/n1EESaLuTlNp+iuXDFQEosqf4e29F0O16HIAgvIn19tJBJgWqMfRzYkzRFUE 5Q2SE2743bqRCRGN4ihtO0/v1gy4rf4L4OiYM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=7/PGLe9gZKG1Imgu5eawApxrjlpvQGttp9Mx6F7abJM=; b=Weva8UyXd/uI/qChlKa8tX+XIIjKYiyTCtfj6+sA9xnMdoznaBPoIjSSh371d3PQ4l 1X0xex3KP56MgIM0oMZuTE7JAA75FCdZ06cAwOhPVP9lfp0YPjK1dnzJIWQLqt3OTbdk Si4xVNdgZWjpq41MSYAp1tFucZm3nVQbS+tiu1c4JiwOgqp6VuASfZV07+Kx/N2xSMyn HtK7p17nZGX4xxsbVnC/NoPffTZDcT3mQTMHetk+3BtDfxmAPKBl63IXcyru7WNV6vQ7 CacTx0xTOrYAt2/ZkyCQXaheDnEovlY9LuyTkhIqJymv9NoxGIOdGulp8tkFmUFxprgx v0Ww== Received: by 10.216.74.21 with SMTP id w21mr8650445wed.77.1347306077744; Mon, 10 Sep 2012 12:41:17 -0700 (PDT) Received: from hummel.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id l6sm18585398wiz.4.2012.09.10.12.41.16 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 10 Sep 2012 12:41:17 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 10 Sep 2012 21:58:30 +0200 Message-Id: <1347307111-6887-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347307111-6887-1-git-send-email-daniel.vetter@ffwll.ch> References: <1347307111-6887-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkstFiVWEViejfBGRdYCun2FEAH8a1bqrs1tGXhWU3sCcto78OLhNAns0MH2RovqDlEniHg Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/3] drm/i915: correctly update crtc->x/y in set_base X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org While reworking the modeset sequence, this got lost in commit 25c5b2665fe4cc5a93edd29b62e7c05c15dddd26 Author: Daniel Vetter Date: Sun Jul 8 22:08:04 2012 +0200 drm/i915: implement new set_mode code flow I've noticed this because some Xorg versions seem to set up a new mode with every crtc at (0,0) and then pan to the right multi-monitor setup. And since some hacks of mine added more calls to mode_set using the stored crtc->x/y my multi-screen setup blew up. Signed-Off-by: Daniel Vetter Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b8e5a51..fcc7300 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2195,6 +2195,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, old_fb = crtc->fb; crtc->fb = fb; + crtc->x = x; + crtc->y = y; if (old_fb) { intel_wait_for_vblank(dev, intel_crtc->pipe); @@ -6993,11 +6995,11 @@ bool intel_set_mode(struct drm_crtc *crtc, dev_priv->display.crtc_disable(&intel_crtc->base); } - if (modeset_pipes) { + /* crtc->mode is already used by the ->mode_set callbacks, hence we need + * to set it here already despite that we pass it down the callchain. + */ + if (modeset_pipes) crtc->mode = *mode; - crtc->x = x; - crtc->y = y; - } /* Only after disabling all output pipelines that will be changed can we * update the the output configuration. */