| Message ID | 20171121094241.9129-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Op 21-11-17 om 10:42 schreef Daniel Vetter: > This goes back to pre-atomic, where due to intermediate dpms states > connectors and encoder states might indeed not have matched. > > With atomic that's all smashed together (and hopefully no bios ever > enables a vga output in dpms standby/suspedn state or we're toast). > In > > commit 873ffe69a9097fb241fff2967ea6f0bf2c179195 > Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Date: Wed Aug 5 12:37:07 2015 +0200 > > drm/i915: Remove connectors_active from sanitization, v2. > > sanitize_encoders was changed to disable the encoder in all cases, > which made the comment obsolete. > > Remove the misleading comment. > > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 84817ccc5305..b16c563b453f 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -14860,8 +14860,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) > connector->base.dpms = DRM_MODE_DPMS_OFF; > connector->base.encoder = NULL; > } > - /* Enabled encoders without active connectors will be fixed in > - * the crtc fixup. */ > } > > void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv) Lets hope so, Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
On Tue, Nov 21, 2017 at 11:01:09AM +0100, Maarten Lankhorst wrote: > Op 21-11-17 om 10:42 schreef Daniel Vetter: > > This goes back to pre-atomic, where due to intermediate dpms states > > connectors and encoder states might indeed not have matched. > > > > With atomic that's all smashed together (and hopefully no bios ever > > enables a vga output in dpms standby/suspedn state or we're toast). > > In > > > > commit 873ffe69a9097fb241fff2967ea6f0bf2c179195 > > Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Date: Wed Aug 5 12:37:07 2015 +0200 > > > > drm/i915: Remove connectors_active from sanitization, v2. > > > > sanitize_encoders was changed to disable the encoder in all cases, > > which made the comment obsolete. > > > > Remove the misleading comment. > > > > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/i915/intel_display.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 84817ccc5305..b16c563b453f 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -14860,8 +14860,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) > > connector->base.dpms = DRM_MODE_DPMS_OFF; > > connector->base.encoder = NULL; > > } > > - /* Enabled encoders without active connectors will be fixed in > > - * the crtc fixup. */ > > } > > > > void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv) > > Lets hope so, > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Applied, thx for the review. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 84817ccc5305..b16c563b453f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14860,8 +14860,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) connector->base.dpms = DRM_MODE_DPMS_OFF; connector->base.encoder = NULL; } - /* Enabled encoders without active connectors will be fixed in - * the crtc fixup. */ } void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
This goes back to pre-atomic, where due to intermediate dpms states connectors and encoder states might indeed not have matched. With atomic that's all smashed together (and hopefully no bios ever enables a vga output in dpms standby/suspedn state or we're toast). In commit 873ffe69a9097fb241fff2967ea6f0bf2c179195 Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Date: Wed Aug 5 12:37:07 2015 +0200 drm/i915: Remove connectors_active from sanitization, v2. sanitize_encoders was changed to disable the encoder in all cases, which made the comment obsolete. Remove the misleading comment. Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 2 -- 1 file changed, 2 deletions(-)