51 lines
2.1 KiB
Diff
51 lines
2.1 KiB
Diff
|
From 95a9343e4b4e61d4c16da8bffc6a6e392d666dea Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matt Roper <matthew.d.roper@intel.com>
|
||
|
|
Date: Thu, 12 May 2016 07:05:56 -0700
|
||
|
|
Subject: [PATCH 02/17] 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 4353fec..e15cb2a 100644
|
||
|
|
--- a/drivers/gpu/drm/i915/intel_pm.c
|
||
|
|
+++ b/drivers/gpu/drm/i915/intel_pm.c
|
||
|
|
@@ -3327,9 +3327,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;
|
||
|
|
@@ -3596,7 +3596,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
|
||
|
|
|