diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2016-08-02 02:43:58 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2016-08-02 03:25:42 -0700 |
commit | 73649ff8a12f8856a9da13f8bb09a2281111b556 (patch) | |
tree | d9c366b117d7ddedf3b3db8c8985bad61a614398 /0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch | |
parent | 136ce0111f0c5c009ce9dd4c3069cb2056acfee7 (diff) | |
download | kernel-73649ff8a12f8856a9da13f8bb09a2281111b556.tar.gz kernel-73649ff8a12f8856a9da13f8bb09a2281111b556.tar.xz kernel-73649ff8a12f8856a9da13f8bb09a2281111b556.zip |
Linux v4.7-10753-g731c7d3
Diffstat (limited to '0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch')
-rw-r--r-- | 0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch b/0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch deleted file mode 100644 index 4fe8d8a98..000000000 --- a/0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2ad01780bf59b3a785975bf48a066645e5b6f7f5 Mon Sep 17 00:00:00 2001 -From: Matt Roper <matthew.d.roper@intel.com> -Date: Thu, 12 May 2016 07:06:10 -0700 -Subject: [PATCH 16/17] drm/i915/gen9: Reject display updates that exceed wm - limitations (v2) - -If we can't find any valid level 0 watermark values for the requested -atomic transaction, reject the configuration before we try to start -programming the hardware. - -v2: - - Add extra debugging output when we reject level 0 watermarks so that - we can more easily debug how/why they were rejected. - -Cc: Lyude Paul <cpaul@redhat.com> -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-17-git-send-email-matthew.d.roper@intel.com ---- - drivers/gpu/drm/i915/intel_pm.c | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c -index b072417..f764d28 100644 ---- a/drivers/gpu/drm/i915/intel_pm.c -+++ b/drivers/gpu/drm/i915/intel_pm.c -@@ -3306,7 +3306,22 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, - - if (res_blocks >= ddb_allocation || res_lines > 31) { - *enabled = false; -- return 0; -+ -+ /* -+ * If there are no valid level 0 watermarks, then we can't -+ * support this display configuration. -+ */ -+ if (level) { -+ return 0; -+ } else { -+ DRM_DEBUG_KMS("Requested display configuration exceeds system watermark limitations\n"); -+ DRM_DEBUG_KMS("Plane %d.%d: blocks required = %u/%u, lines required = %u/31\n", -+ to_intel_crtc(cstate->base.crtc)->pipe, -+ skl_wm_plane_id(to_intel_plane(pstate->plane)), -+ res_blocks, ddb_allocation, res_lines); -+ -+ return -EINVAL; -+ } - } - - *out_blocks = res_blocks; --- -2.7.4 - |