diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-11-22 19:39:06 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-11-30 16:50:09 +0100 |
| commit | adbe5c5cd32c732a4ea1d4c5f41714fa836d69b6 (patch) | |
| tree | 01549fda52fc8ac7b2c66c8262d27c324eac6325 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 24f2845056892b297fa95edbddceefd38acc0e62 (diff) | |
| download | op-kernel-dev-adbe5c5cd32c732a4ea1d4c5f41714fa836d69b6.zip op-kernel-dev-adbe5c5cd32c732a4ea1d4c5f41714fa836d69b6.tar.gz | |
drm/i915: Enable IPS with only sprite plane visible too, v4.
This comment predates atomic, and I think with the way we currently
track IPS, it's safe to enable this for the case we switch too.
Changes since v1:
- Keep IPS enabled when switching planes.
Changes since v2:
- Enable IPS when at least one plane is enabled. (Ville)
Changes since v3:
- Actually do what was advertised in v3, sigh! (Ville, CI)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171122183906.47767-1-maarten.lankhorst@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 68f101c..601c23b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6246,13 +6246,8 @@ static bool hsw_compute_ips_config(struct intel_crtc_state *crtc_state) if (crtc_state->ips_force_disable) return false; - /* - * FIXME IPS should be fine as long as one plane is - * enabled, but in practice it seems to have problems - * when going from primary only to sprite only and vice - * versa. - */ - if (!(crtc_state->active_planes & BIT(PLANE_PRIMARY))) + /* IPS should be fine as long as at least one plane is enabled. */ + if (!(crtc_state->active_planes & ~BIT(PLANE_CURSOR))) return false; /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ |
