From: Matt Roper <matthew.d.roper@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [CI 13/17] drm/i915/gen9: Use a bitmask to track dirty pipe watermarks
Date: Thu, 12 May 2016 07:06:07 -0700 [thread overview]
Message-ID: <1463061971-19638-14-git-send-email-matthew.d.roper@intel.com> (raw)
In-Reply-To: <1463061971-19638-1-git-send-email-matthew.d.roper@intel.com>
Slightly easier to work with than an array of bools.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fdbaf18..5f1f018 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1598,7 +1598,7 @@ struct skl_ddb_allocation {
};
struct skl_wm_values {
- bool dirty[I915_MAX_PIPES];
+ unsigned dirty_pipes;
struct skl_ddb_allocation ddb;
uint32_t wm_linetime[I915_MAX_PIPES];
uint32_t plane[I915_MAX_PIPES][I915_MAX_PLANES][8];
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 4d52402..14c2c3e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3516,7 +3516,7 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
int i, level, max_level = ilk_wm_max_level(dev);
enum pipe pipe = crtc->pipe;
- if (!new->dirty[pipe])
+ if ((new->dirty_pipes & drm_crtc_mask(&crtc->base)) == 0)
continue;
I915_WRITE(PIPE_WM_LINETIME(pipe), new->wm_linetime[pipe]);
@@ -3741,7 +3741,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,
WARN_ON(!wm_changed);
skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc);
- r->dirty[intel_crtc->pipe] = true;
+ r->dirty_pipes |= drm_crtc_mask(&intel_crtc->base);
}
}
@@ -3844,7 +3844,7 @@ static void skl_update_wm(struct drm_crtc *crtc)
/* Clear all dirty flags */
- memset(results->dirty, 0, sizeof(bool) * I915_MAX_PIPES);
+ results->dirty_pipes = 0;
skl_clear_wm(results, intel_crtc->pipe);
@@ -3852,7 +3852,7 @@ static void skl_update_wm(struct drm_crtc *crtc)
return;
skl_compute_wm_results(dev, pipe_wm, results, intel_crtc);
- results->dirty[intel_crtc->pipe] = true;
+ results->dirty_pipes |= drm_crtc_mask(&intel_crtc->base);
skl_update_other_pipe_wm(dev, crtc, results);
skl_write_wm_values(dev_priv, results);
@@ -4011,7 +4011,7 @@ static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
if (!intel_crtc->active)
return;
- hw->dirty[pipe] = true;
+ hw->dirty_pipes |= drm_crtc_mask(crtc);
active->linetime = hw->wm_linetime[pipe];
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-05-12 14:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 14:05 [CI 00/17] Pre-calculate SKL-style atomic watermarks (final CI run) Matt Roper
2016-05-12 14:05 ` [CI 01/17] drm/i915: Reorganize WM structs/unions in CRTC state Matt Roper
2016-05-12 14:05 ` [CI 02/17] drm/i915: Rename s/skl_compute_pipe_wm/skl_build_pipe_wm/ Matt Roper
2016-05-12 14:05 ` [CI 03/17] drm/i915/gen9: Cache plane data rates in CRTC state Matt Roper
2016-05-12 14:05 ` [CI 04/17] drm/i915/gen9: Allow calculation of data rate for in-flight state (v2) Matt Roper
2016-05-12 14:05 ` [CI 05/17] drm/i915/gen9: Store plane minimum blocks in CRTC wm " Matt Roper
2016-05-12 14:06 ` [CI 06/17] drm/i915: Track whether an atomic transaction changes the active CRTC's Matt Roper
2016-05-12 14:06 ` [CI 07/17] drm/i915/gen9: Allow skl_allocate_pipe_ddb() to operate on in-flight state (v3) Matt Roper
2016-05-12 14:06 ` [CI 08/17] drm/i915: Add distrust_bios_wm flag to dev_priv (v2) Matt Roper
2016-05-12 14:06 ` [CI 09/17] drm/i915/gen9: Compute DDB allocation at atomic check time (v4) Matt Roper
2016-05-12 14:06 ` [CI 10/17] drm/i915/gen9: Drop re-allocation of DDB at atomic commit (v2) Matt Roper
2016-05-12 14:06 ` [CI 11/17] drm/i915/gen9: Calculate plane WM's from state Matt Roper
2016-05-12 14:06 ` [CI 12/17] drm/i915/gen9: Allow watermark calculation on in-flight atomic state (v3) Matt Roper
2016-05-12 14:06 ` Matt Roper [this message]
2016-05-12 14:06 ` [CI 14/17] drm/i915/gen9: Propagate watermark calculation failures up the call chain Matt Roper
2016-05-12 14:06 ` [CI 15/17] drm/i915/gen9: Calculate watermarks during atomic 'check' Matt Roper
2016-05-12 22:11 ` [CI 15/17] drm/i915/gen9: Calculate watermarks during atomic 'check' (v2) Matt Roper
2016-05-12 14:06 ` [CI 16/17] drm/i915/gen9: Reject display updates that exceed wm limitations (v2) Matt Roper
2016-05-12 14:06 ` [CI 17/17] drm/i915: Remove wm_config from dev_priv/intel_atomic_state Matt Roper
2016-05-12 15:57 ` ✗ Ro.CI.BAT: failure for Pre-calculate SKL-style atomic watermarks (final CI run) Patchwork
2016-05-12 22:52 ` ✓ Ro.CI.BAT: success for Pre-calculate SKL-style atomic watermarks (final CI run) (rev2) Patchwork
2016-05-13 14:44 ` Matt Roper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463061971-19638-14-git-send-email-matthew.d.roper@intel.com \
--to=matthew.d.roper@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox