From patchwork Wed Jul 11 14:28:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1184261 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 39BA7DF25A for ; Wed, 11 Jul 2012 16:29:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 280A5A0ECB for ; Wed, 11 Jul 2012 09:29:36 -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 C46B59E8A8 for ; Wed, 11 Jul 2012 08:36:47 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so946955wgb.12 for ; Wed, 11 Jul 2012 08:36:47 -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=1oyPBNyF5iCZ9377Rf7OFjZp2SjkYrCzmVT3N5OdAU8=; b=eKLAjRSFG2iGIQSTkp1lZLOYb2fTlvOQO4aXl7U0yNJt9B5kxH19zC4fvvVPshLrmK u4p4beFHmGHVapOdqPB76rp2pg3nAtRCeYOZNdrxy6/110Rf29Q3mE82oI8Dfksff/NV LJU/nxuAKLnSd3GpfuHr7UQfGgxQGXZklrziU= 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=1oyPBNyF5iCZ9377Rf7OFjZp2SjkYrCzmVT3N5OdAU8=; b=lSovrXN30DLNOeFlSuKjhgiwwHwEElxmFiCin147VQ+DqLbULbhg4e9cx7tGKJf4p1 izk8EAdcEGlmUMoiG0wsPxZK1ICqdl+a7LiZq1ALBA1nxL5/6JoAfoagJ5FFCd1EXg5H 13M1qP3YeDlL4sKeqSRF+8dbQVqb7jNnnT61dJbafbDoo6apC635CRT+loWvxfQgnYE2 28K06PmsR7bJ7WjxFz7mvIo8pP5LCmNi+gA/PYYUv+ncSq/I/Jsp61NjluftyBdX7pne oT+iP224DdhCGvBk8ztWzq14+qzKQYQOLS7GfQD+/ZzvdSVG5ZWYd+Udz7Y/0YEdryQb zwWw== Received: by 10.216.81.7 with SMTP id l7mr5263019wee.23.1342021007497; Wed, 11 Jul 2012 08:36:47 -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 bc2sm5777080wib.0.2012.07.11.08.36.46 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:36:46 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:54 +0200 Message-Id: <1342016944-23395-72-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlfF2o3KOGm/KSwtzTWupMMCy+X7w8r6T/7desusr1SU3KgmIniI64vJRXrzZEFsVC6pbAh Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 71/81] drm/i915: add tons of modeset state checks 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 ... let's see how whether this catches anything earlier and I can track down a few bugs. v2: Add more checks and also add DRM_DEBUG_KMS output so that it's clear which connector/encoder/crtc is being checked atm. Which proved rather useful for debugging ... Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 73 ++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0975ec3..1bade92 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6823,6 +6823,75 @@ static bool intel_crtc_in_use(struct drm_crtc *crtc) base.head) \ if (mask & (1 <<(intel_crtc)->pipe)) \ +static void +intel_modeset_check_state(struct drm_device *dev) +{ + struct intel_crtc *crtc; + struct intel_encoder *encoder; + struct intel_connector *connector; + + list_for_each_entry(connector, &dev->mode_config.connector_list, + base.head) { + /* This also checks the encoder/connector hw state with the + * ->get_hw_state callbacks. */ + intel_connector_check_state(connector); + + WARN_ON(&connector->new_encoder->base != connector->base.encoder); + } + + list_for_each_entry(encoder, &dev->mode_config.encoder_list, + base.head) { + bool enabled = false; + bool active = false; + enum pipe pipe; + + DRM_DEBUG_KMS("[ENCODER:%d:%s]\n", + encoder->base.base.id, + drm_get_encoder_name(&encoder->base)); + + WARN_ON(&encoder->new_crtc->base != encoder->base.crtc); + WARN_ON(encoder->connectors_active && !encoder->base.crtc); + + list_for_each_entry(connector, &dev->mode_config.connector_list, + base.head) { + if (connector->base.encoder != &encoder->base) + continue; + enabled = true; + if (connector->base.dpms == DRM_MODE_DPMS_ON) + active = true; + } + WARN_ON(!!encoder->base.crtc != enabled); + /* dpms on only implies active. */ + WARN_ON(active && !encoder->base.crtc); + WARN_ON(encoder->get_hw_state(encoder, &pipe) + && !encoder->base.crtc); + } + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, + base.head) { + bool enabled = false; + bool active = false; + + DRM_DEBUG_KMS("[CRTC:%d]\n", + crtc->base.base.id); + + WARN_ON(crtc->active && !crtc->base.enabled); + + list_for_each_entry(encoder, &dev->mode_config.encoder_list, + base.head) { + if (encoder->base.crtc != &crtc->base) + continue; + enabled = true; + if (encoder->connectors_active) + active = true; + } + WARN_ON(active != crtc->active); + WARN_ON(enabled != crtc->base.enabled); + + assert_pipe(dev->dev_private, crtc->pipe, crtc->active); + } +} + bool intel_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, int x, int y, @@ -6945,6 +7014,8 @@ done: crtc->mode = saved_mode; } + intel_modeset_check_state(dev); + return ret; } @@ -8163,6 +8234,8 @@ void intel_modeset_setup_hw_state(struct drm_device *dev) } intel_modeset_update_staged_output_state(dev); + + intel_modeset_check_state(dev); } void intel_modeset_gem_init(struct drm_device *dev)