From patchwork Wed Sep 18 01:39:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "S, Srinivasan" X-Patchwork-Id: 11149543 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D598114DB for ; Wed, 18 Sep 2019 01:45:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD200206C2 for ; Wed, 18 Sep 2019 01:45:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD200206C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B81E46EDB2; Wed, 18 Sep 2019 01:45:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 799666EDB2; Wed, 18 Sep 2019 01:45:44 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Sep 2019 18:45:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,518,1559545200"; d="scan'208";a="177566427" Received: from unknown (HELO chromeserver.iind.intel.com) ([10.223.246.82]) by orsmga007.jf.intel.com with ESMTP; 17 Sep 2019 18:45:41 -0700 From: srinivasan.s@intel.com To: intel-gfx@lists.freedesktop.org, jani.nikula@linux.intel.com, manasi.d.navare@intel.com, ville.syrjala@linux.intel.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/i915/dp: Fix DP MST error after unplugging TypeC cable Date: Wed, 18 Sep 2019 07:09:43 +0530 Message-Id: <1568770783-169735-1-git-send-email-srinivasan.s@intel.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Srinivasan S MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Srinivasan S This patch avoids DP MST payload error message in dmesg, as it is trying to read the payload from the disconnected DP MST device. After the unplug the connector status is disconnected and we should not be looking for the payload and hence remove the error and throw the warning. This details can be found in: https://bugs.freedesktop.org/show_bug.cgi?id=111632 Signed-off-by: Srinivasan S --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index eeeb3f933aa4..5b2278fdf675 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -215,7 +215,12 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr); if (ret) { - DRM_ERROR("failed to update payload %d\n", ret); + if (!connector || + connector->base.status != connector_status_connected) { + DRM_WARN("DP MST disconnect\n"); + } else { + DRM_ERROR("failed to update payload %d\n", ret); + } } if (old_crtc_state->has_audio) intel_audio_codec_disable(encoder,