68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
From cd21ce996b94fd149b3487398e5250e9f0cc8811 Mon Sep 17 00:00:00 2001
|
|
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
|
|
Date: Mon, 20 Jun 2016 12:39:24 +0200
|
|
Subject: [PATCH 05/17] drm/i915/gen9: Store plane minimum blocks in CRTC wm
|
|
state (v2)
|
|
|
|
Upstream: since drm-intel-next-2016-05-22
|
|
commit 86a2100a8b96594902bb59b90614377df4f64ce0
|
|
|
|
Author: Matt Roper <matthew.d.roper@intel.com>
|
|
AuthorDate: Thu May 12 07:05:59 2016 -0700
|
|
Commit: Matt Roper <matthew.d.roper@intel.com>
|
|
CommitDate: Fri May 13 07:32:56 2016 -0700
|
|
|
|
drm/i915/gen9: Store plane minimum blocks in CRTC wm state (v2)
|
|
|
|
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>
|
|
Link: http://patchwork.freedesktop.org/patch/msgid/1463061971-19638-6-git-send-email-matthew.d.roper@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 7c00ab6..d246308 100644
|
|
--- a/drivers/gpu/drm/i915/intel_drv.h
|
|
+++ b/drivers/gpu/drm/i915/intel_drv.h
|
|
@@ -389,6 +389,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 b863bfc..00db6e9 100644
|
|
--- a/drivers/gpu/drm/i915/intel_pm.c
|
|
+++ b/drivers/gpu/drm/i915/intel_pm.c
|
|
@@ -3006,8 +3006,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.7.4
|
|
|