| Message ID | 20171110113503.16253-5-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Nov 10, 2017 at 12:34:57PM +0100, Maarten Lankhorst wrote: > This prevents us from having to open code those checks in > intel_dp_sink_crc. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index f5933b0719c9..1b3f258038b2 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4836,8 +4836,10 @@ void hsw_enable_ips(struct intel_crtc *crtc) > { > struct drm_device *dev = crtc->base.dev; > struct drm_i915_private *dev_priv = to_i915(dev); > + struct intel_crtc_state *crtc_state = crtc->config; > > - if (!crtc->config->ips_enabled) > + if (!crtc_state->ips_enabled || > + !(crtc_state->active_planes & BIT(PLANE_PRIMARY))) I think time to fix up how we compute this, maybe even make it a plane property, or at least wm property? I think putting this into the wm state would clarify a bunch of things in the code flow ... Waiting with more r-bs for ips patches until we know what we should be doing here. -Daniel > return; > > /* > -- > 2.15.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://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 f5933b0719c9..1b3f258038b2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4836,8 +4836,10 @@ void hsw_enable_ips(struct intel_crtc *crtc) { struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); + struct intel_crtc_state *crtc_state = crtc->config; - if (!crtc->config->ips_enabled) + if (!crtc_state->ips_enabled || + !(crtc_state->active_planes & BIT(PLANE_PRIMARY))) return; /*
This prevents us from having to open code those checks in intel_dp_sink_crc. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)