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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 41B6FC2D0DB for ; Thu, 23 Jan 2020 13:41:03 +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 1CB0820661 for ; Thu, 23 Jan 2020 13:41:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CB0820661 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 ABE5E6E067; Thu, 23 Jan 2020 13:41:02 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F9A76E067 for ; Thu, 23 Jan 2020 13:41:01 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jan 2020 05:41:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,354,1574150400"; d="scan'208";a="259835149" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga002.fm.intel.com with SMTP; 23 Jan 2020 05:40:58 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 23 Jan 2020 15:40:57 +0200 Date: Thu, 23 Jan 2020 15:40:57 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Anshuman Gupta Message-ID: <20200123134057.GL13686@intel.com> References: <20200123132659.725-1-anshuman.gupta@intel.com> <20200123132659.725-3-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200123132659.725-3-anshuman.gupta@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [RFC 2/6] drm/i915: Remove (pipe == crtc->index) asummption 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: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Jan 23, 2020 at 06:56:55PM +0530, Anshuman Gupta wrote: > we can't have (pipe =3D=3D crtc->index) assumption in > driver in order to support 3 non-contiguous > display pipe system. > = > Cc: Ville Syrj=E4l=E4 > Signed-off-by: Anshuman Gupta > --- > drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 878d331b9e8c..afd8d43160c6 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -14070,11 +14070,11 @@ verify_single_dpll_state(struct drm_i915_privat= e *dev_priv, > if (new_crtc_state->hw.active) > I915_STATE_WARN(!(pll->active_mask & crtc_mask), > "pll active mismatch (expected pipe %c in active mask 0x%02x)\n", > - pipe_name(drm_crtc_index(&crtc->base)), pll->active_mask); > + pipe_name(crtc->pipe), pll->active_mask); > else > I915_STATE_WARN(pll->active_mask & crtc_mask, > "pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n= ", > - pipe_name(drm_crtc_index(&crtc->base)), pll->active_mask); > + pipe_name(crtc->pipe), pll->active_mask); > = > I915_STATE_WARN(!(pll->state.crtc_mask & crtc_mask), > "pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n", > @@ -14103,10 +14103,10 @@ verify_shared_dpll_state(struct intel_crtc *crt= c, > = > I915_STATE_WARN(pll->active_mask & crtc_mask, > "pll active mismatch (didn't expect pipe %c in active mask)\n", > - pipe_name(drm_crtc_index(&crtc->base))); > + pipe_name(crtc->pipe)); > I915_STATE_WARN(pll->state.crtc_mask & crtc_mask, > "pll enabled crtcs mismatch (found %x in enabled mask)\n", > - pipe_name(drm_crtc_index(&crtc->base))); > + pipe_name(crtc->pipe)); > } > } > = > @@ -16485,8 +16485,6 @@ static int intel_crtc_init(struct drm_i915_privat= e *dev_priv, enum pipe pipe) > = > intel_color_init(crtc); > = > - WARN_ON(drm_crtc_index(&crtc->base) !=3D crtc->pipe); > - The first and second hunks don't really have anything to do with each other. Also the WARN_ON() should not be removed until all the assumptions are fixed. > return 0; > = > fail: > -- = > 2.24.0 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx