From patchwork Fri Jul 1 22:22:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 939342 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p61MZepu025672 for ; Fri, 1 Jul 2011 22:36:00 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B2B8A0919 for ; Fri, 1 Jul 2011 15:25:19 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy6-pub.bluehost.com (oproxy6-pub.bluehost.com [67.222.54.6]) by gabe.freedesktop.org (Postfix) with SMTP id 522459E9F4 for ; Fri, 1 Jul 2011 15:23:04 -0700 (PDT) Received: (qmail 15059 invoked by uid 0); 1 Jul 2011 22:23:04 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy3.bluehost.com with SMTP; 1 Jul 2011 22:23:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-Identified-User; b=Yrp0++RiUOmU2T/ZGC4cegtNOeC1oRJ/dWBGX3ePd9KudoaAehnLXta3I/B4ipX1QQEMserl7e15RVG26HtnP+usVOyOSdquvf0+EQK3fNPDkxrckhw5IVcsdruoTKfp; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1Qcm75-00047w-Hf; Fri, 01 Jul 2011 16:23:03 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 1 Jul 2011 15:22:56 -0700 Message-Id: <1309558978-4704-7-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309558978-4704-1-git-send-email-jbarnes@virtuousgeek.org> References: <1309558978-4704-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 6/8] drm/i915/dp: clear DP encoder CRTC if the receiver disappears X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 01 Jul 2011 22:36:00 +0000 (UTC) If the receiver goes away, drop any associated CRTC. This will force a full mode set on any subsequent setcrtc call, which is what we need if the receiver is gone and the link is down. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_dp.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index f41aec3..d7a8d24 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1533,7 +1533,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) if (!intel_dp_get_link_status(intel_dp)) { intel_dp_link_down(intel_dp); - return; + goto out_gone; } /* Try to read receiver status if the link appears to be up */ @@ -1542,13 +1542,19 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) sizeof (intel_dp->dpcd)); if (ret != sizeof(intel_dp->dpcd)) { intel_dp_link_down(intel_dp); - return; + goto out_gone; } if (!intel_channel_eq_ok(intel_dp)) { intel_dp_start_link_train(intel_dp); intel_dp_complete_link_train(intel_dp); } + + return; + +out_gone: + DRM_DEBUG_DRIVER("sink gone, clearing crtc for DP\n"); + intel_dp->base.base.crtc = NULL; } static enum drm_connector_status