| Message ID | 1415226371-1880-5-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> On 11/06/2014 12:26 AM, Jesse Barnes wrote: > This only affects the fastboot path as-is. In that case, we simply need > to make sure that we update the pipe size at the first mode set. Rather > than putting it off until we decide to flip (if indeed we do end up > flipping), update the pipe size as appropriate a bit earlier in the > set_config call. > > This sets us up for better pipe tracking in later patches. > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index c86eee6..3f1515d 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2906,8 +2906,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, > return ret; > } > > - intel_update_pipe_size(intel_crtc); > - > dev_priv->display.update_primary_plane(crtc, fb, x, y); > > if (intel_crtc->active) > @@ -11247,6 +11245,8 @@ static int intel_crtc_set_config(struct drm_mode_set *set) > if (!config->mode_changed) > kfree(pipe_config); > > + intel_update_pipe_size(to_intel_crtc(set->crtc)); > + > if (config->mode_changed) { > ret = intel_set_mode_pipes(set->crtc, set->mode, > set->x, set->y, set->fb, pipe_config, >
On Mon, Nov 10, 2014 at 06:09:45PM +0200, Ander Conselvan de Oliveira wrote: > Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> > > On 11/06/2014 12:26 AM, Jesse Barnes wrote: > > This only affects the fastboot path as-is. In that case, we simply need > > to make sure that we update the pipe size at the first mode set. Rather > > than putting it off until we decide to flip (if indeed we do end up > > flipping), update the pipe size as appropriate a bit earlier in the > > set_config call. > > > > This sets us up for better pipe tracking in later patches. > > > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Merged up to this one here, thanks for patches&review. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c86eee6..3f1515d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2906,8 +2906,6 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, return ret; } - intel_update_pipe_size(intel_crtc); - dev_priv->display.update_primary_plane(crtc, fb, x, y); if (intel_crtc->active) @@ -11247,6 +11245,8 @@ static int intel_crtc_set_config(struct drm_mode_set *set) if (!config->mode_changed) kfree(pipe_config); + intel_update_pipe_size(to_intel_crtc(set->crtc)); + if (config->mode_changed) { ret = intel_set_mode_pipes(set->crtc, set->mode, set->x, set->y, set->fb, pipe_config,
This only affects the fastboot path as-is. In that case, we simply need to make sure that we update the pipe size at the first mode set. Rather than putting it off until we decide to flip (if indeed we do end up flipping), update the pipe size as appropriate a bit earlier in the set_config call. This sets us up for better pipe tracking in later patches. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)