From patchwork Wed Jul 11 17:46:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1184921 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 900093FC8E for ; Wed, 11 Jul 2012 18:52:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A7F69EF3C for ; Wed, 11 Jul 2012 11:52:32 -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 BB97F9E791 for ; Wed, 11 Jul 2012 11:52:04 -0700 (PDT) Received: by wgbdr1 with SMTP id dr1so1097127wgb.12 for ; Wed, 11 Jul 2012 11:52:04 -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=gtUeAv1N8A3P5uWpiChbpyrm5WKGod4V12X/sNoK96Q=; b=OexIph+68BXBA8iDeeo/frg+2yWVKkk9IO5SD21XHdGftEFoHzP2iZ5CMsICpjZOgA Rh6fVZaOIzUl5ryH+Q0hOCK9RE4RDC6dV0JrLqwTkDdIVDISs0LsZKTdRtEQXW3XMT7u QDMQd7+W6UycuZWMpf3hdxclS4lD4v6CMKV8A= 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=gtUeAv1N8A3P5uWpiChbpyrm5WKGod4V12X/sNoK96Q=; b=OjiqyQvcvQ7NgoR3Z8868ukSXIma2SYUdfyI9u9lwwfMKN7AVLxfZ6hR+jRxJrxwGR d/GizdEdkLqAg8HmoYG0/bC2GG7KhfNEG8shKD7XA5ZnZSyzdnbSh3k2BWXH249vrbnp BCoRey3A2n1/4JhRsQiRL/ZvL4pPQQg7vOysKlMWTct8L8g7kiY89kcIUJgJd7HF4OXL L0jX+bGs+BWvqKr+CNXQcLe/mQW4Kqrr049j0ArILFdlT8ac1DL2Wx5lymvGf35djHZB LkKmlCFry0+IqdinIk++oWvRWb/L34BS1/PW11bbKHOU4yTMKfyPADlZuvyfI33qszrX XN6Q== Received: by 10.180.20.239 with SMTP id q15mr49305158wie.13.1342032723627; Wed, 11 Jul 2012 11:52:03 -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 ef5sm6946730wib.3.2012.07.11.11.52.02 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 11:52:02 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 19:46:03 +0200 Message-Id: <1342028763-4244-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-72-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-72-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnhEU0IyWC5BbIWykCL0Z17jWzaOtU9Al1T/ST6CnybNn6wHcGR+6itAvgqjHcRn/IEs2dp Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] 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 ... v3: Add a WARN in the common encoder dpms function, now that also modeset changes properly update the dpms state ... Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 75 +++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f5e8b10..779994d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3625,7 +3625,7 @@ void intel_connector_dpms(struct drm_connector *connector, int mode) if (encoder->base.crtc) intel_encoder_dpms(encoder, mode); else - encoder->connectors_active = false; + WARN_ON(encoder->connectors_active != false); intel_connector_check_state(to_intel_connector(connector)); } @@ -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, @@ -6942,6 +7011,8 @@ done: crtc->mode = saved_mode; } + intel_modeset_check_state(dev); + return ret; } @@ -8160,6 +8231,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)