From patchwork Thu Apr 11 18:22:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2429921 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 29D593FD8C for ; Thu, 11 Apr 2013 18:22:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D566E6680 for ; Thu, 11 Apr 2013 11:22:53 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f176.google.com (mail-ea0-f176.google.com [209.85.215.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CBDFE66A3 for ; Thu, 11 Apr 2013 11:19:55 -0700 (PDT) Received: by mail-ea0-f176.google.com with SMTP id h10so899426eaj.35 for ; Thu, 11 Apr 2013 11:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tQJG16R2CQYzJuJb7wSyevTfc1xth3wKvjgVtphcfhg=; b=E61iIiugGbrXPh7+7FAEx0EelSQm2yF372AF74spw1r0QqiCV2mXX+1q6c6cKQJO4k OiYruwDRTowNScIf4Gk4ohi07xWArMyXQZ2d8mX0JqK6p2MVJ9lrIHf4V9NEFDsIiJN4 Ls6V2b24ZwtS3CKLFHYig9fNy+VwWB4Vdfh1Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=tQJG16R2CQYzJuJb7wSyevTfc1xth3wKvjgVtphcfhg=; b=ZcuL/bO9ASv8zOxj8EJv1pRZZbEuQ0oObbnjAdHQQnoEQv26tuSugbLOGoiu647DG3 H7V/w6YtanPsynkdyebDNlZ4Apr6Sui3caglO6zwxDVaf/tV16bxlMiGQGKfK2LjgAD/ 1QEV5eCE/nMy9hWVvNcWgjNPJczGCblFkhv8jdbf6CeRloqTeB6ZaTd5mol9jpPE8KZo hGM3Xd4mUrXf8xQQd4kNl8pwL3s/QqhEwDRulzDOndAXE/RqB5p53I/DX0DNcuVyo8KD b88AzxE4DmVb6eRsTkrL/4rWIIyEj9yoRMVORT5ZgxR+zmRr/eEYX2h1T4pil4L4W0Lw oBbg== X-Received: by 10.15.76.132 with SMTP id n4mr19286958eey.16.1365704394470; Thu, 11 Apr 2013 11:19:54 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id v6sm6940353eel.10.2013.04.11.11.19.52 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 11:19:53 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 11 Apr 2013 20:22:50 +0200 Message-Id: <1365704571-17122-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365537090-11518-1-git-send-email-daniel.vetter@ffwll.ch> References: <1365537090-11518-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnecof5ilULyVsjFSovCVmrxlji+YwuswVfRgvOzPfriDnGXqNxTTF8XFUy868u90FPvze/ Cc: Daniel Vetter , Richard Cochran , LKML , DRI Development , Tomas Melin , stable@vger.kernel.org Subject: [Intel-gfx] [PATCH] drm/i915: don't check inconsistent modeset state when force-restoring 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 It will be only consistent once we've restored all the crtcs. Since a bunch of other callers also want to just restore a single crtc, add a boolean to disable checking only where it doesn't make sense. Note that intel_modeset_setup_hw_state already has a call to intel_modeset_check_state at the end, so we don't reduce the amount of checking. v2: Try harder not to create a big patch (Chris). v3: Even smaller (still Chris). Also fix a trailing space. References: https://lkml.org/lkml/2013/3/16/60 Cc: Tomas Melin Cc: Richard Cochran Cc: Chris Wilson Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8809813..457a0a0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7916,9 +7916,9 @@ intel_modeset_check_state(struct drm_device *dev) } } -int intel_set_mode(struct drm_crtc *crtc, - struct drm_display_mode *mode, - int x, int y, struct drm_framebuffer *fb) +static int __intel_set_mode(struct drm_crtc *crtc, + struct drm_display_mode *mode, + int x, int y, struct drm_framebuffer *fb) { struct drm_device *dev = crtc->dev; drm_i915_private_t *dev_priv = dev->dev_private; @@ -8012,8 +8012,6 @@ done: if (ret && crtc->enabled) { crtc->hwmode = *saved_hwmode; crtc->mode = *saved_mode; - } else { - intel_modeset_check_state(dev); } out: @@ -8022,6 +8020,20 @@ out: return ret; } +int intel_set_mode(struct drm_crtc *crtc, + struct drm_display_mode *mode, + int x, int y, struct drm_framebuffer *fb) +{ + int ret; + + ret = __intel_set_mode(crtc, mode, x, y, fb); + + if (ret == 0) + intel_modeset_check_state(crtc->dev); + + return ret; +} + void intel_crtc_restore_mode(struct drm_crtc *crtc) { intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, crtc->fb); @@ -9333,10 +9345,16 @@ setup_pipes: } if (force_restore) { + /* + * We need to use raw interfaces for restoring state to avoid + * checking (bogus) intermediate states. + */ for_each_pipe(pipe) { struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; - intel_crtc_restore_mode(crtc); + + __intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, + crtc->fb); } list_for_each_entry(plane, &dev->mode_config.plane_list, head) intel_plane_restore(plane);