hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/i915/bdw: Add Broadwell display FIFO limits 

Broadwell has bigger display FIFOs than Haswell. Otherwise the
two are very similar.

v2: Fix FBC WM_LP shift for BDW

v3: Rebase on top of the big Haswell wm rework.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v2)
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2013-11-02 21:07:46 -07:00 committed by Daniel Vetter
parent 77d8d00944
commit 416f4727ab
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_reg.h
View File

@ -3379,6 +3379,7 @@
#define WM1_LP_LATENCY_MASK (0x7f<<24) #define WM1_LP_LATENCY_MASK (0x7f<<24)
#define WM1_LP_FBC_MASK (0xf<<20) #define WM1_LP_FBC_MASK (0xf<<20)
#define WM1_LP_FBC_SHIFT 20 #define WM1_LP_FBC_SHIFT 20
#define WM1_LP_FBC_SHIFT_BDW 19
#define WM1_LP_SR_MASK (0x7ff<<8) #define WM1_LP_SR_MASK (0x7ff<<8)
#define WM1_LP_SR_SHIFT 8 #define WM1_LP_SR_SHIFT 8
#define WM1_LP_CURSOR_MASK (0xff) #define WM1_LP_CURSOR_MASK (0xff)

33
drivers/gpu/drm/i915/intel_pm.c
View File

@ -2291,7 +2291,9 @@ static uint32_t ilk_compute_fbc_wm(const struct hsw_pipe_wm_parameters *params,
static unsigned int ilk_display_fifo_size(const struct drm_device *dev) static unsigned int ilk_display_fifo_size(const struct drm_device *dev)
{ {
if (INTEL_INFO(dev)->gen >= 7) if (INTEL_INFO(dev)->gen >= 8)
return 3072;
else if (INTEL_INFO(dev)->gen >= 7)
return 768; return 768;
else else
return 512; return 512;
@ -2336,7 +2338,9 @@ static unsigned int ilk_plane_wm_max(const struct drm_device *dev,
} }
/* clamp to max that the registers can hold */ /* clamp to max that the registers can hold */
if (INTEL_INFO(dev)->gen >= 7) if (INTEL_INFO(dev)->gen >= 8)
max = level == 0 ? 255 : 2047;
else if (INTEL_INFO(dev)->gen >= 7)
/* IVB/HSW primary/sprite plane watermarks */ /* IVB/HSW primary/sprite plane watermarks */
max = level == 0 ? 127 : 1023; max = level == 0 ? 127 : 1023;
else if (!is_sprite) else if (!is_sprite)
@ -2366,10 +2370,13 @@ static unsigned int ilk_cursor_wm_max(const struct drm_device *dev,
} }
/* Calculate the maximum FBC watermark */ /* Calculate the maximum FBC watermark */
static unsigned int ilk_fbc_wm_max(void) static unsigned int ilk_fbc_wm_max(struct drm_device *dev)
{ {
/* max that registers can hold */ /* max that registers can hold */
return 15; if (INTEL_INFO(dev)->gen >= 8)
return 31;
else
return 15;
} }
static void ilk_compute_wm_maximums(struct drm_device *dev, static void ilk_compute_wm_maximums(struct drm_device *dev,
@ -2381,7 +2388,7 @@ static void ilk_compute_wm_maximums(struct drm_device *dev,
max->pri = ilk_plane_wm_max(dev, level, config, ddb_partitioning, false); max->pri = ilk_plane_wm_max(dev, level, config, ddb_partitioning, false);
max->spr = ilk_plane_wm_max(dev, level, config, ddb_partitioning, true); max->spr = ilk_plane_wm_max(dev, level, config, ddb_partitioning, true);
max->cur = ilk_cursor_wm_max(dev, level, config); max->cur = ilk_cursor_wm_max(dev, level, config);
max->fbc = ilk_fbc_wm_max(); max->fbc = ilk_fbc_wm_max(dev);
} }
static bool ilk_validate_wm_level(int level, static bool ilk_validate_wm_level(int level,
@ -2722,10 +2729,18 @@ static void hsw_compute_wm_results(struct drm_device *dev,
if (!r->enable) if (!r->enable)
break; break;
results->wm_lp[wm_lp - 1] = HSW_WM_LP_VAL(level * 2, results->wm_lp[wm_lp - 1] = WM3_LP_EN |
r->fbc_val, ((level * 2) << WM1_LP_LATENCY_SHIFT) |
r->pri_val, (r->pri_val << WM1_LP_SR_SHIFT) |
r->cur_val); r->cur_val;
if (INTEL_INFO(dev)->gen >= 8)
results->wm_lp[wm_lp - 1] |=
r->fbc_val << WM1_LP_FBC_SHIFT_BDW;
else
results->wm_lp[wm_lp - 1] |=
r->fbc_val << WM1_LP_FBC_SHIFT;
results->wm_lp_spr[wm_lp - 1] = r->spr_val; results->wm_lp_spr[wm_lp - 1] = r->spr_val;
} }