Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.6.3-300.vanilla.knurd.1.fc24

1 files changed, 60 insertions, 0 deletions

diff --git a/0002-drm-i915-Rename-s-skl_compute_pipe_wm-skl_build_pipe.patch b/0002-drm-i915-Rename-s-skl_compute_pipe_wm-skl_build_pipe.patch
new file mode 100644
index 000000000..f9eecb97a
--- /dev/null
+++ b/0002-drm-i915-Rename-s-skl_compute_pipe_wm-skl_build_pipe.patch
@@ -0,0 +1,60 @@
+From 4d428f0fd6aaaa75382885d897900f619b2dad35 Mon Sep 17 00:00:00 2001
+From: Fedora Kernel Team <kernel-team@fedoraproject.org>
+Date: Mon, 20 Jun 2016 11:12:56 +0200
+Subject: [PATCH 02/17] drm/i915: Rename
+ s/skl_compute_pipe_wm/skl_build_pipe_wm/
+
+Upstream: since drm-intel-next-2016-05-22
+commit e7649b54777ba6491204acbe1f1a34fce78637d5
+
+Author:     Matt Roper <matthew.d.roper@intel.com>
+AuthorDate: Thu May 12 07:05:56 2016 -0700
+Commit:     Matt Roper <matthew.d.roper@intel.com>
+CommitDate: Fri May 13 07:32:27 2016 -0700
+
+    drm/i915: Rename s/skl_compute_pipe_wm/skl_build_pipe_wm/
+
+    When we added atomic watermarks, we added a new display vfunc
+    'compute_pipe_wm' that is used to compute any pipe-specific watermark
+    information that we can at atomic check time.  This was a somewhat poor
+    naming choice since we already had a 'skl_compute_pipe_wm' function that
+    doesn't quite fit this model --- the existing SKL function is something
+    that gets used at atomic commit time, after the DDB allocation has been
+    determined.  Let's rename the existing SKL function to avoid confusion.
+
+    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-3-git-send-email-matthew.d.roper@intel.com
+---
+ drivers/gpu/drm/i915/intel_pm.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
+index 0da1d60..8f081b2 100644
+--- a/drivers/gpu/drm/i915/intel_pm.c
++++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -3266,9 +3266,9 @@ static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
+ 	}
+ }
+ 
+-static void skl_compute_pipe_wm(struct intel_crtc_state *cstate,
+-				struct skl_ddb_allocation *ddb,
+-				struct skl_pipe_wm *pipe_wm)
++static void skl_build_pipe_wm(struct intel_crtc_state *cstate,
++			      struct skl_ddb_allocation *ddb,
++			      struct skl_pipe_wm *pipe_wm)
+ {
+ 	struct drm_device *dev = cstate->base.crtc->dev;
+ 	const struct drm_i915_private *dev_priv = dev->dev_private;
+@@ -3535,7 +3535,7 @@ static bool skl_update_pipe_wm(struct drm_crtc *crtc,
+ 	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
+ 
+ 	skl_allocate_pipe_ddb(cstate, ddb);
+-	skl_compute_pipe_wm(cstate, ddb, pipe_wm);
++	skl_build_pipe_wm(cstate, ddb, pipe_wm);
+ 
+ 	if (!memcmp(&intel_crtc->wm.active.skl, pipe_wm, sizeof(*pipe_wm)))
+ 		return false;
+-- 
+2.7.4
+