From patchwork Sun Aug 19 19:13:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1345311 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 CC3AE3FC33 for ; Sun, 19 Aug 2012 20:58:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D04F8A1046 for ; Sun, 19 Aug 2012 13:58:38 -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 97691A1030 for ; Sun, 19 Aug 2012 13:21:31 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so4210645wgb.12 for ; Sun, 19 Aug 2012 13:21:31 -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=1Gqt03OkKuWSyNn1rKiLjTg8cCSBdUGbDb59wptsfdg=; b=fDlSB1k4J163J5qQJ5YxR+ACoIR7BM4OMhgHzbF1xOuDpSv7sNCHMt3FHeRC41x1ZD bVQ6OaxY5eI4/o6CjDfebaMFuqi5cEUnAifG7wrSqPEkI5P5iXnMqBQETCuUV9Iz/P/u V+RyoQux3sI+DGXHPlte15Js//jeLtXtz2PuU= 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=1Gqt03OkKuWSyNn1rKiLjTg8cCSBdUGbDb59wptsfdg=; b=WUbZvf4RuD9tZgFa5jFoLj3vnNSEIO6fBYpLj4gKFYuZZgYUJlMkN8Bc5lvRM4PyUC LRzvOu8oB5V3IcBrskkkZEk15I1HvsmBA/e8HzfKhjeREkyTbKXFi7w0HYECCXkYDXaV hNYLfpReq/gSssf/0W/Cl2sMxZynHHU41B6ZV8xIauTCxMXs8eq7TZA7K+AYU4xs3Fy7 Z1GvFKBRIfFMiXm2NNk/nmE9tzyCzIlEv6XnRg1NszID1lHFo8vTIptq0sf0YERomp/D ++IpdhaeFwU6z4obIUM+E6VlOX0MggizJP1TD7keWp83sj3N4alcTE36LCliSQ3lFty7 j5PA== Received: by 10.180.100.133 with SMTP id ey5mr733450wib.4.1345407691193; Sun, 19 Aug 2012 13:21:31 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id fu8sm24194367wib.5.2012.08.19.13.21.29 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Aug 2012 13:21:30 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 19 Aug 2012 21:13:14 +0200 Message-Id: <1345403595-9678-58-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnbbBlaUVVDr+YZdD8p4OMt+T9p5cCOhfeC0/8lZ5x1YbAdDxVvOmCvYPd2/OpUw68NVYUm Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 57/58] drm/i915: disable all crtcs at suspend time 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 We need this to avoid confusing the hw state readout code with the cpt pch plls at resume time: We'd read the new pipe state (which is disabled), but still believe that we have a life pll connected to that pipe (from before the suspend). Hence properly disable pipes to clear out all the residual state. This has the neat side-effect that we don't enable ports prematurely by restoring bogus state from the saved register values. Signed-Off-by: Daniel Vetter Conflicts: drivers/gpu/drm/i915/intel_drv.h Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/i915_drv.c | 3 +++ drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 4abac6d..fe7512a 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -470,6 +470,9 @@ static int i915_drm_freeze(struct drm_device *dev) "GEM idle failed, resume might fail\n"); return error; } + + intel_modeset_disable(dev); + drm_irq_uninstall(dev); } diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 10e3f9c..95a9f04 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3545,6 +3545,16 @@ static void intel_crtc_disable(struct drm_crtc *crtc) } } +void intel_modeset_disable(struct drm_device *dev) +{ + struct drm_crtc *crtc; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + if (crtc->enabled) + intel_crtc_disable(crtc); + } +} + void intel_encoder_noop(struct drm_encoder *encoder) { } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1282bf0..71c1517 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -450,6 +450,7 @@ struct intel_set_config { extern bool intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, int x, int y, struct drm_framebuffer *old_fb); +extern void intel_modeset_disable(struct drm_device *dev); extern void intel_crtc_load_lut(struct drm_crtc *crtc); extern void intel_crtc_update_dpms(struct drm_crtc *crtc); extern void intel_encoder_noop(struct drm_encoder *encoder);