From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/4] drm/i915: Don't populate pipe_src_{w, h} multiple times Date: Tue, 1 Oct 2013 22:14:08 +0300 Message-ID: <20131001191408.GS9395@intel.com> References: <1380633211-16138-1-git-send-email-ville.syrjala@linux.intel.com> <1380633211-16138-2-git-send-email-ville.syrjala@linux.intel.com> <20131001190352.GR26592@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C6DC6E7879 for ; Tue, 1 Oct 2013 12:14:11 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20131001190352.GR26592@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Oct 01, 2013 at 09:03:52PM +0200, Daniel Vetter wrote: > On Tue, Oct 01, 2013 at 04:13:28PM +0300, ville.syrjala@linux.intel.com w= rote: > > From: Ville Syrj=E4l=E4 > > = > > If we ever end up doing the retry loop due to bandwidth constraints, we > > would rewrite pipe_src_{w,n} based on adjusted_mode timings. But by that > > time the encoder may have already replaced the adjusted_mode with a > > fixed panel mode, which would then corrupt pipe_src_{w,h}. > > = > > Signed-off-by: Ville Syrj=E4l=E4 > > --- > > drivers/gpu/drm/i915/intel_display.c | 9 +++++---- > > 1 file changed, 5 insertions(+), 4 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i91= 5/intel_display.c > > index a91f20a..a695888 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -8472,6 +8472,11 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, > > if (plane_bpp < 0) > > goto fail; > > = > > + /* Determine the real pipe dimensions */ > = > I think it'll benefit clarity a bit if we'd use the requested mode > here (even though we never really care about it's crtc timings anywhere > else). Yeah that could be more clear. > = > This needs more comment imo. What about the following instead? > = > "Determine the real pipe dimensions. Note that stereo modes can increase > the actual pipe size due to the frame doubling and insertion of additional > space for blanks between the frame. This is stored in the crtc timings. We > use the requested mode to do this computation to clearly distinguish it > from the adjusted mode, which can be changed by the connectors in the > below retry loop." > = Sure. I'll slap that on and send a v2. > Cheers, Daniel > = > > + drm_mode_set_crtcinfo(&pipe_config->adjusted_mode, CRTC_STEREO_DOUBLE= ); > > + pipe_config->pipe_src_w =3D pipe_config->adjusted_mode.crtc_hdisplay; > > + pipe_config->pipe_src_h =3D pipe_config->adjusted_mode.crtc_vdisplay; > > + > > encoder_retry: > > /* Ensure the port clock defaults are reset when retrying. */ > > pipe_config->port_clock =3D 0; > > @@ -8480,10 +8485,6 @@ encoder_retry: > > /* Fill in default crtc timings, allow encoders to overwrite them. */ > > drm_mode_set_crtcinfo(&pipe_config->adjusted_mode, CRTC_STEREO_DOUBLE= ); > > = > > - /* set_crtcinfo() may have adjusted hdisplay/vdisplay */ > > - pipe_config->pipe_src_w =3D pipe_config->adjusted_mode.crtc_hdisplay; > > - pipe_config->pipe_src_h =3D pipe_config->adjusted_mode.crtc_vdisplay; > > - > > /* Pass our mode to the connectors and the CRTC to give them a chance= to > > * adjust it according to limitations or connector properties, and al= so > > * a chance to reject the mode entirely. > > -- = > > 1.8.1.5 > > = > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > = > -- = > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- = Ville Syrj=E4l=E4 Intel OTC