From patchwork Fri Nov 10 10:53:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10052821 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 451616035D for ; Fri, 10 Nov 2017 10:53:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33CC128907 for ; Fri, 10 Nov 2017 10:53:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 288552B258; Fri, 10 Nov 2017 10:53:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D2A5F28907 for ; Fri, 10 Nov 2017 10:53:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B28076EA53; Fri, 10 Nov 2017 10:53:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id D51A56EA4D for ; Fri, 10 Nov 2017 10:53:39 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id z3so1855863wme.5 for ; Fri, 10 Nov 2017 02:53:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=myruuwznbbZxP4txScDnu+IDbqvd2Vg8FBuFs4Sf08Q=; b=XycJhwKhp31nog0MlaOBA/SsCXFG5xjcSCxLuZSSpynj3A9FB8KnB15C+JWEumz0X7 gE+ssLHtpKx7SwqPW4de/En7nE+xqi/AcA7sxhoWBheJnJLsxwgeRg6AjZuu0aeuv3w0 EEAhs1PYrjPgugJkG/cZ2ue0rURW1jSzTHLmc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=myruuwznbbZxP4txScDnu+IDbqvd2Vg8FBuFs4Sf08Q=; b=jorts5C0eJ0/N9E2dGbrK0I6O339MpCp1viwhB3lEg7IMBkoEJnTyEJgFQejtZEWhV QoA42ytCNcYkdtK2C7Y3KXoiDZkdeVXv95+RLKM8SJThvHGu1sDX//6iPicYBefs/ilx 5TjXJDpRuedTJpxbZgJLuO78SS4kCqOCGGGqWvSm7UscsdPpOAeE1bs0CUn3FLP7aHDb oTTbMpmdD1BUE6ltaIamjZrnfX8POzmozu1ULZGYnNZCVttwdIMbz1lcUIrwnVRMl6Mq EUE7bXqFRN3eBcV/tTsvEJIIiXpJi62ThSC2WhIg3X5iQBFklPWuoCxhtYnDro6RcZ0x wlxw== X-Gm-Message-State: AJaThX6oQhMCOhba5tAYjZzm2aQ9Swvk3OIImNec9BqVCG8ByNZIEyKQ Yb+ev7RbtpRWUmrzwCzcM6o2rtnp X-Google-Smtp-Source: AGs4zMYOzqSWsMW4aCz9osV6DuLGr871Tv+vkKWXyvJKY+zfQKuOZd4IpvufjphViFYhjFGXNNYC5g== X-Received: by 10.80.181.90 with SMTP id z26mr2065344edd.76.1510311217984; Fri, 10 Nov 2017 02:53:37 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id t10sm7786436edb.92.2017.11.10.02.53.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 02:53:37 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/2] drm/i915: sync dp link status checks against atomic commmits Date: Fri, 10 Nov 2017 11:53:13 +0100 Message-Id: <20171110105313.16718-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171110105313.16718-1-daniel.vetter@ffwll.ch> References: <20171110105313.16718-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development , Manasi Navare , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Two bits: - check actual atomic state, the legacy stuff can only be looked at from within the atomic_commit_tail function, since it's only protected by ordering and not by any locks. - Make sure we don't wreak the work an ongoing nonblocking commit is doing. v2: We need the crtc lock too, because a plane update might change it without having to acquire the connection_mutex (Maarten). Use Maarten's changes for this locking, while keeping the logic that uses the connection->commit->hw_done signal for syncing with nonblocking commits. v3: The initial state objects from the hw state readout do not have a commit object. Check for that (spotted by CI). Cc: Manasi Navare Cc: Maarten Lankhorst Cc: Ville Syrjälä References: https://bugs.freedesktop.org/show_bug.cgi?id=103336 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99272 Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_dp.c | 57 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index cddd96b24878..59189cdee3db 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4319,6 +4319,8 @@ static void intel_dp_check_link_status(struct intel_dp *intel_dp) { struct intel_encoder *intel_encoder = &dp_to_dig_port(intel_dp)->base; + struct drm_connector_state *conn_state = + intel_dp->attached_connector->base.state; struct drm_device *dev = intel_dp_to_dev(intel_dp); u8 link_status[DP_LINK_STATUS_SIZE]; @@ -4329,10 +4331,16 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) return; } - if (!intel_encoder->base.crtc) + if (!conn_state->crtc) return; - if (!to_intel_crtc(intel_encoder->base.crtc)->active) + WARN_ON(!drm_modeset_is_locked(&conn_state->crtc->mutex)); + + if (!conn_state->crtc->state->active) + return; + + if (conn_state->commit && + !try_wait_for_completion(&conn_state->commit->hw_done)) return; /* @@ -4368,7 +4376,6 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) static bool intel_dp_short_pulse(struct intel_dp *intel_dp) { - struct drm_device *dev = intel_dp_to_dev(intel_dp); struct intel_encoder *intel_encoder = &dp_to_dig_port(intel_dp)->base; u8 sink_irq_vector = 0; u8 old_sink_count = intel_dp->sink_count; @@ -4408,9 +4415,8 @@ intel_dp_short_pulse(struct intel_dp *intel_dp) DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n"); } - drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); intel_dp_check_link_status(intel_dp); - drm_modeset_unlock(&dev->mode_config.connection_mutex); + if (intel_dp->compliance.test_type == DP_TEST_LINK_TRAINING) { DRM_DEBUG_KMS("Link Training Compliance Test requested\n"); /* Send a Hotplug Uevent to userspace to start modeset */ @@ -4860,8 +4866,19 @@ intel_dp_detect(struct drm_connector *connector, connector->base.id, connector->name); /* If full detect is not performed yet, do a full detect */ - if (!intel_dp->detect_done) + if (!intel_dp->detect_done) { + struct drm_crtc *crtc; + int ret; + + crtc = connector->state->crtc; + if (crtc) { + ret = drm_modeset_lock(&crtc->mutex, ctx); + if (ret) + return ret; + } + status = intel_dp_long_pulse(intel_dp->attached_connector); + } intel_dp->detect_done = false; @@ -5146,10 +5163,38 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) } if (!intel_dp->is_mst) { + struct drm_modeset_acquire_ctx ctx; + struct drm_connector *connector = &intel_dp->attached_connector->base; + struct drm_crtc *crtc; + int iret; + + drm_modeset_acquire_init(&ctx, 0); +retry: + iret = drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx); + if (iret) + goto err; + + crtc = connector->state->crtc; + if (crtc) { + iret = drm_modeset_lock(&crtc->mutex, &ctx); + if (iret) + goto err; + } + if (!intel_dp_short_pulse(intel_dp)) { intel_dp->detect_done = false; goto put_power; } + +err: + if (iret == -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry; + } + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + WARN(iret, "Acquiring modeset locks failed with %i\n", iret); } ret = IRQ_HANDLED;