diff options
| author | Matt Roper | 2016-05-12 16:06:08 +0200 |
|---|---|---|
| committer | Matt Roper | 2016-05-13 16:34:48 +0200 |
| commit | 55994c2c38a1101f84cdf277b228f830af8a9c1b (patch) | |
| tree | 707c03aac8ae589b8261607b7461fad888d944e3 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/gen9: Use a bitmask to track dirty pipe watermarks (diff) | |
| download | kernel-qcow2-linux-55994c2c38a1101f84cdf277b228f830af8a9c1b.tar.gz kernel-qcow2-linux-55994c2c38a1101f84cdf277b228f830af8a9c1b.tar.xz kernel-qcow2-linux-55994c2c38a1101f84cdf277b228f830af8a9c1b.zip | |
drm/i915/gen9: Propagate watermark calculation failures up the call chain
Once we move watermark calculation to the atomic check phase, we'll want
to start rejecting display configurations that exceed out watermark
limits. At the moment we just assume that there's always a valid set of
watermarks, even though this may not actually be true. Let's prepare by
passing return codes up through the call stack in preparation.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463061971-19638-15-git-send-email-matthew.d.roper@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 325e75f881a2..94804d992cd1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13309,7 +13309,7 @@ static int intel_modeset_checks(struct drm_atomic_state *state) * phase. The code here should be run after the per-crtc and per-plane 'check' * handlers to ensure that all derived state has been updated. */ -static void calc_watermark_data(struct drm_atomic_state *state) +static int calc_watermark_data(struct drm_atomic_state *state) { struct drm_device *dev = state->dev; struct drm_i915_private *dev_priv = to_i915(dev); @@ -13345,7 +13345,9 @@ static void calc_watermark_data(struct drm_atomic_state *state) /* Is there platform-specific watermark information to calculate? */ if (dev_priv->display.compute_global_watermarks) - dev_priv->display.compute_global_watermarks(state); + return dev_priv->display.compute_global_watermarks(state); + + return 0; } /** @@ -13432,9 +13434,7 @@ static int intel_atomic_check(struct drm_device *dev, return ret; intel_fbc_choose_crtc(dev_priv, state); - calc_watermark_data(state); - - return 0; + return calc_watermark_data(state); } static int intel_atomic_prepare_commit(struct drm_device *dev, |