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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 19E7FC4363A for ; Tue, 20 Oct 2020 21:56:02 +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 A32AA22247 for ; Tue, 20 Oct 2020 21:56:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A32AA22247 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 C35F86E0D2; Tue, 20 Oct 2020 21:56:00 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08DC76E0D2 for ; Tue, 20 Oct 2020 21:55:59 +0000 (UTC) IronPort-SDR: BsqvTodSqsHMx8Y/NSN6W1AfFqXAauqqo+JEAq8HeyQ6KL9wCANOs7hMp8/eVZO3V7HkM0I28p YHRyWEzqJ7Eg== X-IronPort-AV: E=McAfee;i="6000,8403,9780"; a="155067349" X-IronPort-AV: E=Sophos;i="5.77,399,1596524400"; d="scan'208";a="155067349" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2020 14:55:58 -0700 IronPort-SDR: qKvPFNbATw1rdKf8WY+bfBoRWOrRTwtgZ7c74O06lYoTioQeOLdaCc+8vUwKev/iHMJ3XUUyqS +4BCy2YHwJRw== X-IronPort-AV: E=Sophos;i="5.77,399,1596524400"; d="scan'208";a="533238886" Received: from labuser-z97x-ud5h.jf.intel.com (HELO labuser-Z97X-UD5H) ([10.165.21.211]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2020 14:55:59 -0700 Date: Tue, 20 Oct 2020 14:57:40 -0700 From: "Navare, Manasi" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20201020215740.GA27654@labuser-Z97X-UD5H> References: <20201008214535.22942-1-manasi.d.navare@intel.com> <20201008214535.22942-7-manasi.d.navare@intel.com> <20201019163659.GW6112@intel.com> <20201019224457.GB22411@labuser-Z97X-UD5H> <20201020184502.GC6112@intel.com> <20201020185752.GA18439@labuser-Z97X-UD5H> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201020185752.GA18439@labuser-Z97X-UD5H> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH v10 07/11] drm/i915: Make hardware readout work on i915. 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: 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 Tue, Oct 20, 2020 at 11:57:52AM -0700, Navare, Manasi wrote: > On Tue, Oct 20, 2020 at 09:45:02PM +0300, Ville Syrj=E4l=E4 wrote: > > On Mon, Oct 19, 2020 at 03:45:04PM -0700, Navare, Manasi wrote: > > > On Mon, Oct 19, 2020 at 07:36:59PM +0300, Ville Syrj=E4l=E4 wrote: > > > > On Thu, Oct 08, 2020 at 02:45:31PM -0700, Manasi Navare wrote: > > > > > From: Maarten Lankhorst > > > > > = > > > > > Unfortunately I have no way to test this, but it should be correct > > > > > if the bios sets up bigjoiner in a sane way. > > > > > = > > > > > Skip iterating over bigjoiner slaves, only the master has the sta= te we > > > > > care about. > > > > > = > > > > > Add the width of the bigjoiner slave to the reconstructed fb. > > > > > = > > > > > Hide the bigjoiner slave to userspace, and double the mode on big= joiner > > > > > master. > > > > > = > > > > > And last, disable bigjoiner slave from primary if reconstruction = fails. > > > > > = > > > > > v2: > > > > > * Manual Rebase (Manasi) > > > > > = > > > > > Signed-off-by: Maarten Lankhorst > > > > > Signed-off-by: Manasi Navare > > > > > --- > > > > > drivers/gpu/drm/i915/display/intel_display.c | 64 ++++++++++++++= +++++- > > > > > 1 file changed, 62 insertions(+), 2 deletions(-) > > > > > = > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drive= rs/gpu/drm/i915/display/intel_display.c > > > > > index faf8bf757bed..aa981aa4f6a1 100644 > > > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > > > @@ -3619,6 +3619,8 @@ intel_find_initial_plane_obj(struct intel_c= rtc *intel_crtc, > > > > > struct intel_plane *intel_plane =3D to_intel_plane(primary); > > > > > struct intel_plane_state *intel_state =3D > > > > > to_intel_plane_state(plane_state); > > > > > + struct intel_crtc_state *crtc_state =3D > > > > = > > > > Whitespace fail. Didn't checkpatch complain? > > > = > > > I will fix this > > > = > > > > = > > > > > + to_intel_crtc_state(intel_crtc->base.state); > > > > > struct drm_framebuffer *fb; > > > > > struct i915_vma *vma; > > > > > = > > > > > @@ -3641,7 +3643,7 @@ intel_find_initial_plane_obj(struct intel_c= rtc *intel_crtc, > > > > > if (c =3D=3D &intel_crtc->base) > > > > > continue; > > > > > = > > > > > - if (!to_intel_crtc(c)->active) > > > > > + if (!to_intel_crtc_state(c->state)->uapi.active) > > > > > continue; > > > > > = > > > > > state =3D to_intel_plane_state(c->primary->state); > > > > > @@ -3663,6 +3665,11 @@ intel_find_initial_plane_obj(struct intel_= crtc *intel_crtc, > > > > > * pretend the BIOS never had it enabled. > > > > > */ > > > > > intel_plane_disable_noatomic(intel_crtc, intel_plane); > > > > > + if (crtc_state->bigjoiner) { > > > > > + struct intel_crtc *slave =3D > > > > > + crtc_state->bigjoiner_linked_crtc; > > > > > + intel_plane_disable_noatomic(slave, to_intel_plane(slave->base= .primary)); > > > > > + } > > > > > = > > > > > return; > > > > > = > > > > > @@ -10687,6 +10694,7 @@ static void > > > > > skl_get_initial_plane_config(struct intel_crtc *crtc, > > > > > struct intel_initial_plane_config *plane_config) > > > > > { > > > > > + struct intel_crtc_state *crtc_state =3D to_intel_crtc_state(crt= c->base.state); > > > > > struct drm_device *dev =3D crtc->base.dev; > > > > > struct drm_i915_private *dev_priv =3D to_i915(dev); > > > > > struct intel_plane *plane =3D to_intel_plane(crtc->base.primary= ); > > > > > @@ -10795,6 +10803,18 @@ skl_get_initial_plane_config(struct inte= l_crtc *crtc, > > > > > fb->height =3D ((val >> 16) & 0xffff) + 1; > > > > > fb->width =3D ((val >> 0) & 0xffff) + 1; > > > > > = > > > > > + /* add bigjoiner slave as well, if the fb stretches both */ > > > > > + if (crtc_state->bigjoiner) { > > > > > + enum pipe bigjoiner_pipe =3D crtc_state->bigjoiner_linked_crtc= ->pipe; > > > > > + > > > > > + if (fb->width =3D=3D crtc_state->pipe_src_w && > > > > > + (intel_de_read(dev_priv, PLANE_SURF(pipe, plane_id)) & 0xf= ffff000) =3D=3D plane_config->base) { > > > > > + val =3D intel_de_read(dev_priv, PLANE_SIZE(bigjoiner_pipe, pl= ane_id)); > > > > > + fb->height +=3D ((val >> 16) & 0xfff) + 1; > > > > > + fb->width +=3D ((val >> 0) & 0x1fff) + 1; > > > > = > > > > This looks wrong. > > > = > > > Why is it wrong? Double checked the plane size width and height bits = from bspec > > > and the mask looks correct here. = > > > Can you elaborate on what is wrong here? > > = > > The pipes are side-by-side. Gotcha, so Only the fb->width needs to be modified to add the width of slav= e pipe and keep height as is Right? I will fix this in the next rev Manasi > = > Yes the master and slave pipes are consecutive, still not sure what is re= quired to correct the logic here > = > Manasi > = > > = > > -- = > > Ville Syrj=E4l=E4 > > Intel > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx