|
 |
7d2c2f2 |
From bb7c6f4efe65f77ba2ed3a09e6d6bc4d021a395d Mon Sep 17 00:00:00 2001
|
|
|
7d2c2f2 |
From: Matt Roper <matthew.d.roper@intel.com>
|
|
|
7d2c2f2 |
Date: Thu, 12 May 2016 07:06:07 -0700
|
|
|
7d2c2f2 |
Subject: [PATCH 13/17] drm/i915/gen9: Use a bitmask to track dirty pipe
|
|
|
7d2c2f2 |
watermarks
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
Slightly easier to work with than an array of bools.
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
|
|
|
7d2c2f2 |
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
|
|
|
7d2c2f2 |
Link: http://patchwork.freedesktop.org/patch/msgid/1463061971-19638-14-git-send-email-matthew.d.roper@intel.com
|
|
|
7d2c2f2 |
---
|
|
|
7d2c2f2 |
drivers/gpu/drm/i915/i915_drv.h | 2 +-
|
|
|
7d2c2f2 |
drivers/gpu/drm/i915/intel_pm.c | 10 +++++-----
|
|
|
7d2c2f2 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
|
|
|
7d2c2f2 |
index b908a41..e7bde72 100644
|
|
|
7d2c2f2 |
--- a/drivers/gpu/drm/i915/i915_drv.h
|
|
|
7d2c2f2 |
+++ b/drivers/gpu/drm/i915/i915_drv.h
|
|
|
7d2c2f2 |
@@ -1591,7 +1591,7 @@ struct skl_ddb_allocation {
|
|
|
7d2c2f2 |
};
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
struct skl_wm_values {
|
|
|
7d2c2f2 |
- bool dirty[I915_MAX_PIPES];
|
|
|
7d2c2f2 |
+ unsigned dirty_pipes;
|
|
|
7d2c2f2 |
struct skl_ddb_allocation ddb;
|
|
|
7d2c2f2 |
uint32_t wm_linetime[I915_MAX_PIPES];
|
|
|
7d2c2f2 |
uint32_t plane[I915_MAX_PIPES][I915_MAX_PLANES][8];
|
|
|
7d2c2f2 |
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
|
|
|
7d2c2f2 |
index c9f050e..cb6b6f4 100644
|
|
|
7d2c2f2 |
--- a/drivers/gpu/drm/i915/intel_pm.c
|
|
|
7d2c2f2 |
+++ b/drivers/gpu/drm/i915/intel_pm.c
|
|
|
7d2c2f2 |
@@ -3516,7 +3516,7 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
|
|
|
7d2c2f2 |
int i, level, max_level = ilk_wm_max_level(dev);
|
|
|
7d2c2f2 |
enum pipe pipe = crtc->pipe;
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
- if (!new->dirty[pipe])
|
|
|
7d2c2f2 |
+ if ((new->dirty_pipes & drm_crtc_mask(&crtc->base)) == 0)
|
|
|
7d2c2f2 |
continue;
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
I915_WRITE(PIPE_WM_LINETIME(pipe), new->wm_linetime[pipe]);
|
|
|
7d2c2f2 |
@@ -3741,7 +3741,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,
|
|
|
7d2c2f2 |
WARN_ON(!wm_changed);
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc);
|
|
|
7d2c2f2 |
- r->dirty[intel_crtc->pipe] = true;
|
|
|
7d2c2f2 |
+ r->dirty_pipes |= drm_crtc_mask(&intel_crtc->base);
|
|
|
7d2c2f2 |
}
|
|
|
7d2c2f2 |
}
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
@@ -3844,7 +3844,7 @@ static void skl_update_wm(struct drm_crtc *crtc)
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
/* Clear all dirty flags */
|
|
|
7d2c2f2 |
- memset(results->dirty, 0, sizeof(bool) * I915_MAX_PIPES);
|
|
|
7d2c2f2 |
+ results->dirty_pipes = 0;
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
skl_clear_wm(results, intel_crtc->pipe);
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
@@ -3852,7 +3852,7 @@ static void skl_update_wm(struct drm_crtc *crtc)
|
|
|
7d2c2f2 |
return;
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
skl_compute_wm_results(dev, pipe_wm, results, intel_crtc);
|
|
|
7d2c2f2 |
- results->dirty[intel_crtc->pipe] = true;
|
|
|
7d2c2f2 |
+ results->dirty_pipes |= drm_crtc_mask(&intel_crtc->base);
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
skl_update_other_pipe_wm(dev, crtc, results);
|
|
|
7d2c2f2 |
skl_write_wm_values(dev_priv, results);
|
|
|
7d2c2f2 |
@@ -4011,7 +4011,7 @@ static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
|
|
|
7d2c2f2 |
if (!intel_crtc->active)
|
|
|
7d2c2f2 |
return;
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
- hw->dirty[pipe] = true;
|
|
|
7d2c2f2 |
+ hw->dirty_pipes |= drm_crtc_mask(crtc);
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
active->linetime = hw->wm_linetime[pipe];
|
|
|
7d2c2f2 |
|
|
|
7d2c2f2 |
--
|
|
|
7d2c2f2 |
2.7.4
|
|
|
7d2c2f2 |
|