Re: [PATCH 1/2] drm/i915: Fix fastboot scalers for skylake.

Daniel Vetter
2015-09-23T08:52:16Z

On Wed, Sep 16, 2015 at 11:45:22AM -0700, Jesse Barnes wrote:
> On 09/14/2015 02:30 AM, Maarten Lankhorst wrote:
> > The scaler_id in intel_pipe_config_compare should not be checked
> > when adjusting in intel_pipe_config_compare. The hw scaler id may
> > be changed in intel_update_pipe_config.
> >
> > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > ---
> > 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 452e8f77151d..deb76c84a307 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -12467,9 +12467,9 @@ intel_pipe_config_compare(struct drm_device *dev,
> > PIPE_CONF_CHECK_X(pch_pfit.pos);
> > PIPE_CONF_CHECK_X(pch_pfit.size);
> > }
> > - }
> >
> > - PIPE_CONF_CHECK_I(scaler_state.scaler_id);
> > + PIPE_CONF_CHECK_I(scaler_state.scaler_id);
> > + }
> >
> > /* BDW+ don't expose a synchronous way to read the state */
> > if (IS_HASWELL(dev))
> >
>
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Queued for -next, thanks for the patch. Still looking for that
kms_fastmodeset igt ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation