From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [RFC 2/3] drm/i915: create intel_update_pipe_size() Date: Tue, 9 Sep 2014 18:53:18 +0300 Message-ID: <20140909155318.GK4193@intel.com> References: <1410273801-20300-1-git-send-email-gustavo@padovan.org> <1410273801-20300-2-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <1410273801-20300-2-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Gustavo Padovan Cc: intel-gfx@lists.freedesktop.org, Gustavo Padovan , dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Sep 09, 2014 at 11:43:20AM -0300, Gustavo Padovan wrote: > From: Gustavo Padovan > = > Factor out a piece of code from intel_pipe_set_base() that updates > the pipe size and adjust fitter. > = > This will help refactor the update primary plane path. > = > Signed-off-by: Gustavo Padovan > --- > drivers/gpu/drm/i915/intel_display.c | 71 +++++++++++++++++++++---------= ------ > 1 file changed, 41 insertions(+), 30 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 2ccf7c0..e7e7184 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2779,6 +2779,46 @@ static bool intel_crtc_has_pending_flip(struct drm= _crtc *crtc) > return pending; > } > = > +static void intel_update_pipe_size(struct drm_crtc *crtc) These days we usually prefer to pass intel_crtc instead of drm_crtc. You can still call it 'crtc' since that's shorter and because we don't need anything from drm_crtc in this function there won't be any confusion between the two. Otherwise the patch looks good. > +{ > + struct intel_crtc *intel_crtc =3D to_intel_crtc(crtc); > + struct drm_device *dev =3D crtc->dev; > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + const struct drm_display_mode *adjusted_mode; > + > + if (!i915.fastboot) > + return; > + > + /* > + * Update pipe size and adjust fitter if needed: the reason for this is > + * that in compute_mode_changes we check the native mode (not the pfit > + * mode) to see if we can flip rather than do a full mode set. In the > + * fastboot case, we'll flip, but if we don't update the pipesrc and > + * pfit state, we'll end up with a big fb scanned out into the wrong > + * sized surface. > + * > + * To fix this properly, we need to hoist the checks up into > + * compute_mode_changes (or above), check the actual pfit state and > + * whether the platform allows pfit disable with pipe active, and only > + * then update the pipesrc and pfit state, even on the flip path. > + */ > + > + adjusted_mode =3D &intel_crtc->config.adjusted_mode; > + > + I915_WRITE(PIPESRC(intel_crtc->pipe), > + ((adjusted_mode->crtc_hdisplay - 1) << 16) | > + (adjusted_mode->crtc_vdisplay - 1)); > + if (!intel_crtc->config.pch_pfit.enabled && > + (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) || > + intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))) { > + I915_WRITE(PF_CTL(intel_crtc->pipe), 0); > + I915_WRITE(PF_WIN_POS(intel_crtc->pipe), 0); > + I915_WRITE(PF_WIN_SZ(intel_crtc->pipe), 0); > + } > + intel_crtc->config.pipe_src_w =3D adjusted_mode->crtc_hdisplay; > + intel_crtc->config.pipe_src_h =3D adjusted_mode->crtc_vdisplay; > +} > + > static int > intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, > struct drm_framebuffer *fb) > @@ -2821,36 +2861,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, = int y, > return ret; > } > = > - /* > - * Update pipe size and adjust fitter if needed: the reason for this is > - * that in compute_mode_changes we check the native mode (not the pfit > - * mode) to see if we can flip rather than do a full mode set. In the > - * fastboot case, we'll flip, but if we don't update the pipesrc and > - * pfit state, we'll end up with a big fb scanned out into the wrong > - * sized surface. > - * > - * To fix this properly, we need to hoist the checks up into > - * compute_mode_changes (or above), check the actual pfit state and > - * whether the platform allows pfit disable with pipe active, and only > - * then update the pipesrc and pfit state, even on the flip path. > - */ > - if (i915.fastboot) { > - const struct drm_display_mode *adjusted_mode =3D > - &intel_crtc->config.adjusted_mode; > - > - I915_WRITE(PIPESRC(intel_crtc->pipe), > - ((adjusted_mode->crtc_hdisplay - 1) << 16) | > - (adjusted_mode->crtc_vdisplay - 1)); > - if (!intel_crtc->config.pch_pfit.enabled && > - (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) || > - intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))) { > - I915_WRITE(PF_CTL(intel_crtc->pipe), 0); > - I915_WRITE(PF_WIN_POS(intel_crtc->pipe), 0); > - I915_WRITE(PF_WIN_SZ(intel_crtc->pipe), 0); > - } > - intel_crtc->config.pipe_src_w =3D adjusted_mode->crtc_hdisplay; > - intel_crtc->config.pipe_src_h =3D adjusted_mode->crtc_vdisplay; > - } > + intel_update_pipe_size(crtc); > = > dev_priv->display.update_primary_plane(crtc, fb, x, y); > = > -- = > 1.9.3 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Ville Syrj=E4l=E4 Intel OTC