From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 47/58] drm/i915: extract adjusted mode computation Date: Wed, 5 Sep 2012 11:00:31 -0700 Message-ID: <20120905110031.444f24ae@jbarnes-desktop> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> <1345403595-9678-48-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy7-pub.bluehost.com (oproxy7-pub.bluehost.com [67.222.55.9]) by gabe.freedesktop.org (Postfix) with SMTP id 341B8A09D2 for ; Wed, 5 Sep 2012 11:00:40 -0700 (PDT) In-Reply-To: <1345403595-9678-48-git-send-email-daniel.vetter@ffwll.ch> 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 Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Sun, 19 Aug 2012 21:13:04 +0200 Daniel Vetter wrote: > While at it, adjust a few things: > - Only assigng the new mode to crtc->mode right before calling the > mode_set callbacks - none of the previous callbacks depend upon > this, they all use the mode argument (as they should). > - Check encoder->new_crtc instead of the current crtc to check whether > the encoder will be used. This prepares for moving the staged output > committing further down in the sequence. Follow-on patches will fix > up individual ->mode_fixup callbacks (only tv and lvds are affected > though). > > Signed-Off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/intel_display.c | 75 ++++++++++++++++++++++-------------- > 1 file changed, 47 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 348727d..c7bd573 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6642,6 +6642,48 @@ static void intel_modeset_commit_output_state(struct drm_device *dev) > } > } > > +static struct drm_display_mode * > +intel_modeset_adjusted_mode(struct drm_crtc *crtc, > + struct drm_display_mode *mode) > +{ > + struct drm_device *dev = crtc->dev; > + struct drm_display_mode *adjusted_mode; > + struct drm_encoder_helper_funcs *encoder_funcs; > + struct intel_encoder *encoder; > + > + adjusted_mode = drm_mode_duplicate(dev, mode); > + if (!adjusted_mode) > + return ERR_PTR(-ENOMEM); > + > + /* Pass our mode to the connectors and the CRTC to give them a chance to > + * adjust it according to limitations or connector properties, and also > + * a chance to reject the mode entirely. > + */ > + list_for_each_entry(encoder, &dev->mode_config.encoder_list, > + base.head) { > + > + if (&encoder->new_crtc->base != crtc) > + continue; > + encoder_funcs = encoder->base.helper_private; > + if (!(encoder_funcs->mode_fixup(&encoder->base, mode, > + adjusted_mode))) { > + DRM_DEBUG_KMS("Encoder fixup failed\n"); > + goto fail; > + } > + } > + > + if (!(intel_crtc_mode_fixup(crtc, mode, adjusted_mode))) { > + DRM_DEBUG_KMS("CRTC fixup failed\n"); > + goto fail; > + } > + DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id); > + > + return adjusted_mode; > +fail: > + drm_mode_destroy(dev, adjusted_mode); > + return ERR_PTR(-EINVAL); > +} > + > bool intel_set_mode(struct drm_crtc *crtc, > struct drm_display_mode *mode, > int x, int y, struct drm_framebuffer *fb) > @@ -6661,44 +6703,21 @@ bool intel_set_mode(struct drm_crtc *crtc, > return true; > } > > - adjusted_mode = drm_mode_duplicate(dev, mode); > - if (!adjusted_mode) > - return false; > > saved_hwmode = crtc->hwmode; > saved_mode = crtc->mode; > > - /* Update crtc values up front so the driver can rely on them for mode > - * setting. > - */ > - crtc->mode = *mode; > - > - /* Pass our mode to the connectors and the CRTC to give them a chance to > - * adjust it according to limitations or connector properties, and also > - * a chance to reject the mode entirely. > - */ > - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { > - > - if (encoder->crtc != crtc) > - continue; > - encoder_funcs = encoder->helper_private; > - if (!(ret = encoder_funcs->mode_fixup(encoder, mode, > - adjusted_mode))) { > - DRM_DEBUG_KMS("Encoder fixup failed\n"); > - goto done; > - } > - } > - > - if (!(ret = intel_crtc_mode_fixup(crtc, mode, adjusted_mode))) { > - DRM_DEBUG_KMS("CRTC fixup failed\n"); > - goto done; > + adjusted_mode = intel_modeset_adjusted_mode(crtc, mode); > + if (IS_ERR(adjusted_mode)) { > + return false; > } > - DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id); > > intel_crtc_prepare_encoders(dev); > > dev_priv->display.crtc_disable(crtc); > > + crtc->mode = *mode; > + > /* Set up the DPLL and any encoders state that needs to adjust or depend > * on the DPLL. > */ Fancy, using ERR_PTR even. :) Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center