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