| Message ID | 1379622401-9542-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Sep 19, 2013 at 01:26:40PM -0700, Jesse Barnes wrote: > Otherwise the pixel_multiplier may not be set, and who knows what else > in the future. > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 1d14ad3..8d7b5f0 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8790,7 +8790,7 @@ check_crtc_state(struct drm_device *dev) > encoder->get_config(encoder, &pipe_config); > } > > - if (dev_priv->display.get_clock) > + if (active && dev_priv->display.get_clock) > dev_priv->display.get_clock(crtc, &pipe_config); You're -nightly is a bit old, this stuff is gone now. Ville moved it all into the get_crtc_config callback. -Daniel > > WARN(crtc->active != active, > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1d14ad3..8d7b5f0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8790,7 +8790,7 @@ check_crtc_state(struct drm_device *dev) encoder->get_config(encoder, &pipe_config); } - if (dev_priv->display.get_clock) + if (active && dev_priv->display.get_clock) dev_priv->display.get_clock(crtc, &pipe_config); WARN(crtc->active != active,
Otherwise the pixel_multiplier may not be set, and who knows what else in the future. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)