Skip to content

L
linux
Commit fa143215 authored by Zhao Yakui's avatar Zhao Yakui Committed by Eric Anholt
Browse files
Options

drm/i915: Fix watermark calculation in self-refresh mode 

For self-refresh mode WM calculation's "line time" should use
mode's htotal instead of hdisplay. "surface width" is the hdisplay
for display plane and 64 for cursor plane.
Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 36e83a18
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 18 deletions
drivers/gpu/drm/i915/i915_drv.h
View file @ fa143215
...@@ -176,7 +176,8 @@ struct drm_i915_display_funcs { ...@@ -176,7 +176,8 @@ struct drm_i915_display_funcs {
int (*get_display_clock_speed)(struct drm_device *dev); int (*get_display_clock_speed)(struct drm_device *dev);
int (*get_fifo_size)(struct drm_device *dev, int plane); int (*get_fifo_size)(struct drm_device *dev, int plane);
void (*update_wm)(struct drm_device *dev, int planea_clock, void (*update_wm)(struct drm_device *dev, int planea_clock,
int planeb_clock, int sr_hdisplay, int pixel_size); int planeb_clock, int sr_hdisplay, int sr_htotal,
int pixel_size);
/* clock updates for mode set */ /* clock updates for mode set */
/* cursor updates */ /* cursor updates */
/* render clock increase/decrease */ /* render clock increase/decrease */
......
drivers/gpu/drm/i915/intel_display.c
View file @ fa143215
...@@ -2809,7 +2809,8 @@ static int i830_get_fifo_size(struct drm_device *dev, int plane) ...@@ -2809,7 +2809,8 @@ static int i830_get_fifo_size(struct drm_device *dev, int plane)
} }
static void pineview_update_wm(struct drm_device *dev, int planea_clock, static void pineview_update_wm(struct drm_device *dev, int planea_clock,
int planeb_clock, int sr_hdisplay, int pixel_size) int planeb_clock, int sr_hdisplay, int unused,
int pixel_size)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
u32 reg; u32 reg;
...@@ -2874,7 +2875,8 @@ static void pineview_update_wm(struct drm_device *dev, int planea_clock, ...@@ -2874,7 +2875,8 @@ static void pineview_update_wm(struct drm_device *dev, int planea_clock,
} }
static void g4x_update_wm(struct drm_device *dev, int planea_clock, static void g4x_update_wm(struct drm_device *dev, int planea_clock,
int planeb_clock, int sr_hdisplay, int pixel_size) int planeb_clock, int sr_hdisplay, int sr_htotal,
int pixel_size)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
int total_size, cacheline_size; int total_size, cacheline_size;
...@@ -2917,11 +2919,11 @@ static void g4x_update_wm(struct drm_device *dev, int planea_clock, ...@@ -2917,11 +2919,11 @@ static void g4x_update_wm(struct drm_device *dev, int planea_clock,
static const int sr_latency_ns = 12000; static const int sr_latency_ns = 12000;
sr_clock = planea_clock ? planea_clock : planeb_clock; sr_clock = planea_clock ? planea_clock : planeb_clock;
line_time_us = ((sr_hdisplay * 1000) / sr_clock); line_time_us = ((sr_htotal * 1000) / sr_clock);
/* Use ns/us then divide to preserve precision */ /* Use ns/us then divide to preserve precision */
sr_entries = (((sr_latency_ns / line_time_us) + 1) * sr_entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
pixel_size * sr_hdisplay) / 1000; pixel_size * sr_hdisplay;
sr_entries = roundup(sr_entries / cacheline_size, 1); sr_entries = roundup(sr_entries / cacheline_size, 1);
DRM_DEBUG("self-refresh entries: %d\n", sr_entries); DRM_DEBUG("self-refresh entries: %d\n", sr_entries);
I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN); I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN);
...@@ -2948,7 +2950,8 @@ static void g4x_update_wm(struct drm_device *dev, int planea_clock, ...@@ -2948,7 +2950,8 @@ static void g4x_update_wm(struct drm_device *dev, int planea_clock,
} }
static void i965_update_wm(struct drm_device *dev, int planea_clock, static void i965_update_wm(struct drm_device *dev, int planea_clock,
int planeb_clock, int sr_hdisplay, int pixel_size) int planeb_clock, int sr_hdisplay, int sr_htotal,
int pixel_size)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
unsigned long line_time_us; unsigned long line_time_us;
...@@ -2960,11 +2963,11 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock, ...@@ -2960,11 +2963,11 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock,
static const int sr_latency_ns = 12000; static const int sr_latency_ns = 12000;
sr_clock = planea_clock ? planea_clock : planeb_clock; sr_clock = planea_clock ? planea_clock : planeb_clock;
line_time_us = ((sr_hdisplay * 1000) / sr_clock); line_time_us = ((sr_htotal * 1000) / sr_clock);
/* Use ns/us then divide to preserve precision */ /* Use ns/us then divide to preserve precision */
sr_entries = (((sr_latency_ns / line_time_us) + 1) * sr_entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
pixel_size * sr_hdisplay) / 1000; pixel_size * sr_hdisplay;
sr_entries = roundup(sr_entries / I915_FIFO_LINE_SIZE, 1); sr_entries = roundup(sr_entries / I915_FIFO_LINE_SIZE, 1);
DRM_DEBUG("self-refresh entries: %d\n", sr_entries); DRM_DEBUG("self-refresh entries: %d\n", sr_entries);
srwm = I945_FIFO_SIZE - sr_entries; srwm = I945_FIFO_SIZE - sr_entries;
...@@ -2990,7 +2993,8 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock, ...@@ -2990,7 +2993,8 @@ static void i965_update_wm(struct drm_device *dev, int planea_clock,
} }
static void i9xx_update_wm(struct drm_device *dev, int planea_clock, static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
int planeb_clock, int sr_hdisplay, int pixel_size) int planeb_clock, int sr_hdisplay, int sr_htotal,
int pixel_size)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
uint32_t fwater_lo; uint32_t fwater_lo;
...@@ -3035,11 +3039,11 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock, ...@@ -3035,11 +3039,11 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
static const int sr_latency_ns = 6000; static const int sr_latency_ns = 6000;
sr_clock = planea_clock ? planea_clock : planeb_clock; sr_clock = planea_clock ? planea_clock : planeb_clock;
line_time_us = ((sr_hdisplay * 1000) / sr_clock); line_time_us = ((sr_htotal * 1000) / sr_clock);
/* Use ns/us then divide to preserve precision */ /* Use ns/us then divide to preserve precision */
sr_entries = (((sr_latency_ns / line_time_us) + 1) * sr_entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
pixel_size * sr_hdisplay) / 1000; pixel_size * sr_hdisplay;
sr_entries = roundup(sr_entries / cacheline_size, 1); sr_entries = roundup(sr_entries / cacheline_size, 1);
DRM_DEBUG_KMS("self-refresh entries: %d\n", sr_entries); DRM_DEBUG_KMS("self-refresh entries: %d\n", sr_entries);
srwm = total_size - sr_entries; srwm = total_size - sr_entries;
...@@ -3078,7 +3082,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock, ...@@ -3078,7 +3082,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
} }
static void i830_update_wm(struct drm_device *dev, int planea_clock, int unused, static void i830_update_wm(struct drm_device *dev, int planea_clock, int unused,
int unused2, int pixel_size) int unused2, int unused3, int pixel_size)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
uint32_t fwater_lo = I915_READ(FW_BLC) & ~0xfff; uint32_t fwater_lo = I915_READ(FW_BLC) & ~0xfff;
...@@ -3098,7 +3102,8 @@ static void i830_update_wm(struct drm_device *dev, int planea_clock, int unused, ...@@ -3098,7 +3102,8 @@ static void i830_update_wm(struct drm_device *dev, int planea_clock, int unused,
#define ILK_LP0_PLANE_LATENCY 700 #define ILK_LP0_PLANE_LATENCY 700
static void ironlake_update_wm(struct drm_device *dev, int planea_clock, static void ironlake_update_wm(struct drm_device *dev, int planea_clock,
int planeb_clock, int sr_hdisplay, int pixel_size) int planeb_clock, int sr_hdisplay, int sr_htotal,
int pixel_size)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
int planea_wm, planeb_wm, cursora_wm, cursorb_wm; int planea_wm, planeb_wm, cursora_wm, cursorb_wm;
...@@ -3160,7 +3165,7 @@ static void ironlake_update_wm(struct drm_device *dev, int planea_clock, ...@@ -3160,7 +3165,7 @@ static void ironlake_update_wm(struct drm_device *dev, int planea_clock,
int ilk_sr_latency = I915_READ(MLTR_ILK) & ILK_SRLT_MASK; int ilk_sr_latency = I915_READ(MLTR_ILK) & ILK_SRLT_MASK;
sr_clock = planea_clock ? planea_clock : planeb_clock; sr_clock = planea_clock ? planea_clock : planeb_clock;
line_time_us = ((sr_hdisplay * 1000) / sr_clock); line_time_us = ((sr_htotal * 1000) / sr_clock);
/* Use ns/us then divide to preserve precision */ /* Use ns/us then divide to preserve precision */
line_count = ((ilk_sr_latency * 500) / line_time_us + 1000) line_count = ((ilk_sr_latency * 500) / line_time_us + 1000)
...@@ -3220,6 +3225,7 @@ static void ironlake_update_wm(struct drm_device *dev, int planea_clock, ...@@ -3220,6 +3225,7 @@ static void ironlake_update_wm(struct drm_device *dev, int planea_clock,
* bytes per pixel * bytes per pixel
* where * where
* line time = htotal / dotclock * line time = htotal / dotclock
* surface width = hdisplay for normal plane and 64 for cursor
* and latency is assumed to be high, as above. * and latency is assumed to be high, as above.
* *
* The final value programmed to the register should always be rounded up, * The final value programmed to the register should always be rounded up,
...@@ -3236,6 +3242,7 @@ static void intel_update_watermarks(struct drm_device *dev) ...@@ -3236,6 +3242,7 @@ static void intel_update_watermarks(struct drm_device *dev)
int sr_hdisplay = 0; int sr_hdisplay = 0;
unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0; unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0;
int enabled = 0, pixel_size = 0; int enabled = 0, pixel_size = 0;
int sr_htotal = 0;
if (!dev_priv->display.update_wm) if (!dev_priv->display.update_wm)
return; return;
...@@ -3256,6 +3263,7 @@ static void intel_update_watermarks(struct drm_device *dev) ...@@ -3256,6 +3263,7 @@ static void intel_update_watermarks(struct drm_device *dev)
} }
sr_hdisplay = crtc->mode.hdisplay; sr_hdisplay = crtc->mode.hdisplay;
sr_clock = crtc->mode.clock; sr_clock = crtc->mode.clock;
sr_htotal = crtc->mode.htotal;
if (crtc->fb) if (crtc->fb)
pixel_size = crtc->fb->bits_per_pixel / 8; pixel_size = crtc->fb->bits_per_pixel / 8;
else else
...@@ -3267,7 +3275,7 @@ static void intel_update_watermarks(struct drm_device *dev) ...@@ -3267,7 +3275,7 @@ static void intel_update_watermarks(struct drm_device *dev)
return; return;
dev_priv->display.update_wm(dev, planea_clock, planeb_clock, dev_priv->display.update_wm(dev, planea_clock, planeb_clock,
sr_hdisplay, pixel_size); sr_hdisplay, sr_htotal, pixel_size);
} }
static int intel_crtc_mode_set(struct drm_crtc *crtc, static int intel_crtc_mode_set(struct drm_crtc *crtc,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7