From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B161EC352A3 for ; Mon, 10 Feb 2020 11:32:13 +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 8F25520838 for ; Mon, 10 Feb 2020 11:32:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F25520838 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 25DF06EC09; Mon, 10 Feb 2020 11:32:13 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48BBC6EC09 for ; Mon, 10 Feb 2020 11:32:12 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 03:32:11 -0800 X-IronPort-AV: E=Sophos;i="5.70,424,1574150400"; d="scan'208";a="237063750" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 03:32:08 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org In-Reply-To: <20200205082959.31317-1-jani.nikula@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200205082959.31317-1-jani.nikula@intel.com> Date: Mon, 10 Feb 2020 13:32:06 +0200 Message-ID: <87imke1xvt.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/mst: fix pipe and vblank enable X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Sarvela, Tomi P" , "Peres, Martin" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 05 Feb 2020, Jani Nikula wrote: > Commit 21fd23ac222f ("drm/i915: move pipe, pch and vblank enable to > encoders on DDI platforms") pushed pipe and vblank enable to encoders on > DDI platforms, however it missed the DP MST encoder. Fix it. > > Fixes: 21fd23ac222f ("drm/i915: move pipe, pch and vblank enable to encoders on DDI platforms") > Cc: Vandita Kulkarni > Cc: Ville Syrjala > Reported-by: Stanislav Lisovskiy > Signed-off-by: Jani Nikula Thanks for the reviews and testing, pushed to dinq. I don't usually cut corners, but I've made an exception and pushed this without full IGT results. It's been 5 days since the patch was posted, the sharded run has fallen between the cracks, and the queue is currently about three days. IMHO it's intolerable for any patch, but especially so for a regression fix that was posted within hours of the bug report. BR, Jani. > --- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index b8aee506d595..9cd59141953d 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -491,6 +491,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, > struct intel_dp *intel_dp = &intel_dig_port->dp; > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > + drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder); > + > + intel_enable_pipe(pipe_config); > + > + intel_crtc_vblank_on(pipe_config); > + > DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); > > if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status, -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx