public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Matt Roper <matthew.d.roper@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v4 05/17] drm/i915/gen9: Store plane minimum blocks in CRTC wm state (v2)
Date: Mon,  9 May 2016 18:21:36 -0700	[thread overview]
Message-ID: <1462843308-27639-6-git-send-email-matthew.d.roper@intel.com> (raw)
In-Reply-To: <1462843308-27639-1-git-send-email-matthew.d.roper@intel.com>

This will eventually allow us to re-use old values without
re-calculating them for unchanged planes (which also helps us avoid
re-grabbing extra plane states).

v2:
 -  Drop unnecessary memset's; they were meant for a later patch (which
    got reworked anyway to not need them, but were mis-rebased into this
    one.  (Maarten)

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h | 4 ++++
 drivers/gpu/drm/i915/intel_pm.c  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 56d6ee1..1b82de5 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -431,6 +431,10 @@ struct intel_crtc_wm_state {
 			/* cached plane data rate */
 			unsigned plane_data_rate[I915_MAX_PLANES];
 			unsigned plane_y_data_rate[I915_MAX_PLANES];
+
+			/* minimum block allocation */
+			uint16_t minimum_blocks[I915_MAX_PLANES];
+			uint16_t minimum_y_blocks[I915_MAX_PLANES];
 		} skl;
 	};
 
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 1537a9c..376e25e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3067,8 +3067,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
 	enum pipe pipe = intel_crtc->pipe;
 	struct skl_ddb_entry *alloc = &ddb->pipe[pipe];
 	uint16_t alloc_size, start, cursor_blocks;
-	uint16_t minimum[I915_MAX_PLANES];
-	uint16_t y_minimum[I915_MAX_PLANES];
+	uint16_t *minimum = cstate->wm.skl.minimum_blocks;
+	uint16_t *y_minimum = cstate->wm.skl.minimum_y_blocks;
 	unsigned int total_data_rate;
 
 	skl_ddb_get_pipe_allocation_limits(dev, cstate, config, alloc);
-- 
2.1.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2016-05-10  1:23 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-10  1:21 [PATCH v4 00/17] Pre-calculate SKL-style atomicwatermarks Matt Roper
2016-05-10  1:21 ` [PATCH v4 01/17] drm/i915: Reorganize WM structs/unions in CRTC state Matt Roper
2016-05-10  1:21 ` [PATCH v4 02/17] drm/i915: Rename s/skl_compute_pipe_wm/skl_build_pipe_wm/ Matt Roper
2016-05-10  1:21 ` [PATCH v4 03/17] drm/i915/gen9: Cache plane data rates in CRTC state Matt Roper
2016-05-10  1:21 ` [PATCH v4 04/17] drm/i915/gen9: Allow calculation of data rate for in-flight state (v2) Matt Roper
2016-05-10  1:21 ` Matt Roper [this message]
2016-05-10  1:21 ` [PATCH v4 06/17] drm/i915: Track whether an atomic transaction changes the active CRTC's Matt Roper
2016-05-10  1:21 ` [PATCH v4 07/17] drm/i915/gen9: Allow skl_allocate_pipe_ddb() to operate on in-flight state (v3) Matt Roper
2016-05-10  1:21 ` [PATCH v4 08/17] drm/i915: Add distrust_bios_wm flag to dev_priv Matt Roper
2016-05-11 10:38   ` Maarten Lankhorst
2016-05-11 15:48     ` Matt Roper
2016-05-11 16:02     ` [PATCH v4 08/17] drm/i915: Add distrust_bios_wm flag to dev_priv (v2) Matt Roper
2016-05-12 10:09       ` Maarten Lankhorst
2016-05-10  1:21 ` [PATCH v4 09/17] drm/i915/gen9: Compute DDB allocation at atomic check time (v4) Matt Roper
2016-05-10  1:21 ` [PATCH v4 10/17] drm/i915/gen9: Drop re-allocation of DDB at atomic commit (v2) Matt Roper
2016-05-10  1:21 ` [PATCH v4 11/17] drm/i915/gen9: Calculate plane WM's from state Matt Roper
2016-05-10  1:21 ` [PATCH v4 12/17] drm/i915/gen9: Allow watermark calculation on in-flight atomic state (v3) Matt Roper
2016-05-10  1:21 ` [PATCH v4 13/17] drm/i915/gen9: Use a bitmask to track dirty pipe watermarks Matt Roper
2016-05-10  1:21 ` [PATCH v4 14/17] drm/i915/gen9: Propagate watermark calculation failures up the call chain Matt Roper
2016-05-10  1:21 ` [PATCH v4 15/17] drm/i915/gen9: Calculate watermarks during atomic 'check' Matt Roper
2016-05-10  1:21 ` [PATCH v4 16/17] drm/i915/gen9: Reject display updates that exceed wm limitations (v2) Matt Roper
2016-05-10  1:21 ` [PATCH v4 17/17] drm/i915: Remove wm_config from dev_priv/intel_atomic_state Matt Roper
2016-05-11 16:30 ` ✗ Ro.CI.BAT: failure for Pre-calculate SKL-style atomicwatermarks (rev2) Patchwork

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=1462843308-27639-6-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