From patchwork Wed Nov 8 10:54:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10048281 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 92B206032D for ; Wed, 8 Nov 2017 10:55:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C27029460 for ; Wed, 8 Nov 2017 10:55:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80D712A579; Wed, 8 Nov 2017 10:55:04 +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=ham 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 3BED82946A for ; Wed, 8 Nov 2017 10:55:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AEFE16E649; Wed, 8 Nov 2017 10:55:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 645286E0EC for ; Wed, 8 Nov 2017 10:54:59 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id r196so9840391wmf.2 for ; Wed, 08 Nov 2017 02:54:59 -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=Plzo7KOE8ZNThENVccM+SB+NEhlsVuJb8Jq80AbBnHQ=; b=WN548NQNt/M7HNzhwB/TAXvH315Pf3LYBbCnGPVUAW60pilPxNKZXrc2qlXrsy4aB3 efvBdxIAOWqHqsCAOlF0ZbpL4w4gsuKrflmlnRCzt6UbjSgD697NM4p7gFA17WjRz0OU 5BpYEH5FOesQ7Os3Prrwxc1mnLp0rZ+FCtLtc= 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=Plzo7KOE8ZNThENVccM+SB+NEhlsVuJb8Jq80AbBnHQ=; b=tDXyF07JsG0CTfmpvdO74MfoL15mhnmtzrZ1k925SQcuXFicikLmEesTwZI6a4jN8L IeM4cyWpMSCsp0azKw2+caOzf4Xjvn35f7BbFsoiiCHiXuwmLSKzRmGMf1LPJHrl5Seg +qelDUhV/FS80ZpwD5qt8sHjKFyYmcJ2qCs0VLHPAGq4S+81Y6P4ffEmGRYcd6VkVYp3 B4OvzDI0rKApJGIuLfbznYguYBH8T+Sha0dXgKcwIHFNczWLo9FhXUWMOw1CAGkqMANx Y4DdAE8VL7mh8/QIEc48b1V+g/KhiCxlSmB1EWqJC4CtshR3GLkBa5xw1rwfpielPw3s pT4g== X-Gm-Message-State: AJaThX7f/v/uZFrLiaBrcE1ssShuZxopkQlWivSjHvoQZf0L6N2Iw15H zFuMzxkeltncZa1VGROqULjpWss7 X-Google-Smtp-Source: ABhQp+QQe++Px6kIZ57+fX8fT2QCFMKjxAhvuKeGIUH16Nlif4PmZcj+SiHk/RiDkBy6dv+DtlGe8w== X-Received: by 10.80.152.229 with SMTP id j92mr83280edb.279.1510138497584; Wed, 08 Nov 2017 02:54:57 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id r15sm3657767edi.52.2017.11.08.02.54.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Nov 2017 02:54:56 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/2] drm/i915: sync dp link status checks against atomic commmits Date: Wed, 8 Nov 2017 11:54:50 +0100 Message-Id: <20171108105450.20339-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171108105450.20339-1-daniel.vetter@ffwll.ch> References: <20171108105450.20339-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. Cc: Manasi Navare Cc: Maarten Lankhorst Cc: Ville Syrjälä References: https://bugs.freedesktop.org/show_bug.cgi?id=103336 References: https://bugs.freedesktop.org/show_bug.cgi?id=99272 Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index d27c0145ac91..319c372dc26f 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,10 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) return; } - if (!intel_encoder->base.crtc) + if (!conn_state->crtc || !conn_state->crtc->state->active) return; - if (!to_intel_crtc(intel_encoder->base.crtc)->active) + if (!try_wait_for_completion(&conn_state->commit->hw_done)) return; /*