| Message ID | 707f0f66b7f4bf6836ee3b163e9049213bd88f6a.1377880296.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2013/8/30 Jani Nikula <jani.nikula@intel.com>: > The spec says to notify prior to power down and after power up. It is > unclear whether it makes a difference. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > > --- > > Paulo, still okay with the r-b? Yes :) > --- > drivers/gpu/drm/i915/intel_display.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 9222e570..83d853f 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3425,8 +3425,10 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) > intel_update_fbc(dev); > mutex_unlock(&dev->struct_mutex); > > - for_each_encoder_on_crtc(dev, crtc, encoder) > + for_each_encoder_on_crtc(dev, crtc, encoder) { > encoder->enable(encoder); > + intel_opregion_notify_encoder(encoder, true); > + } > > /* > * There seems to be a race in PCH platform hw (at least on some > @@ -3540,8 +3542,10 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) > if (!intel_crtc->active) > return; > > - for_each_encoder_on_crtc(dev, crtc, encoder) > + for_each_encoder_on_crtc(dev, crtc, encoder) { > + intel_opregion_notify_encoder(encoder, false); > encoder->disable(encoder); > + } > > intel_crtc_wait_for_pending_flips(crtc); > drm_vblank_off(dev, pipe); > -- > 1.7.10.4 >
On Fri, Aug 30, 2013 at 04:51:09PM -0300, Paulo Zanoni wrote: > 2013/8/30 Jani Nikula <jani.nikula@intel.com>: > > The spec says to notify prior to power down and after power up. It is > > unclear whether it makes a difference. > > > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > > > > --- > > > > Paulo, still okay with the r-b? > > Yes :) Ok I've merged the first 6 patches from this series to dinq. Thanks, Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9222e570..83d853f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3425,8 +3425,10 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) intel_update_fbc(dev); mutex_unlock(&dev->struct_mutex); - for_each_encoder_on_crtc(dev, crtc, encoder) + for_each_encoder_on_crtc(dev, crtc, encoder) { encoder->enable(encoder); + intel_opregion_notify_encoder(encoder, true); + } /* * There seems to be a race in PCH platform hw (at least on some @@ -3540,8 +3542,10 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) if (!intel_crtc->active) return; - for_each_encoder_on_crtc(dev, crtc, encoder) + for_each_encoder_on_crtc(dev, crtc, encoder) { + intel_opregion_notify_encoder(encoder, false); encoder->disable(encoder); + } intel_crtc_wait_for_pending_flips(crtc); drm_vblank_off(dev, pipe);