drm/i915/wm: legacy watermark code shuffling
Subsystems (3)
cover drm/i915/wm: legacy watermark code shuffling
In short, move all watermark code out of intel_pm.c, and sprinkle a bunch of cleanups around it.
Jani Nikula (10):
drm/i915: move memory frequency detection to intel_dram.c drm/i915/wm: move remaining watermark code out of intel_pm.c drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch] drm/i915/wm: add .get_hw_state to watermark funcs drm/i915/wm: move watermark sanitization to intel_wm.[ch] drm/i915/wm: s/intel_wm_num_levels/g4x_wm_num_levels/ drm/i915/wm: add *_wm_num_levels() functions
drm/i915/wm: convert from ilk_wm_max_level() to
{intel,skl}_wm_num_levels() drm/i915/wm: move watermark debugfs to intel_wm.c drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h
drivers/gpu/drm/i915/Makefile | 2 +
drivers/gpu/drm/i915/display/i9xx_wm.c | 3971 ++++++++++++++++
drivers/gpu/drm/i915/display/i9xx_wm.h | 20 +
drivers/gpu/drm/i915/display/intel_display.c | 223 +-
drivers/gpu/drm/i915/display/intel_display.h | 2 +
.../gpu/drm/i915/display/intel_display_core.h | 3 +-
.../drm/i915/display/intel_display_debugfs.c | 238 +-
.../drm/i915/display/intel_display_types.h | 13 +-
.../drm/i915/display/intel_modeset_setup.c | 15 +-
drivers/gpu/drm/i915/display/intel_wm.c | 541 +++
drivers/gpu/drm/i915/display/intel_wm.h | 39 +
.../intel_wm_types.h} | 6 +-
drivers/gpu/drm/i915/display/skl_watermark.c | 90 +-
drivers/gpu/drm/i915/display/skl_watermark.h | 6 +-
drivers/gpu/drm/i915/gt/intel_rps.c | 29 -
drivers/gpu/drm/i915/intel_pm.c | 4180 +----------------
drivers/gpu/drm/i915/intel_pm.h | 14 -
drivers/gpu/drm/i915/soc/intel_dram.c | 158 +-
18 files changed, 4860 insertions(+), 4690 deletions(-)
create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.c
create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.h
create mode 100644 drivers/gpu/drm/i915/display/intel_wm.c
create mode 100644 drivers/gpu/drm/i915/display/intel_wm.h
rename drivers/gpu/drm/i915/{intel_pm_types.h => display/intel_wm_types.h} (93%)Signature · 1 line
2.34.1
PATCH 1/10 drm/i915: move memory frequency detection to intel_dram.c
The memory frequency detection is a bit spread out here and there. Consolidate to intel_dram.c.
--- drivers/gpu/drm/i915/gt/intel_rps.c | 29 ----- drivers/gpu/drm/i915/intel_pm.c | 101 ---------------- drivers/gpu/drm/i915/soc/intel_dram.c | 158 +++++++++++++++++++++++++- 3 files changed, 157 insertions(+), 131 deletions(-)
drivers/gpu/drm/i915/gt/intel_rps.c +0 -29
@@ -1677,7 +1677,6 @@ static void vlv_init_gpll_ref_freq(struct intel_rps *rps)static void vlv_rps_init (struct intel_rps *rps) {struct drm_i915_private *i915 =rps_to_i915 (rps); -u32 val; vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT) |
@@ -1686,21 +1685,6 @@ static void vlv_rps_init(struct intel_rps *rps)vlv_init_gpll_ref_freq (rps); - val =vlv_punit_read (i915,PUNIT_REG_GPU_FREQ_STS ); -switch ((val >>6 ) &3 ) { -case 0 : -case 1 : - i915->mem_freq =800 ; -break ; -case 2 : - i915->mem_freq =1066 ; -break ; -case 3 : - i915->mem_freq =1333 ; -break ; - } -drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); - rps->max_freq =vlv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; drm_dbg(&i915->drm, "max GPU freq: %d MHz (%u)\n",
@@ -1727,7 +1711,6 @@ static void vlv_rps_init(struct intel_rps *rps)static void chv_rps_init (struct intel_rps *rps) {struct drm_i915_private *i915 =rps_to_i915 (rps); -u32 val; vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT) |
@@ -1736,18 +1719,6 @@ static void chv_rps_init(struct intel_rps *rps)vlv_init_gpll_ref_freq (rps); - val =vlv_cck_read (i915,CCK_FUSE_REG ); - -switch ((val >>2 ) &0x7 ) { -case 3 : - i915->mem_freq =2000 ; -break ; -default : - i915->mem_freq =1600 ; -break ; - } -drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); - rps->max_freq =chv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; drm_dbg(&i915->drm, "max GPU freq: %d MHz (%u)\n",
drivers/gpu/drm/i915/intel_pm.c +0 -101
113 lines not on this page · raw message
drivers/gpu/drm/i915/soc/intel_dram.c +157 -1
177 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 2/10 drm/i915/wm: move remaining watermark code out of intel_pm.c
In reply to Jani NikulaAdd new files intel_wm.[ch] and i9xx_wm.[ch] under display/ to hold generic and pre-SKL watermark code, respectively. SKL+ watermark code has already been split out to skl_watermark.[ch].
Use the _wm.[ch] naming for brevity; we may want to rename skl_watermark.[ch] later accordingly.
Add new intel_wm_init() to call either skl_wm_init() or i9xx_wm_init(i915) depending on the platform, the latter comprising of the remains of intel_init_pm().
Sprinkle in some minor checkpatch fixes while moving the code.
--- drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/display/i9xx_wm.c | 3940 ++++++++++++++++ drivers/gpu/drm/i915/display/i9xx_wm.h | 25 + drivers/gpu/drm/i915/display/intel_display.c | 4 +- .../drm/i915/display/intel_display_debugfs.c | 1 + .../drm/i915/display/intel_display_types.h | 11 - .../drm/i915/display/intel_modeset_setup.c | 1 + drivers/gpu/drm/i915/display/intel_wm.c | 71 + drivers/gpu/drm/i915/display/intel_wm.h | 21 + drivers/gpu/drm/i915/display/skl_watermark.c | 11 +- drivers/gpu/drm/i915/intel_pm.c | 4079 +---------------- drivers/gpu/drm/i915/intel_pm.h | 14 - 12 files changed, 4125 insertions(+), 4055 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.c create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.h create mode 100644 drivers/gpu/drm/i915/display/intel_wm.c create mode 100644 drivers/gpu/drm/i915/display/intel_wm.h
drivers/gpu/drm/i915/Makefile +2 -0
@@ -269,7 +269,9 @@ i915-y += \ display/intel_tc.o \ display/intel_vblank.o \ display/intel_vga.o \ + display/intel_wm.o \ display/i9xx_plane.o \ + display/i9xx_wm.o \ display/skl_scaler.o \ display/skl_universal_plane.o \ display/skl_watermark.o
drivers/gpu/drm/i915/display/i9xx_wm.c new file +3940 -0
2,991 lines not on this page · raw message
drivers/gpu/drm/i915/display/i9xx_wm.h new file +25 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_display.c +3 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_display_debugfs.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_display_types.h +0 -11
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_modeset_setup.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_wm.c new file +71 -0
71 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_wm.h new file +21 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/skl_watermark.c +6 -5
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/intel_pm.c +55 -4024
4,079 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.34.1
Part of the diff is not shown here. View the raw message.
PATCH 3/10 drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch]
In reply to Jani NikulaMove the wrappers to call watermark hooks into intel_wm.[ch]. This declutters intel_display.c nicely.
--- drivers/gpu/drm/i915/display/intel_display.c | 95 ----------------- drivers/gpu/drm/i915/display/intel_wm.c | 105 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wm.h | 14 +++ 3 files changed, 119 insertions(+), 95 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -95
@@ -133,101 +133,6 @@ static void hsw_set_transconf(const struct intel_crtc_state *crtc_state);static void bdw_set_pipemisc (const struct intel_crtc_state *crtc_state);static void ilk_pfit_enable (const struct intel_crtc_state *crtc_state); -/** -* intel_update_watermarks - update FIFO watermark values based on current modes -* @dev_priv: i915 device -* -* Calculate watermark values for the various WM regs based on current mode -* and plane configuration. -* -* There are several cases to deal with here: -* - normal (i.e. non-self-refresh) -* - self-refresh (SR) mode -* - lines are large relative to FIFO size (buffer can hold up to 2) -* - lines are small relative to FIFO size (buffer can hold more than 2 -* lines), so need to account for TLB latency -* -* The normal calculation is: -* watermark = dotclock * bytes per pixel * latency -* where latency is platform & configuration dependent (we assume pessimal -* values here). -* -* The SR calculation is: -* watermark = (trunc(latency/line time)+1) * surface width * -* bytes per pixel -* where -* line time = htotal / dotclock -* surface width = hdisplay for normal plane and 64 for cursor -* and latency is assumed to be high, as above. -* -* The final value programmed to the register should always be rounded up, -* and include an extra 2 entries to account for clock crossings. -* -* We don't use the sprite, so we can ignore that. And on Crestline we have -* to set the non-SR watermarks to 8. -*/ -void intel_update_watermarks (struct drm_i915_private *dev_priv) -{ -if (dev_priv->display.funcs.wm->update_wm) - dev_priv->display.funcs.wm->update_wm (dev_priv); -} - -static int intel_compute_pipe_wm (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->display.funcs.wm->compute_pipe_wm) -return dev_priv->display.funcs.wm->compute_pipe_wm (state, crtc); -return 0 ; -} - -static int intel_compute_intermediate_wm (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (!dev_priv->display.funcs.wm->compute_intermediate_wm) -return 0 ; -if (drm_WARN_ON (&dev_priv->drm, - !dev_priv->display.funcs.wm->compute_pipe_wm)) -return 0 ; -return dev_priv->display.funcs.wm->compute_intermediate_wm (state, crtc); -} - -static bool intel_initial_watermarks (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->display.funcs.wm->initial_watermarks) { - dev_priv->display.funcs.wm->initial_watermarks (state, crtc); -return true; - } -return false; -} - -static void intel_atomic_update_watermarks (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->display.funcs.wm->atomic_update_watermarks) - dev_priv->display.funcs.wm->atomic_update_watermarks (state, crtc); -} - -static void intel_optimize_watermarks (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->display.funcs.wm->optimize_watermarks) - dev_priv->display.funcs.wm->optimize_watermarks (state, crtc); -} - -static int intel_compute_global_watermarks (struct intel_atomic_state *state) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->display.funcs.wm->compute_global_watermarks) -return dev_priv->display.funcs.wm->compute_global_watermarks (state); -return 0 ; -} -/* returns HPLL frequency in kHz */ int vlv_get_hpll_vco (struct drm_i915_private *dev_priv) {
drivers/gpu/drm/i915/display/intel_wm.c +105 -0
111 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_wm.h +14 -0
@@ -9,9 +9,23 @@#include <linux/types.h> struct drm_i915_private ; +struct intel_atomic_state ; +struct intel_crtc ;struct intel_crtc_state ;struct intel_plane_state ; +void intel_update_watermarks (struct drm_i915_private *i915); +int intel_compute_pipe_wm (struct intel_atomic_state *state, +struct intel_crtc *crtc); +int intel_compute_intermediate_wm (struct intel_atomic_state *state, +struct intel_crtc *crtc); +bool intel_initial_watermarks (struct intel_atomic_state *state, +struct intel_crtc *crtc); +void intel_atomic_update_watermarks (struct intel_atomic_state *state, +struct intel_crtc *crtc); +void intel_optimize_watermarks (struct intel_atomic_state *state, +struct intel_crtc *crtc); +int intel_compute_global_watermarks (struct intel_atomic_state *state);bool intel_wm_plane_visible (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); void intel_print_wm_latency(struct drm_i915_private *i915,
Signature · 1 line
2.34.1
PATCH 4/10 drm/i915/wm: add .get_hw_state to watermark funcs
In reply to Jani NikulaGet rid of the if ladder in intel_modeset_setup_hw_state() and hide a number of functions by adding a .get_hw_state() hook to watermark functions. At least for now, combine the platform specific sanitization to the hw state readouts on the relevant platforms instead of adding a separate hook for that.
There's a functional change on PCH split platforms: If i9xx_wm_init() fails to read plane latency and chooses the nop functions, ilk_wm_get_hw_state() won't get called for readout. Add the ilk_init_lp_watermarks() call on that path which now won't be called in .get_hw_state(), as it looks like the only thing that could make a difference.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 24 +++++++++++++++---- drivers/gpu/drm/i915/display/i9xx_wm.h | 5 ---- .../gpu/drm/i915/display/intel_display_core.h | 1 + .../drm/i915/display/intel_modeset_setup.c | 14 ++--------- drivers/gpu/drm/i915/display/intel_wm.c | 6 +++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + drivers/gpu/drm/i915/display/skl_watermark.c | 11 +++++++-- drivers/gpu/drm/i915/display/skl_watermark.h | 3 --- 8 files changed, 39 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +20 -4
@@ -3505,7 +3505,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv,#undef _FW_WM#undef _FW_WM_VLV -void g4x_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void g4x_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct g4x_wm_values *wm = &dev_priv->display.wm.g4x;struct intel_crtc *crtc;
@@ -3598,7 +3598,7 @@ void g4x_wm_get_hw_state(struct drm_i915_private *dev_priv) str_yes_no(wm->fbc_en)); } -void g4x_wm_sanitize (struct drm_i915_private *dev_priv) +static void g4x_wm_sanitize (struct drm_i915_private *dev_priv) {struct intel_plane *plane;struct intel_crtc *crtc;
@@ -3647,7 +3647,13 @@ void g4x_wm_sanitize(struct drm_i915_private *dev_priv)mutex_unlock (&dev_priv->display.wm.wm_mutex); } -void vlv_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void g4x_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +g4x_wm_get_hw_state (i915); +g4x_wm_sanitize (i915); +} + +static void vlv_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct vlv_wm_values *wm = &dev_priv->display.wm.vlv;struct intel_crtc *crtc;
@@ -3747,7 +3753,7 @@ void vlv_wm_get_hw_state(struct drm_i915_private *dev_priv) wm->sr.plane, wm->sr.cursor, wm->level, wm->cxsr); } -void vlv_wm_sanitize (struct drm_i915_private *dev_priv) +static void vlv_wm_sanitize (struct drm_i915_private *dev_priv) {struct intel_plane *plane;struct intel_crtc *crtc;
@@ -3793,6 +3799,12 @@ void vlv_wm_sanitize(struct drm_i915_private *dev_priv)mutex_unlock (&dev_priv->display.wm.wm_mutex); } +static void vlv_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +vlv_wm_get_hw_state (i915); +vlv_wm_sanitize (i915); +} +/* * FIXME should probably kill this and improve * the real watermark readout/sanitation instead
@@ -3847,6 +3859,7 @@ static const struct intel_wm_funcs ilk_wm_funcs = { .compute_intermediate_wm = ilk_compute_intermediate_wm, .initial_watermarks = ilk_initial_watermarks, .optimize_watermarks = ilk_optimize_watermarks, + .get_hw_state = ilk_wm_get_hw_state, };static const struct intel_wm_funcs vlv_wm_funcs = {
@@ -3855,6 +3868,7 @@ static const struct intel_wm_funcs vlv_wm_funcs = { .initial_watermarks = vlv_initial_watermarks, .optimize_watermarks = vlv_optimize_watermarks, .atomic_update_watermarks = vlv_atomic_update_fifo, + .get_hw_state = vlv_wm_get_hw_state_and_sanitize, };static const struct intel_wm_funcs g4x_wm_funcs = {
@@ -3862,6 +3876,7 @@ static const struct intel_wm_funcs g4x_wm_funcs = { .compute_intermediate_wm = g4x_compute_intermediate_wm, .initial_watermarks = g4x_initial_watermarks, .optimize_watermarks = g4x_optimize_watermarks, + .get_hw_state = g4x_wm_get_hw_state_and_sanitize, };static const struct intel_wm_funcs pnv_wm_funcs = {
@@ -3895,6 +3910,7 @@ void i9xx_wm_init(struct drm_i915_private *dev_priv) dev_priv->display.wm.spr_latency[0] && dev_priv->display.wm.cur_latency[0])) { dev_priv->display.funcs.wm = &ilk_wm_funcs; } else { +ilk_init_lp_watermarks (dev_priv);drm_dbg_kms (&dev_priv->drm,"Failed to read display plane latency. " "Disable CxSR\n" );
drivers/gpu/drm/i915/display/i9xx_wm.h +0 -5
@@ -13,11 +13,6 @@ struct intel_crtc_state;struct intel_plane_state ;int ilk_wm_max_level (const struct drm_i915_private *i915); -void g4x_wm_get_hw_state (struct drm_i915_private *i915); -void vlv_wm_get_hw_state (struct drm_i915_private *i915); -void ilk_wm_get_hw_state (struct drm_i915_private *i915); -void g4x_wm_sanitize (struct drm_i915_private *i915); -void vlv_wm_sanitize (struct drm_i915_private *i915);bool ilk_disable_lp_wm (struct drm_i915_private *i915);bool intel_set_memory_cxsr (struct drm_i915_private *i915,bool enable);void i9xx_wm_init (struct drm_i915_private *i915);
drivers/gpu/drm/i915/display/intel_display_core.h +1 -0
@@ -85,6 +85,7 @@ struct intel_wm_funcs {void (*optimize_watermarks)(struct intel_atomic_state *state,struct intel_crtc *crtc);int (*compute_global_watermarks)(struct intel_atomic_state *state); +void (*get_hw_state)(struct drm_i915_private *i915); };struct intel_audio_state {
drivers/gpu/drm/i915/display/intel_modeset_setup.c +2 -12
@@ -25,6 +25,7 @@#include "intel_modeset_setup.h" #include "intel_pch_display.h" #include "intel_pm.h" +#include "intel_wm.h" #include "skl_watermark.h" static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,
@@ -724,18 +725,7 @@ void intel_modeset_setup_hw_state(struct drm_i915_private *i915,intel_dpll_sanitize_state (i915); -if (IS_G4X (i915)) { -g4x_wm_get_hw_state (i915); -g4x_wm_sanitize (i915); - }else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) { -vlv_wm_get_hw_state (i915); -vlv_wm_sanitize (i915); - }else if (DISPLAY_VER (i915) >=9 ) { -skl_wm_get_hw_state (i915); -skl_wm_sanitize (i915); - }else if (HAS_PCH_SPLIT (i915)) { -ilk_wm_get_hw_state (i915); - } +intel_wm_get_hw_state (i915);for_each_intel_crtc (&i915->drm, crtc) { struct intel_crtc_state *crtc_state =
drivers/gpu/drm/i915/display/intel_wm.c +6 -0
@@ -114,6 +114,12 @@ int intel_compute_global_watermarks(struct intel_atomic_state *state)return 0 ; } +void intel_wm_get_hw_state (struct drm_i915_private *i915) +{ +if (i915->display.funcs.wm->get_hw_state) +return i915->display.funcs.wm->get_hw_state (i915); +} +bool intel_wm_plane_visible (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state) {
drivers/gpu/drm/i915/display/intel_wm.h +1 -0
@@ -26,6 +26,7 @@ void intel_atomic_update_watermarks(struct intel_atomic_state *state,void intel_optimize_watermarks (struct intel_atomic_state *state,struct intel_crtc *crtc);int intel_compute_global_watermarks (struct intel_atomic_state *state); +void intel_wm_get_hw_state (struct drm_i915_private *i915);bool intel_wm_plane_visible (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); void intel_print_wm_latency(struct drm_i915_private *i915,
drivers/gpu/drm/i915/display/skl_watermark.c +9 -2
@@ -2861,7 +2861,7 @@ static void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, } } -void skl_wm_get_hw_state (struct drm_i915_private *i915) +static void skl_wm_get_hw_state (struct drm_i915_private *i915) {struct intel_dbuf_state *dbuf_state =to_intel_dbuf_state (i915->display.dbuf.obj.state);
@@ -2961,7 +2961,7 @@ static bool skl_dbuf_is_misconfigured(struct drm_i915_private *i915)return false; } -void skl_wm_sanitize (struct drm_i915_private *i915) +static void skl_wm_sanitize (struct drm_i915_private *i915) {struct intel_crtc *crtc;
@@ -2997,6 +2997,12 @@ void skl_wm_sanitize(struct drm_i915_private *i915) } } +static void skl_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +skl_wm_get_hw_state (i915); +skl_wm_sanitize (i915); +} +void intel_wm_state_verify (struct intel_crtc *crtc,struct intel_crtc_state *new_crtc_state) {
@@ -3269,6 +3275,7 @@ static void skl_setup_wm_latency(struct drm_i915_private *i915)static const struct intel_wm_funcs skl_wm_funcs = { .compute_global_watermarks = skl_compute_wm, + .get_hw_state = skl_wm_get_hw_state_and_sanitize, };void skl_wm_init (struct drm_i915_private *i915)
drivers/gpu/drm/i915/display/skl_watermark.h +0 -3
@@ -38,9 +38,6 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb,const struct skl_ddb_entry *entries, int num_entries, int ignore_idx); -void skl_wm_get_hw_state (struct drm_i915_private *i915); -void skl_wm_sanitize (struct drm_i915_private *i915); -void intel_wm_state_verify (struct intel_crtc *crtc,struct intel_crtc_state *new_crtc_state);
Signature · 1 line
2.34.1
PATCH 8/10 drm/i915/wm: convert from ilk_wm_max_level() to {intel, skl}_wm_num_levels()
In reply to Jani NikulaObserve that most uses of ilk_wm_max_level() are more naturally implemented using the number of levels, not the max level. Switch to the *_wm_num_levels() functions. The SKL+ code can use skl_wm_num_levels() directly, while others shall use the generic intel_wm_num_levels().
Make ilk_wm_max_level() static, and drop the SKL+ support from it. Add a few sanity checks to ensure we got everything right.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 10 ++-- drivers/gpu/drm/i915/display/i9xx_wm.h | 1 - drivers/gpu/drm/i915/display/intel_wm.c | 4 +- drivers/gpu/drm/i915/display/skl_watermark.c | 60 ++++++++++---------- 4 files changed, 37 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +4 -6
@@ -2669,14 +2669,12 @@ static void intel_fixup_cur_wm_latency(struct drm_i915_private *dev_priv, wm[0 ] =13 ; } -int ilk_wm_max_level (const struct drm_i915_private *dev_priv) +static int ilk_wm_max_level (const struct drm_i915_private *dev_priv) { +drm_WARN_ON_ONCE (&dev_priv->drm,DISPLAY_VER (dev_priv) >=9 ); +/* how many WM levels are we expecting */ -if (HAS_HW_SAGV_WM (dev_priv)) -return 5 ; -else if (DISPLAY_VER (dev_priv) >=9 ) -return 7 ; -else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv))return 4 ;else if (DISPLAY_VER (dev_priv) >=6 )return 3 ;
drivers/gpu/drm/i915/display/i9xx_wm.h +0 -1
@@ -12,7 +12,6 @@ struct drm_i915_private;struct intel_crtc_state ;struct intel_plane_state ; -int ilk_wm_max_level (const struct drm_i915_private *i915);int i9xx_wm_num_levels (const struct drm_i915_private *i915);bool ilk_disable_lp_wm (struct drm_i915_private *i915);bool intel_set_memory_cxsr (struct drm_i915_private *i915,bool enable);
drivers/gpu/drm/i915/display/intel_wm.c +2 -2
@@ -147,9 +147,9 @@ bool intel_wm_plane_visible(const struct intel_crtc_state *crtc_state,void intel_print_wm_latency (struct drm_i915_private *dev_priv,const char *name,const u16 wm[]) { -int level, max_level =ilk_wm_max_level (dev_priv); +int level, num_levels =intel_wm_num_levels (dev_priv); -for (level =0 ; level <= max_level; level++) { +for (level =0 ; level < num_levels; level++) {unsigned int latency = wm[level];if (latency ==0 ) {
drivers/gpu/drm/i915/display/skl_watermark.c +31 -29
210 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 5/10 drm/i915/wm: move watermark sanitization to intel_wm.[ch]
In reply to Jani NikulaMove the generic sanitize_watermarks() to intel_wm.[ch] and rename as intel_wm_sanitize(). The slightly unfortunate downside is having to expose intel_atomic_check() from intel_display.c, but this declutters intel_display.c nicely.
--- drivers/gpu/drm/i915/display/intel_display.c | 124 +------------------ drivers/gpu/drm/i915/display/intel_display.h | 2 + drivers/gpu/drm/i915/display/intel_wm.c | 119 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + 4 files changed, 125 insertions(+), 121 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +3 -121
@@ -6602,8 +6602,8 @@ static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)* @dev: drm device * @_state: state to validate */ -static int intel_atomic_check (struct drm_device *dev, -struct drm_atomic_state *_state) +int intel_atomic_check (struct drm_device *dev, +struct drm_atomic_state *_state) {struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_atomic_state *state =to_intel_atomic_state (_state);
@@ -8263,124 +8263,6 @@ void intel_modeset_init_hw(struct drm_i915_private *i915) cdclk_state->logical = cdclk_state->actual = i915->display.cdclk.hw; } -static int sanitize_watermarks_add_affected (struct drm_atomic_state *state) -{ -struct drm_plane *plane; -struct intel_crtc *crtc; - -for_each_intel_crtc (state->dev, crtc) { -struct intel_crtc_state *crtc_state; - - crtc_state =intel_atomic_get_crtc_state (state, crtc); -if (IS_ERR (crtc_state)) -return PTR_ERR (crtc_state); - -if (crtc_state->hw.active) { -/* -* Preserve the inherited flag to avoid -* taking the full modeset path. -*/ - crtc_state->inherited = true; - } - } - -drm_for_each_plane (plane, state->dev) { -struct drm_plane_state *plane_state; - - plane_state =drm_atomic_get_plane_state (state, plane); -if (IS_ERR (plane_state)) -return PTR_ERR (plane_state); - } - -return 0 ; -} - -/* -* Calculate what we think the watermarks should be for the state we've read -* out of the hardware and then immediately program those watermarks so that -* we ensure the hardware settings match our internal state. -* -* We can calculate what we think WM's should be by creating a duplicate of the -* current state (which was constructed during hardware readout) and running it -* through the atomic check code to calculate new watermark values in the -* state object. -*/ -static void sanitize_watermarks (struct drm_i915_private *dev_priv) -{ -struct drm_atomic_state *state; -struct intel_atomic_state *intel_state; -struct intel_crtc *crtc; -struct intel_crtc_state *crtc_state; -struct drm_modeset_acquire_ctx ctx; -int ret; -int i; - -/* Only supported on platforms that use atomic watermark design */ -if (!dev_priv->display.funcs.wm->optimize_watermarks) -return ; - - state =drm_atomic_state_alloc (&dev_priv->drm); -if (drm_WARN_ON (&dev_priv->drm, !state)) -return ; - - intel_state =to_intel_atomic_state (state); - -drm_modeset_acquire_init (&ctx,0 ); - -retry: - state->acquire_ctx = &ctx; - -/* -* Hardware readout is the only time we don't want to calculate -* intermediate watermarks (since we don't trust the current -* watermarks). -*/ -if (!HAS_GMCH (dev_priv)) - intel_state->skip_intermediate_wm = true; - - ret =sanitize_watermarks_add_affected (state); -if (ret) - goto fail; - - ret =intel_atomic_check (&dev_priv->drm, state); -if (ret) - goto fail; - -/* Write calculated watermark values back */ -for_each_new_intel_crtc_in_state (intel_state, crtc, crtc_state, i) { - crtc_state->wm.need_postvbl_update = true; -intel_optimize_watermarks (intel_state, crtc); - -to_intel_crtc_state (crtc->base.state)->wm = crtc_state->wm; - } - -fail: -if (ret == -EDEADLK ) { -drm_atomic_state_clear (state); -drm_modeset_backoff (&ctx); - goto retry; - } - -/* -* If we fail here, it means that the hardware appears to be -* programmed in a way that shouldn't be possible, given our -* understanding of watermark requirements. This might mean a -* mistake in the hardware readout code or a mistake in the -* watermark calculations for a given platform. Raise a WARN -* so that this is noticeable. -* -* If this actually happens, we'll have to just leave the -* BIOS-programmed watermarks untouched and hope for the best. -*/ -drm_WARN (&dev_priv->drm, ret, -"Could not determine valid watermarks for inherited state\n" ); - -drm_atomic_state_put (state); - -drm_modeset_drop_locks (&ctx); -drm_modeset_acquire_fini (&ctx); -} -static int intel_initial_commit (struct drm_device *dev) {struct drm_atomic_state *state =NULL ;
@@ -8657,7 +8539,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)* since the watermark calculation done here will use pstate->fb. */ if (!HAS_GMCH (i915)) -sanitize_watermarks (i915); +intel_wm_sanitize (i915);return 0 ; }
drivers/gpu/drm/i915/display/intel_display.h +2 -0
@@ -32,6 +32,7 @@enum drm_scaling_filter ;struct dpll ; +struct drm_atomic_state ;struct drm_connector ;struct drm_device ;struct drm_display_mode ;
@@ -394,6 +395,7 @@ enum phy_fia { ((connector) = to_intel_connector((__state)->base.connectors[__i].ptr), \ (new_connector_state) = to_intel_digital_connector_state((__state)->base.connectors[__i].new_state), 1)) +int intel_atomic_check (struct drm_device *dev,struct drm_atomic_state *state);int intel_atomic_add_affected_planes (struct intel_atomic_state *state,struct intel_crtc *crtc); u8 intel_calc_active_pipes(struct intel_atomic_state *state,
drivers/gpu/drm/i915/display/intel_wm.c +119 -0
131 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_wm.h +1 -0
@@ -31,6 +31,7 @@ bool intel_wm_plane_visible(const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state);void intel_print_wm_latency (struct drm_i915_private *i915,const char *name,const u16 wm[]); +void intel_wm_sanitize (struct drm_i915_private *i915);void intel_wm_init (struct drm_i915_private *i915);#endif /* __INTEL_WM_H__ */
Signature · 1 line
2.34.1
PATCH 9/10 drm/i915/wm: move watermark debugfs to intel_wm.c
In reply to Jani NikulaFollow the new convention of placing debugfs with the code.
--- .../drm/i915/display/intel_display_debugfs.c | 224 +---------------- drivers/gpu/drm/i915/display/intel_wm.c | 232 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + 3 files changed, 234 insertions(+), 223 deletions(-)
drivers/gpu/drm/i915/display/intel_display_debugfs.c +1 -223
@@ -11,7 +11,6 @@#include "i915_debugfs.h" #include "i915_irq.h" #include "i915_reg.h" -#include "i9xx_wm.h" #include "intel_de.h" #include "intel_display_debugfs.h" #include "intel_display_power.h"
@@ -31,7 +30,6 @@#include "intel_psr.h" #include "intel_sprite.h" #include "intel_wm.h" -#include "skl_watermark.h" static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) {
@@ -1284,223 +1282,6 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data) }DEFINE_SHOW_ATTRIBUTE (i915_displayport_test_type); -static void wm_latency_show (struct seq_file *m,const u16 wm[8 ]) -{ -struct drm_i915_private *dev_priv = m->private; -int level; -int num_levels; - - num_levels =intel_wm_num_levels (dev_priv); - -drm_modeset_lock_all (&dev_priv->drm); - -for (level =0 ; level < num_levels; level++) { -unsigned int latency = wm[level]; - -/* -* - WM1+ latency values in 0.5us units -* - latencies are in us on gen9/vlv/chv -*/ -if (DISPLAY_VER (dev_priv) >=9 || -IS_VALLEYVIEW (dev_priv) || -IS_CHERRYVIEW (dev_priv) || -IS_G4X (dev_priv)) - latency *=10 ; -else if (level >0 ) - latency *=5 ; - -seq_printf (m,"WM%d %u (%u.%u usec)\n" , - level, wm[level], latency /10 , latency %10 ); - } - -drm_modeset_unlock_all (&dev_priv->drm); -} - -static int pri_wm_latency_show (struct seq_file *m,void *data) -{ -struct drm_i915_private *dev_priv = m->private; -const u16 *latencies; - -if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->display.wm.skl_latency; -else - latencies = dev_priv->display.wm.pri_latency; - -wm_latency_show (m, latencies); - -return 0 ; -} - -static int spr_wm_latency_show (struct seq_file *m,void *data) -{ -struct drm_i915_private *dev_priv = m->private; -const u16 *latencies; - -if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->display.wm.skl_latency; -else - latencies = dev_priv->display.wm.spr_latency; - -wm_latency_show (m, latencies); - -return 0 ; -} - -static int cur_wm_latency_show (struct seq_file *m,void *data) -{ -struct drm_i915_private *dev_priv = m->private; -const u16 *latencies; - -if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->display.wm.skl_latency; -else - latencies = dev_priv->display.wm.cur_latency; - -wm_latency_show (m, latencies); - -return 0 ; -} - -static int pri_wm_latency_open (struct inode *inode,struct file *file) -{ -struct drm_i915_private *dev_priv = inode->i_private; - -if (DISPLAY_VER (dev_priv) <5 && !IS_G4X (dev_priv)) -return -ENODEV ; - -return single_open (file, pri_wm_latency_show, dev_priv); -} - -static int spr_wm_latency_open (struct inode *inode,struct file *file) -{ -struct drm_i915_private *dev_priv = inode->i_private; - -if (HAS_GMCH (dev_priv)) -return -ENODEV ; - -return single_open (file, spr_wm_latency_show, dev_priv); -} - -static int cur_wm_latency_open (struct inode *inode,struct file *file) -{ -struct drm_i915_private *dev_priv = inode->i_private; - -if (HAS_GMCH (dev_priv)) -return -ENODEV ; - -return single_open (file, cur_wm_latency_show, dev_priv); -} - -static ssize_t wm_latency_write (struct file *file,const char __user *ubuf, -size_t len,loff_t *offp,u16 wm[8 ]) -{ -struct seq_file *m = file->private_data; -struct drm_i915_private *dev_priv = m->private; -u16 new[8 ] = {0 }; -int num_levels; -int level; -int ret; -char tmp[32 ]; - - num_levels =intel_wm_num_levels (dev_priv); - -if (len >=sizeof (tmp)) -return -EINVAL ; - -if (copy_from_user (tmp, ubuf, len)) -return -EFAULT ; - - tmp[len] ='\0' ; - - ret =sscanf (tmp,"%hu %hu %hu %hu %hu %hu %hu %hu" , - &new[0 ], &new[1 ], &new[2 ], &new[3 ], - &new[4 ], &new[5 ], &new[6 ], &new[7 ]); -if (ret != num_levels) -return -EINVAL ; - -drm_modeset_lock_all (&dev_priv->drm); - -for (level =0 ; level < num_levels; level++) - wm[level] = new[level]; - -drm_modeset_unlock_all (&dev_priv->drm); - -return len; -} - - -static ssize_t pri_wm_latency_write (struct file *file,const char __user *ubuf, -size_t len,loff_t *offp) -{ -struct seq_file *m = file->private_data; -struct drm_i915_private *dev_priv = m->private; -u16 *latencies; - -if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->display.wm.skl_latency; -else - latencies = dev_priv->display.wm.pri_latency; - -return wm_latency_write (file, ubuf, len, offp, latencies); -} - -static ssize_t spr_wm_latency_write (struct file *file,const char __user *ubuf, -size_t len,loff_t *offp) -{ -struct seq_file *m = file->private_data; -struct drm_i915_private *dev_priv = m->private; -u16 *latencies; - -if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->display.wm.skl_latency; -else - latencies = dev_priv->display.wm.spr_latency; - -return wm_latency_write (file, ubuf, len, offp, latencies); -} - -static ssize_t cur_wm_latency_write (struct file *file,const char __user *ubuf, -size_t len,loff_t *offp) -{ -struct seq_file *m = file->private_data; -struct drm_i915_private *dev_priv = m->private; -u16 *latencies; - -if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->display.wm.skl_latency; -else - latencies = dev_priv->display.wm.cur_latency; - -return wm_latency_write (file, ubuf, len, offp, latencies); -} - -static const struct file_operations i915_pri_wm_latency_fops = { - .owner =THIS_MODULE , - .open = pri_wm_latency_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = pri_wm_latency_write -}; - -static const struct file_operations i915_spr_wm_latency_fops = { - .owner =THIS_MODULE , - .open = spr_wm_latency_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = spr_wm_latency_write -}; - -static const struct file_operations i915_cur_wm_latency_fops = { - .owner =THIS_MODULE , - .open = cur_wm_latency_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = cur_wm_latency_write -}; - static ssize_t i915_fifo_underrun_reset_write(struct file *filp, const char __user *ubuf,
@@ -1581,9 +1362,6 @@ static const struct {const struct file_operations *fops; } intel_display_debugfs_files[] = { {"i915_fifo_underrun_reset", &i915_fifo_underrun_reset_ops}, - {"i915_pri_wm_latency", &i915_pri_wm_latency_fops}, - {"i915_spr_wm_latency", &i915_spr_wm_latency_fops}, - {"i915_cur_wm_latency", &i915_cur_wm_latency_fops}, {"i915_dp_test_data", &i915_displayport_test_data_fops}, {"i915_dp_test_type", &i915_displayport_test_type_fops}, {"i915_dp_test_active", &i915_displayport_test_active_fops},
@@ -1610,7 +1388,7 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)intel_dmc_debugfs_register (i915);intel_fbc_debugfs_register (i915);intel_hpd_debugfs_register (i915); -skl_watermark_debugfs_register (i915); +intel_wm_debugfs_register (i915); }static int i915_panel_show (struct seq_file *m,void *data)
drivers/gpu/drm/i915/display/intel_wm.c +232 -0
235 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_wm.h +1 -0
@@ -34,5 +34,6 @@ void intel_print_wm_latency(struct drm_i915_private *i915,void intel_wm_sanitize (struct drm_i915_private *i915);int intel_wm_num_levels (const struct drm_i915_private *i915);void intel_wm_init (struct drm_i915_private *i915); +void intel_wm_debugfs_register (struct drm_i915_private *i915);#endif /* __INTEL_WM_H__ */
Signature · 1 line
2.34.1
PATCH 6/10 drm/i915/wm: s/intel_wm_num_levels/g4x_wm_num_levels/
In reply to Jani NikulaRename intel_wm_num_levels() to g4x_wm_num_levels() to make the name available for generic watermark code.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +10 -10
@@ -592,7 +592,7 @@ static bool is_enabling(int old, int new, int threshold)return old < threshold && new >= threshold; } -static int intel_wm_num_levels (struct drm_i915_private *dev_priv) +static int g4x_wm_num_levels (struct drm_i915_private *dev_priv) {return dev_priv->display.wm.max_level +1 ; }
@@ -936,7 +936,7 @@ static bool g4x_raw_plane_wm_set(struct intel_crtc_state *crtc_state,struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);bool dirty = false; -for (; level <intel_wm_num_levels (dev_priv); level++) { +for (; level <g4x_wm_num_levels (dev_priv); level++) {struct g4x_pipe_wm *raw = &crtc_state->wm.g4x.raw[level]; dirty |= raw->plane[plane_id] != value;
@@ -955,7 +955,7 @@ static bool g4x_raw_fbc_wm_set(struct intel_crtc_state *crtc_state,/* NORMAL level doesn't have an FBC watermark */ level =max (level,G4X_WM_LEVEL_SR ); -for (; level <intel_wm_num_levels (dev_priv); level++) { +for (; level <g4x_wm_num_levels (dev_priv); level++) {struct g4x_pipe_wm *raw = &crtc_state->wm.g4x.raw[level]; dirty |= raw->fbc != value;
@@ -974,7 +974,7 @@ static bool g4x_raw_plane_wm_compute(struct intel_crtc_state *crtc_state, {struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane);struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -int num_levels =intel_wm_num_levels (to_i915 (plane->base.dev)); +int num_levels =g4x_wm_num_levels (to_i915 (plane->base.dev));enum plane_id plane_id = plane->id;bool dirty = false;int level;
@@ -1534,7 +1534,7 @@ static void vlv_invalidate_wms(struct intel_crtc *crtc, {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -for (; level <intel_wm_num_levels (dev_priv); level++) { +for (; level <g4x_wm_num_levels (dev_priv); level++) {enum plane_id plane_id;for_each_plane_id_on_crtc (crtc, plane_id)
@@ -1561,7 +1561,7 @@ static bool vlv_raw_plane_wm_set(struct intel_crtc_state *crtc_state, int level, enum plane_id plane_id, u16 value) { struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); -int num_levels =intel_wm_num_levels (dev_priv); +int num_levels =g4x_wm_num_levels (dev_priv);bool dirty = false;for (; level < num_levels; level++) {
@@ -1580,7 +1580,7 @@ static bool vlv_raw_plane_wm_compute(struct intel_crtc_state *crtc_state,struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane);struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);enum plane_id plane_id = plane->id; -int num_levels =intel_wm_num_levels (to_i915 (plane->base.dev)); +int num_levels =g4x_wm_num_levels (to_i915 (plane->base.dev));int level;bool dirty = false;
@@ -1648,7 +1648,7 @@ static int _vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state)int level;/* initially allow all levels */ - wm_state->num_levels =intel_wm_num_levels (dev_priv); + wm_state->num_levels =g4x_wm_num_levels (dev_priv);/* * Note that enabling cxsr with no primary/sprite planes * enabled can wedge the pipe. Hence we only allow cxsr
@@ -3613,7 +3613,7 @@ static void g4x_wm_sanitize(struct drm_i915_private *dev_priv)struct intel_plane_state *plane_state =to_intel_plane_state (plane->base.state);enum plane_id plane_id = plane->id; -int level, num_levels =intel_wm_num_levels (dev_priv); +int level, num_levels =g4x_wm_num_levels (dev_priv);if (plane_state->uapi.visible)continue ;
@@ -3768,7 +3768,7 @@ static void vlv_wm_sanitize(struct drm_i915_private *dev_priv)struct intel_plane_state *plane_state =to_intel_plane_state (plane->base.state);enum plane_id plane_id = plane->id; -int level, num_levels =intel_wm_num_levels (dev_priv); +int level, num_levels =g4x_wm_num_levels (dev_priv);if (plane_state->uapi.visible)continue ;
Signature · 1 line
2.34.1
PATCH 7/10 drm/i915/wm: add *_wm_num_levels() functions
In reply to Jani NikulaAdd intel_wm_num_levels(), i9xx_wm_num_levels() and skl_wm_num_levels() functions.
There's a difference between i9xx_wm_num_levels() and g4x_wm_num_levels(), but leave that unresolved for now to avoid functional changes.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 17 +++++++++++++++++ drivers/gpu/drm/i915/display/i9xx_wm.h | 1 + .../drm/i915/display/intel_display_debugfs.c | 19 +++---------------- drivers/gpu/drm/i915/display/intel_wm.c | 8 ++++++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + drivers/gpu/drm/i915/display/skl_watermark.c | 8 ++++++++ drivers/gpu/drm/i915/display/skl_watermark.h | 1 + 7 files changed, 39 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +17 -0
@@ -2684,6 +2684,23 @@ int ilk_wm_max_level(const struct drm_i915_private *dev_priv)return 2 ; } +/* FIXME: reconcile the difference with g4x_wm_num_levels() */ +int i9xx_wm_num_levels (const struct drm_i915_private *i915) +{ +int num_levels; + +if (IS_CHERRYVIEW (i915)) + num_levels =3 ; +else if (IS_VALLEYVIEW (i915)) + num_levels =1 ; +else if (IS_G4X (i915)) + num_levels =3 ; +else + num_levels =ilk_wm_max_level (i915) +1 ; + +return num_levels; +} +static bool ilk_increase_wm_latency (struct drm_i915_private *dev_priv,u16 wm[5 ],u16 min) {
drivers/gpu/drm/i915/display/i9xx_wm.h +1 -0
@@ -13,6 +13,7 @@ struct intel_crtc_state;struct intel_plane_state ;int ilk_wm_max_level (const struct drm_i915_private *i915); +int i9xx_wm_num_levels (const struct drm_i915_private *i915);bool ilk_disable_lp_wm (struct drm_i915_private *i915);bool intel_set_memory_cxsr (struct drm_i915_private *i915,bool enable);void i9xx_wm_init (struct drm_i915_private *i915);
drivers/gpu/drm/i915/display/intel_display_debugfs.c +3 -16
@@ -30,6 +30,7 @@#include "intel_pm.h" #include "intel_psr.h" #include "intel_sprite.h" +#include "intel_wm.h" #include "skl_watermark.h" static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node)
@@ -1289,14 +1290,7 @@ static void wm_latency_show(struct seq_file *m, const u16 wm[8])int level;int num_levels; -if (IS_CHERRYVIEW (dev_priv)) - num_levels =3 ; -else if (IS_VALLEYVIEW (dev_priv)) - num_levels =1 ; -else if (IS_G4X (dev_priv)) - num_levels =3 ; -else - num_levels =ilk_wm_max_level (dev_priv) +1 ; + num_levels =intel_wm_num_levels (dev_priv);drm_modeset_lock_all (&dev_priv->drm);
@@ -1408,14 +1402,7 @@ static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,int ret;char tmp[32 ]; -if (IS_CHERRYVIEW (dev_priv)) - num_levels =3 ; -else if (IS_VALLEYVIEW (dev_priv)) - num_levels =1 ; -else if (IS_G4X (dev_priv)) - num_levels =3 ; -else - num_levels =ilk_wm_max_level (dev_priv) +1 ; + num_levels =intel_wm_num_levels (dev_priv);if (len >=sizeof (tmp))return -EINVAL ;
drivers/gpu/drm/i915/display/intel_wm.c +8 -0
@@ -292,6 +292,14 @@ void intel_wm_sanitize(struct drm_i915_private *dev_priv)drm_modeset_acquire_fini (&ctx); } +int intel_wm_num_levels (const struct drm_i915_private *i915) +{ +if (DISPLAY_VER (i915) >=9 ) +return skl_wm_num_levels (i915); +else +return i9xx_wm_num_levels (i915); +} +void intel_wm_init (struct drm_i915_private *i915) {if (DISPLAY_VER (i915) >=9 )
drivers/gpu/drm/i915/display/intel_wm.h +1 -0
@@ -32,6 +32,7 @@ bool intel_wm_plane_visible(const struct intel_crtc_state *crtc_state,void intel_print_wm_latency (struct drm_i915_private *i915,const char *name,const u16 wm[]);void intel_wm_sanitize (struct drm_i915_private *i915); +int intel_wm_num_levels (const struct drm_i915_private *i915);void intel_wm_init (struct drm_i915_private *i915);#endif /* __INTEL_WM_H__ */
drivers/gpu/drm/i915/display/skl_watermark.c +8 -0
@@ -3278,6 +3278,14 @@ static const struct intel_wm_funcs skl_wm_funcs = { .get_hw_state = skl_wm_get_hw_state_and_sanitize, }; +int skl_wm_num_levels (const struct drm_i915_private *i915) +{ +if (HAS_HW_SAGV_WM (i915)) +return 6 ; +else +return 8 ; +} +void skl_wm_init (struct drm_i915_private *i915) {intel_sagv_init (i915);
drivers/gpu/drm/i915/display/skl_watermark.h +1 -0
@@ -46,6 +46,7 @@ void skl_watermark_ipc_update(struct drm_i915_private *i915);bool skl_watermark_ipc_enabled (struct drm_i915_private *i915);void skl_watermark_debugfs_register (struct drm_i915_private *i915); +int skl_wm_num_levels (const struct drm_i915_private *i915);void skl_wm_init (struct drm_i915_private *i915);struct intel_dbuf_state {
Signature · 1 line
2.34.1
PATCH 10/10 drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h
In reply to Jani NikulaThe file was never really about pm types, and now it's even more obvious. Move under display as intel_wm_types.h.
---
drivers/gpu/drm/i915/display/intel_display_core.h | 2 +-
drivers/gpu/drm/i915/display/intel_display_types.h | 2 +-
.../drm/i915/{intel_pm_types.h => display/intel_wm_types.h} | 6 +++---
drivers/gpu/drm/i915/display/skl_watermark.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/gpu/drm/i915/{intel_pm_types.h => display/intel_wm_types.h} (93%)drivers/gpu/drm/i915/display/intel_display_core.h +1 -1
@@ -25,7 +25,7 @@#include "intel_global_state.h" #include "intel_gmbus.h" #include "intel_opregion.h" -#include "intel_pm_types.h" +#include "intel_wm_types.h" struct drm_i915_private ;struct drm_property ;
drivers/gpu/drm/i915/display/intel_display_types.h +1 -1
@@ -53,7 +53,7 @@#include "intel_display_limits.h" #include "intel_display_power.h" #include "intel_dpll_mgr.h" -#include "intel_pm_types.h" +#include "intel_wm_types.h" struct drm_printer ;struct __intel_global_objs_state ;
drivers/gpu/drm/i915/display/intel_wm_types.h renamed from drivers/gpu/drm/i915/intel_pm_types.h +3 -3
@@ -3,8 +3,8 @@* Copyright © 2021 Intel Corporation */ -#ifndef __INTEL_PM_TYPES_H__ -#define __INTEL_PM_TYPES_H__ +#ifndef __INTEL_WM_TYPES_H__ +#define __INTEL_WM_TYPES_H__#include <linux/types.h>
@@ -73,4 +73,4 @@ static inline bool skl_ddb_entry_equal(const struct skl_ddb_entry *e1, return false; } -#endif /* __INTEL_PM_TYPES_H__ */ +#endif /* __INTEL_WM_TYPES_H__ */
drivers/gpu/drm/i915/display/skl_watermark.h +1 -1
@@ -10,7 +10,7 @@#include "intel_display_limits.h" #include "intel_global_state.h" -#include "intel_pm_types.h" +#include "intel_wm_types.h" struct drm_i915_private ;struct intel_atomic_state ;
Signature · 1 line
2.34.1
kernel test robot
build botRe: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs
In reply to Jani NikulaI love your patch! Perhaps something to improve:
Hi Jani,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/drm-i915-move-memory-frequency-detection-to-intel_dram-c/20230208-175057 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip patch link: https://lore.kernel.org/r/6fc335ec79f163b7a612af012ce07be6d98f2ef9.1675849634.git.jani.nikula%40intel.com patch subject: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs config: x86_64-randconfig-a013-20230206 (https://download.01.org/0day-ci/archive/20230208/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-8) 11.3.0 reproduce (this is a W=1 build): # https://github.com/intel-lab-lkp/linux/commit/3be1dad7406a8c767260601b10af82797025aae3 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Jani-Nikula/drm-i915-move-memory-frequency-detection-to-intel_dram-c/20230208-175057 git checkout 3be1dad7406a8c767260601b10af82797025aae3 # save the config file mkdir build_dir && cp config build_dir/.config make W=1 O=build_dir ARCH=x86_64 olddefconfig make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/i9xx_wm.c:3824:6: warning: no previous prototype for 'ilk_wm_get_hw_state' [-Wmissing-prototypes]
3824 | void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
| ^~~~~~~~~~~~~~~~~~~vim +/ilk_wm_get_hw_state +3824 drivers/gpu/drm/i915/display/i9xx_wm.c
f21b5d6fc26440 Jani Nikula 2023-02-08 3823
f21b5d6fc26440 Jani Nikula 2023-02-08 @3824 void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
f21b5d6fc26440 Jani Nikula 2023-02-08 3825 {
f21b5d6fc26440 Jani Nikula 2023-02-08 3826 struct ilk_wm_values *hw = &dev_priv->display.wm.hw;
f21b5d6fc26440 Jani Nikula 2023-02-08 3827 struct intel_crtc *crtc;
f21b5d6fc26440 Jani Nikula 2023-02-08 3828
f21b5d6fc26440 Jani Nikula 2023-02-08 3829 ilk_init_lp_watermarks(dev_priv);
f21b5d6fc26440 Jani Nikula 2023-02-08 3830
f21b5d6fc26440 Jani Nikula 2023-02-08 3831 for_each_intel_crtc(&dev_priv->drm, crtc)
f21b5d6fc26440 Jani Nikula 2023-02-08 3832 ilk_pipe_wm_get_hw_state(crtc);
f21b5d6fc26440 Jani Nikula 2023-02-08 3833
f21b5d6fc26440 Jani Nikula 2023-02-08 3834 hw->wm_lp[0] = intel_uncore_read(&dev_priv->uncore, WM1_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3835 hw->wm_lp[1] = intel_uncore_read(&dev_priv->uncore, WM2_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3836 hw->wm_lp[2] = intel_uncore_read(&dev_priv->uncore, WM3_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3837
f21b5d6fc26440 Jani Nikula 2023-02-08 3838 hw->wm_lp_spr[0] = intel_uncore_read(&dev_priv->uncore, WM1S_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3839 if (DISPLAY_VER(dev_priv) >= 7) {
f21b5d6fc26440 Jani Nikula 2023-02-08 3840 hw->wm_lp_spr[1] = intel_uncore_read(&dev_priv->uncore, WM2S_LP_IVB);
f21b5d6fc26440 Jani Nikula 2023-02-08 3841 hw->wm_lp_spr[2] = intel_uncore_read(&dev_priv->uncore, WM3S_LP_IVB);
f21b5d6fc26440 Jani Nikula 2023-02-08 3842 }
f21b5d6fc26440 Jani Nikula 2023-02-08 3843
f21b5d6fc26440 Jani Nikula 2023-02-08 3844 if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
f21b5d6fc26440 Jani Nikula 2023-02-08 3845 hw->partitioning = (intel_uncore_read(&dev_priv->uncore, WM_MISC) &
f21b5d6fc26440 Jani Nikula 2023-02-08 3846 WM_MISC_DATA_PARTITION_5_6) ?
f21b5d6fc26440 Jani Nikula 2023-02-08 3847 INTEL_DDB_PART_5_6 : INTEL_DDB_PART_1_2;
f21b5d6fc26440 Jani Nikula 2023-02-08 3848 else if (IS_IVYBRIDGE(dev_priv))
f21b5d6fc26440 Jani Nikula 2023-02-08 3849 hw->partitioning = (intel_uncore_read(&dev_priv->uncore, DISP_ARB_CTL2) &
f21b5d6fc26440 Jani Nikula 2023-02-08 3850 DISP_DATA_PARTITION_5_6) ?
f21b5d6fc26440 Jani Nikula 2023-02-08 3851 INTEL_DDB_PART_5_6 : INTEL_DDB_PART_1_2;
f21b5d6fc26440 Jani Nikula 2023-02-08 3852
f21b5d6fc26440 Jani Nikula 2023-02-08 3853 hw->enable_fbc_wm =
f21b5d6fc26440 Jani Nikula 2023-02-08 3854 !(intel_uncore_read(&dev_priv->uncore, DISP_ARB_CTL) & DISP_FBC_WM_DIS);
f21b5d6fc26440 Jani Nikula 2023-02-08 3855 }
f21b5d6fc26440 Jani Nikula 2023-02-08 3856 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botRe: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs
In reply to Jani NikulaI love your patch! Yet something to improve:
Hi Jani,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/drm-i915-move-memory-frequency-detection-to-intel_dram-c/20230208-175057 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip patch link: https://lore.kernel.org/r/6fc335ec79f163b7a612af012ce07be6d98f2ef9.1675849634.git.jani.nikula%40intel.com patch subject: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs config: i386-defconfig (https://download.01.org/0day-ci/archive/20230208/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/3be1dad7406a8c767260601b10af82797025aae3
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jani-Nikula/drm-i915-move-memory-frequency-detection-to-intel_dram-c/20230208-175057 git checkout 3be1dad7406a8c767260601b10af82797025aae3
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=i386 olddefconfig
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/i9xx_wm.c:3824:6: error: no previous prototype for 'ilk_wm_get_hw_state' [-Werror=missing-prototypes]
3824 | void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
| ^~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
vim +/ilk_wm_get_hw_state +3824 drivers/gpu/drm/i915/display/i9xx_wm.c
f21b5d6fc26440 Jani Nikula 2023-02-08 3823
f21b5d6fc26440 Jani Nikula 2023-02-08 @3824 void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
f21b5d6fc26440 Jani Nikula 2023-02-08 3825 {
f21b5d6fc26440 Jani Nikula 2023-02-08 3826 struct ilk_wm_values *hw = &dev_priv->display.wm.hw;
f21b5d6fc26440 Jani Nikula 2023-02-08 3827 struct intel_crtc *crtc;
f21b5d6fc26440 Jani Nikula 2023-02-08 3828
f21b5d6fc26440 Jani Nikula 2023-02-08 3829 ilk_init_lp_watermarks(dev_priv);
f21b5d6fc26440 Jani Nikula 2023-02-08 3830
f21b5d6fc26440 Jani Nikula 2023-02-08 3831 for_each_intel_crtc(&dev_priv->drm, crtc)
f21b5d6fc26440 Jani Nikula 2023-02-08 3832 ilk_pipe_wm_get_hw_state(crtc);
f21b5d6fc26440 Jani Nikula 2023-02-08 3833
f21b5d6fc26440 Jani Nikula 2023-02-08 3834 hw->wm_lp[0] = intel_uncore_read(&dev_priv->uncore, WM1_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3835 hw->wm_lp[1] = intel_uncore_read(&dev_priv->uncore, WM2_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3836 hw->wm_lp[2] = intel_uncore_read(&dev_priv->uncore, WM3_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3837
f21b5d6fc26440 Jani Nikula 2023-02-08 3838 hw->wm_lp_spr[0] = intel_uncore_read(&dev_priv->uncore, WM1S_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3839 if (DISPLAY_VER(dev_priv) >= 7) {
f21b5d6fc26440 Jani Nikula 2023-02-08 3840 hw->wm_lp_spr[1] = intel_uncore_read(&dev_priv->uncore, WM2S_LP_IVB);
f21b5d6fc26440 Jani Nikula 2023-02-08 3841 hw->wm_lp_spr[2] = intel_uncore_read(&dev_priv->uncore, WM3S_LP_IVB);
f21b5d6fc26440 Jani Nikula 2023-02-08 3842 }
f21b5d6fc26440 Jani Nikula 2023-02-08 3843
f21b5d6fc26440 Jani Nikula 2023-02-08 3844 if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
f21b5d6fc26440 Jani Nikula 2023-02-08 3845 hw->partitioning = (intel_uncore_read(&dev_priv->uncore, WM_MISC) &
f21b5d6fc26440 Jani Nikula 2023-02-08 3846 WM_MISC_DATA_PARTITION_5_6) ?
f21b5d6fc26440 Jani Nikula 2023-02-08 3847 INTEL_DDB_PART_5_6 : INTEL_DDB_PART_1_2;
f21b5d6fc26440 Jani Nikula 2023-02-08 3848 else if (IS_IVYBRIDGE(dev_priv))
f21b5d6fc26440 Jani Nikula 2023-02-08 3849 hw->partitioning = (intel_uncore_read(&dev_priv->uncore, DISP_ARB_CTL2) &
f21b5d6fc26440 Jani Nikula 2023-02-08 3850 DISP_DATA_PARTITION_5_6) ?
f21b5d6fc26440 Jani Nikula 2023-02-08 3851 INTEL_DDB_PART_5_6 : INTEL_DDB_PART_1_2;
f21b5d6fc26440 Jani Nikula 2023-02-08 3852
f21b5d6fc26440 Jani Nikula 2023-02-08 3853 hw->enable_fbc_wm =
f21b5d6fc26440 Jani Nikula 2023-02-08 3854 !(intel_uncore_read(&dev_priv->uncore, DISP_ARB_CTL) & DISP_FBC_WM_DIS);
f21b5d6fc26440 Jani Nikula 2023-02-08 3855 }
f21b5d6fc26440 Jani Nikula 2023-02-08 3856 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botRe: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs
In reply to Jani NikulaI love your patch! Perhaps something to improve:
Hi Jani,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/drm-i915-move-memory-frequency-detection-to-intel_dram-c/20230208-175057 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip patch link: https://lore.kernel.org/r/6fc335ec79f163b7a612af012ce07be6d98f2ef9.1675849634.git.jani.nikula%40intel.com patch subject: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs config: x86_64-randconfig-a002-20230206 (https://download.01.org/0day-ci/archive/20230208/[email protected]/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/3be1dad7406a8c767260601b10af82797025aae3
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jani-Nikula/drm-i915-move-memory-frequency-detection-to-intel_dram-c/20230208-175057 git checkout 3be1dad7406a8c767260601b10af82797025aae3
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/i9xx_wm.c:3824:6: warning: no previous prototype for function 'ilk_wm_get_hw_state' [-Wmissing-prototypes]
void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
^ drivers/gpu/drm/i915/display/i9xx_wm.c:3824:1: note: declare 'static' if the function is not intended to be used outside of this translation unit void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
^
static
1 warning generated.
vim +/ilk_wm_get_hw_state +3824 drivers/gpu/drm/i915/display/i9xx_wm.c
f21b5d6fc26440 Jani Nikula 2023-02-08 3823
f21b5d6fc26440 Jani Nikula 2023-02-08 @3824 void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
f21b5d6fc26440 Jani Nikula 2023-02-08 3825 {
f21b5d6fc26440 Jani Nikula 2023-02-08 3826 struct ilk_wm_values *hw = &dev_priv->display.wm.hw;
f21b5d6fc26440 Jani Nikula 2023-02-08 3827 struct intel_crtc *crtc;
f21b5d6fc26440 Jani Nikula 2023-02-08 3828
f21b5d6fc26440 Jani Nikula 2023-02-08 3829 ilk_init_lp_watermarks(dev_priv);
f21b5d6fc26440 Jani Nikula 2023-02-08 3830
f21b5d6fc26440 Jani Nikula 2023-02-08 3831 for_each_intel_crtc(&dev_priv->drm, crtc)
f21b5d6fc26440 Jani Nikula 2023-02-08 3832 ilk_pipe_wm_get_hw_state(crtc);
f21b5d6fc26440 Jani Nikula 2023-02-08 3833
f21b5d6fc26440 Jani Nikula 2023-02-08 3834 hw->wm_lp[0] = intel_uncore_read(&dev_priv->uncore, WM1_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3835 hw->wm_lp[1] = intel_uncore_read(&dev_priv->uncore, WM2_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3836 hw->wm_lp[2] = intel_uncore_read(&dev_priv->uncore, WM3_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3837
f21b5d6fc26440 Jani Nikula 2023-02-08 3838 hw->wm_lp_spr[0] = intel_uncore_read(&dev_priv->uncore, WM1S_LP_ILK);
f21b5d6fc26440 Jani Nikula 2023-02-08 3839 if (DISPLAY_VER(dev_priv) >= 7) {
f21b5d6fc26440 Jani Nikula 2023-02-08 3840 hw->wm_lp_spr[1] = intel_uncore_read(&dev_priv->uncore, WM2S_LP_IVB);
f21b5d6fc26440 Jani Nikula 2023-02-08 3841 hw->wm_lp_spr[2] = intel_uncore_read(&dev_priv->uncore, WM3S_LP_IVB);
f21b5d6fc26440 Jani Nikula 2023-02-08 3842 }
f21b5d6fc26440 Jani Nikula 2023-02-08 3843
f21b5d6fc26440 Jani Nikula 2023-02-08 3844 if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
f21b5d6fc26440 Jani Nikula 2023-02-08 3845 hw->partitioning = (intel_uncore_read(&dev_priv->uncore, WM_MISC) &
f21b5d6fc26440 Jani Nikula 2023-02-08 3846 WM_MISC_DATA_PARTITION_5_6) ?
f21b5d6fc26440 Jani Nikula 2023-02-08 3847 INTEL_DDB_PART_5_6 : INTEL_DDB_PART_1_2;
f21b5d6fc26440 Jani Nikula 2023-02-08 3848 else if (IS_IVYBRIDGE(dev_priv))
f21b5d6fc26440 Jani Nikula 2023-02-08 3849 hw->partitioning = (intel_uncore_read(&dev_priv->uncore, DISP_ARB_CTL2) &
f21b5d6fc26440 Jani Nikula 2023-02-08 3850 DISP_DATA_PARTITION_5_6) ?
f21b5d6fc26440 Jani Nikula 2023-02-08 3851 INTEL_DDB_PART_5_6 : INTEL_DDB_PART_1_2;
f21b5d6fc26440 Jani Nikula 2023-02-08 3852
f21b5d6fc26440 Jani Nikula 2023-02-08 3853 hw->enable_fbc_wm =
f21b5d6fc26440 Jani Nikula 2023-02-08 3854 !(intel_uncore_read(&dev_priv->uncore, DISP_ARB_CTL) & DISP_FBC_WM_DIS);
f21b5d6fc26440 Jani Nikula 2023-02-08 3855 }
f21b5d6fc26440 Jani Nikula 2023-02-08 3856 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/wm: legacy watermark code shuffling
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/wm: legacy watermark code shuffling
URL : https://patchwork.freedesktop.org/series/113775/
State : failure
== Summary ==
Error: make failed
CALL scripts/checksyscalls.sh
DESCEND objtool
CC [M] drivers/gpu/drm/i915/display/i9xx_wm.odrivers/gpu/drm/i915/display/i9xx_wm.c:3839:6: error: no previous prototype for ‘ilk_wm_get_hw_state’ [-Werror=missing-prototypes]
3839 | void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv)
| ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[5]: *** [scripts/Makefile.build:252: drivers/gpu/drm/i915/display/i9xx_wm.o] Error 1 make[4]: *** [scripts/Makefile.build:504: drivers/gpu/drm/i915] Error 2 make[3]: *** [scripts/Makefile.build:504: drivers/gpu/drm] Error 2
make[2]: *** [scripts/Makefile.build:504: drivers/gpu] Error 2
make[1]: *** [scripts/Makefile.build:504: drivers] Error 2
make: *** [Makefile:2021: .] Error 2
Re: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs
In reply to Jani NikulaQuoted 6 lines · Jani Nikula
Get rid of the if ladder in
intel_modeset_setup_hw_state()and hide a number of functions by adding a .get_hw_state() hook to watermark functions. At least for now, combine the platform specific sanitization to the hw state readouts on the relevant platforms instead of adding a separate hook for that.
Quoted 6 lines
There's a functional change on PCH split platforms: If
i9xx_wm_init()fails to read plane latency and chooses the nop functions,ilk_wm_get_hw_state()won't get called for readout. Add theilk_init_lp_watermarks()call on that path which now won't be called in .get_hw_state(), as it looks like the only thing that could make a difference.
That ilk+ nop_funcs stuff is just nonsense. We should just simply nuke it.
Quoted 253 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_wm.c | 24 +++++++++++++++---- drivers/gpu/drm/i915/display/i9xx_wm.h | 5 ---- .../gpu/drm/i915/display/intel_display_core.h | 1 + .../drm/i915/display/intel_modeset_setup.c | 14 ++--------- drivers/gpu/drm/i915/display/intel_wm.c | 6 +++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + drivers/gpu/drm/i915/display/skl_watermark.c | 11 +++++++-- drivers/gpu/drm/i915/display/skl_watermark.h | 3 --- 8 files changed, 39 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +20
-4@@ -3505,7 +3505,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv,#undef _FW_WM#undef _FW_WM_VLV -void g4x_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void g4x_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct g4x_wm_values *wm = &dev_priv->display.wm.g4x;struct intel_crtc *crtc;@@ -3598,7 +3598,7 @@ void g4x_wm_get_hw_state(struct drm_i915_private *dev_priv) str_yes_no(wm->fbc_en)); } -void g4x_wm_sanitize (struct drm_i915_private *dev_priv) +static void g4x_wm_sanitize (struct drm_i915_private *dev_priv) {struct intel_plane *plane;struct intel_crtc *crtc;@@ -3647,7 +3647,13 @@ void g4x_wm_sanitize(struct drm_i915_private *dev_priv)mutex_unlock (&dev_priv->display.wm.wm_mutex); } -void vlv_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void g4x_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +g4x_wm_get_hw_state (i915); +g4x_wm_sanitize (i915); +} + +static void vlv_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct vlv_wm_values *wm = &dev_priv->display.wm.vlv;struct intel_crtc *crtc;@@ -3747,7 +3753,7 @@ void vlv_wm_get_hw_state(struct drm_i915_private *dev_priv) wm->sr.plane, wm->sr.cursor, wm->level, wm->cxsr); } -void vlv_wm_sanitize (struct drm_i915_private *dev_priv) +static void vlv_wm_sanitize (struct drm_i915_private *dev_priv) {struct intel_plane *plane;struct intel_crtc *crtc;@@ -3793,6 +3799,12 @@ void vlv_wm_sanitize(struct drm_i915_private *dev_priv)mutex_unlock (&dev_priv->display.wm.wm_mutex); } +static void vlv_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +vlv_wm_get_hw_state (i915); +vlv_wm_sanitize (i915); +} +/* * FIXME should probably kill this and improve * the real watermark readout/sanitation instead @@ -3847,6 +3859,7 @@ static const struct intel_wm_funcs ilk_wm_funcs = { .compute_intermediate_wm = ilk_compute_intermediate_wm, .initial_watermarks = ilk_initial_watermarks, .optimize_watermarks = ilk_optimize_watermarks, + .get_hw_state = ilk_wm_get_hw_state, };static const struct intel_wm_funcs vlv_wm_funcs = {@@ -3855,6 +3868,7 @@ static const struct intel_wm_funcs vlv_wm_funcs = { .initial_watermarks = vlv_initial_watermarks, .optimize_watermarks = vlv_optimize_watermarks, .atomic_update_watermarks = vlv_atomic_update_fifo, + .get_hw_state = vlv_wm_get_hw_state_and_sanitize, };static const struct intel_wm_funcs g4x_wm_funcs = {@@ -3862,6 +3876,7 @@ static const struct intel_wm_funcs g4x_wm_funcs = { .compute_intermediate_wm = g4x_compute_intermediate_wm, .initial_watermarks = g4x_initial_watermarks, .optimize_watermarks = g4x_optimize_watermarks, + .get_hw_state = g4x_wm_get_hw_state_and_sanitize, };static const struct intel_wm_funcs pnv_wm_funcs = {@@ -3895,6 +3910,7 @@ void i9xx_wm_init(struct drm_i915_private *dev_priv) dev_priv->display.wm.spr_latency[0] && dev_priv->display.wm.cur_latency[0])) { dev_priv->display.funcs.wm = &ilk_wm_funcs; } else { +ilk_init_lp_watermarks (dev_priv);drm_dbg_kms (&dev_priv->drm,"Failed to read display plane latency. " "Disable CxSR\n" );drivers/gpu/drm/i915/display/i9xx_wm.h +0
-5@@ -13,11 +13,6 @@ struct intel_crtc_state;struct intel_plane_state ;int ilk_wm_max_level (const struct drm_i915_private *i915); -void g4x_wm_get_hw_state (struct drm_i915_private *i915); -void vlv_wm_get_hw_state (struct drm_i915_private *i915); -void ilk_wm_get_hw_state (struct drm_i915_private *i915); -void g4x_wm_sanitize (struct drm_i915_private *i915); -void vlv_wm_sanitize (struct drm_i915_private *i915);bool ilk_disable_lp_wm (struct drm_i915_private *i915);bool intel_set_memory_cxsr (struct drm_i915_private *i915,bool enable);void i9xx_wm_init (struct drm_i915_private *i915);drivers/gpu/drm/i915/display/intel_display_core.h +1
-0@@ -85,6 +85,7 @@ struct intel_wm_funcs {void (*optimize_watermarks)(struct intel_atomic_state *state,struct intel_crtc *crtc);int (*compute_global_watermarks)(struct intel_atomic_state *state); +void (*get_hw_state)(struct drm_i915_private *i915); };struct intel_audio_state {drivers/gpu/drm/i915/display/intel_modeset_setup.c +2
-12@@ -25,6 +25,7 @@#include "intel_modeset_setup.h" #include "intel_pch_display.h" #include "intel_pm.h" +#include "intel_wm.h" #include "skl_watermark.h" static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,@@ -724,18 +725,7 @@ void intel_modeset_setup_hw_state(struct drm_i915_private *i915,intel_dpll_sanitize_state (i915); -if (IS_G4X (i915)) { -g4x_wm_get_hw_state (i915); -g4x_wm_sanitize (i915); - }else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) { -vlv_wm_get_hw_state (i915); -vlv_wm_sanitize (i915); - }else if (DISPLAY_VER (i915) >=9 ) { -skl_wm_get_hw_state (i915); -skl_wm_sanitize (i915); - }else if (HAS_PCH_SPLIT (i915)) { -ilk_wm_get_hw_state (i915); - } +intel_wm_get_hw_state (i915);for_each_intel_crtc (&i915->drm, crtc) { struct intel_crtc_state *crtc_state =drivers/gpu/drm/i915/display/intel_wm.c +6
-0@@ -114,6 +114,12 @@ int intel_compute_global_watermarks(struct intel_atomic_state *state)return 0 ; } +void intel_wm_get_hw_state (struct drm_i915_private *i915) +{ +if (i915->display.funcs.wm->get_hw_state) +return i915->display.funcs.wm->get_hw_state (i915); +} +bool intel_wm_plane_visible (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state) {drivers/gpu/drm/i915/display/intel_wm.h +1
-0@@ -26,6 +26,7 @@ void intel_atomic_update_watermarks(struct intel_atomic_state *state,void intel_optimize_watermarks (struct intel_atomic_state *state,struct intel_crtc *crtc);int intel_compute_global_watermarks (struct intel_atomic_state *state); +void intel_wm_get_hw_state (struct drm_i915_private *i915);bool intel_wm_plane_visible (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); void intel_print_wm_latency(struct drm_i915_private *i915,drivers/gpu/drm/i915/display/skl_watermark.c +9
-2@@ -2861,7 +2861,7 @@ static void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, } } -void skl_wm_get_hw_state (struct drm_i915_private *i915) +static void skl_wm_get_hw_state (struct drm_i915_private *i915) {struct intel_dbuf_state *dbuf_state =to_intel_dbuf_state (i915->display.dbuf.obj.state);@@ -2961,7 +2961,7 @@ static bool skl_dbuf_is_misconfigured(struct drm_i915_private *i915)return false; } -void skl_wm_sanitize (struct drm_i915_private *i915) +static void skl_wm_sanitize (struct drm_i915_private *i915) {struct intel_crtc *crtc;@@ -2997,6 +2997,12 @@ void skl_wm_sanitize(struct drm_i915_private *i915) } } +static void skl_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +skl_wm_get_hw_state (i915); +skl_wm_sanitize (i915); +} +void intel_wm_state_verify (struct intel_crtc *crtc,struct intel_crtc_state *new_crtc_state) {@@ -3269,6 +3275,7 @@ static void skl_setup_wm_latency(struct drm_i915_private *i915)static const struct intel_wm_funcs skl_wm_funcs = { .compute_global_watermarks = skl_compute_wm, + .get_hw_state = skl_wm_get_hw_state_and_sanitize, };void skl_wm_init (struct drm_i915_private *i915)drivers/gpu/drm/i915/display/skl_watermark.h +0
-3@@ -38,9 +38,6 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb,const struct skl_ddb_entry *entries, int num_entries, int ignore_idx); -void skl_wm_get_hw_state (struct drm_i915_private *i915); -void skl_wm_sanitize (struct drm_i915_private *i915); -void intel_wm_state_verify (struct intel_crtc *crtc,struct intel_crtc_state *new_crtc_state);Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel
Re: [Intel-gfx] [PATCH 01/10] drm/i915: move memory frequency detection to intel_dram.c
In reply to Jani NikulaQuoted 334 lines · Jani Nikula
The memory frequency detection is a bit spread out here and there. Consolidate to
intel_dram.c.Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/gt/intel_rps.c | 29 ----- drivers/gpu/drm/i915/intel_pm.c | 101 ---------------- drivers/gpu/drm/i915/soc/intel_dram.c | 158 +++++++++++++++++++++++++- 3 files changed, 157 insertions(+), 131 deletions(-)drivers/gpu/drm/i915/gt/intel_rps.c +0
-29@@ -1677,7 +1677,6 @@ static void vlv_init_gpll_ref_freq(struct intel_rps *rps)static void vlv_rps_init (struct intel_rps *rps) {struct drm_i915_private *i915 =rps_to_i915 (rps); -u32 val; vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT) |@@ -1686,21 +1685,6 @@ static void vlv_rps_init(struct intel_rps *rps)vlv_init_gpll_ref_freq (rps); - val =vlv_punit_read (i915,PUNIT_REG_GPU_FREQ_STS ); -switch ((val >>6 ) &3 ) { -case 0 : -case 1 : - i915->mem_freq =800 ; -break ; -case 2 : - i915->mem_freq =1066 ; -break ; -case 3 : - i915->mem_freq =1333 ; -break ; - } -drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); - rps->max_freq =vlv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; drm_dbg(&i915->drm, "max GPU freq: %d MHz (%u)\n",@@ -1727,7 +1711,6 @@ static void vlv_rps_init(struct intel_rps *rps)static void chv_rps_init (struct intel_rps *rps) {struct drm_i915_private *i915 =rps_to_i915 (rps); -u32 val; vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT) |@@ -1736,18 +1719,6 @@ static void chv_rps_init(struct intel_rps *rps)vlv_init_gpll_ref_freq (rps); - val =vlv_cck_read (i915,CCK_FUSE_REG ); - -switch ((val >>2 ) &0x7 ) { -case 3 : - i915->mem_freq =2000 ; -break ; -default : - i915->mem_freq =1600 ; -break ; - } -drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); - rps->max_freq =chv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; drm_dbg(&i915->drm, "max GPU freq: %d MHz (%u)\n",drivers/gpu/drm/i915/intel_pm.c +0
-101@@ -131,101 +131,6 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv) PWM1_GATING_DIS | PWM2_GATING_DIS); } -static void pnv_get_mem_freq (struct drm_i915_private *dev_priv) -{ -u32 tmp; - - tmp =intel_uncore_read (&dev_priv->uncore,CLKCFG ); - -switch (tmp &CLKCFG_FSB_MASK ) { -case CLKCFG_FSB_533 : - dev_priv->fsb_freq =533 ;/* 133*4 */ -break ; -case CLKCFG_FSB_800 : - dev_priv->fsb_freq =800 ;/* 200*4 */ -break ; -case CLKCFG_FSB_667 : - dev_priv->fsb_freq =667 ;/* 167*4 */ -break ; -case CLKCFG_FSB_400 : - dev_priv->fsb_freq =400 ;/* 100*4 */ -break ; - } - -switch (tmp &CLKCFG_MEM_MASK ) { -case CLKCFG_MEM_533 : - dev_priv->mem_freq =533 ; -break ; -case CLKCFG_MEM_667 : - dev_priv->mem_freq =667 ; -break ; -case CLKCFG_MEM_800 : - dev_priv->mem_freq =800 ; -break ; - } - -/* detect pineview DDR3 setting */ - tmp =intel_uncore_read (&dev_priv->uncore,CSHRDDR3CTL ); - dev_priv->is_ddr3 = (tmp &CSHRDDR3CTL_DDR3 ) ?1 :0 ; -} - -static void ilk_get_mem_freq (struct drm_i915_private *dev_priv) -{ -u16 ddrpll, csipll; - - ddrpll =intel_uncore_read16 (&dev_priv->uncore,DDRMPLL1 ); - csipll =intel_uncore_read16 (&dev_priv->uncore,CSIPLL0 ); - -switch (ddrpll &0xff ) { -case 0xc : - dev_priv->mem_freq =800 ; -break ; -case 0x10 : - dev_priv->mem_freq =1066 ; -break ; -case 0x14 : - dev_priv->mem_freq =1333 ; -break ; -case 0x18 : - dev_priv->mem_freq =1600 ; -break ; -default : -drm_dbg (&dev_priv->drm,"unknown memory frequency 0x%02x\n" , - ddrpll &0xff ); - dev_priv->mem_freq =0 ; -break ; - } - -switch (csipll &0x3ff ) { -case 0x00c : - dev_priv->fsb_freq =3200 ; -break ; -case 0x00e : - dev_priv->fsb_freq =3733 ; -break ; -case 0x010 : - dev_priv->fsb_freq =4266 ; -break ; -case 0x012 : - dev_priv->fsb_freq =4800 ; -break ; -case 0x014 : - dev_priv->fsb_freq =5333 ; -break ; -case 0x016 : - dev_priv->fsb_freq =5866 ; -break ; -case 0x018 : - dev_priv->fsb_freq =6400 ; -break ; -default : -drm_dbg (&dev_priv->drm,"unknown fsb frequency 0x%04x\n" , - csipll &0x3ff ); - dev_priv->fsb_freq =0 ; -break ; - } -} -static const struct cxsr_latency cxsr_latency_table[] = { {1 ,0 ,800 ,400 ,3382 ,33382 ,3983 ,33983 },/* DDR2-400 SC */ {1 ,0 ,800 ,667 ,3354 ,33354 ,3807 ,33807 },/* DDR2-667 SC */ @@ -4909,12 +4814,6 @@ void intel_init_pm(struct drm_i915_private *dev_priv)return ; } -/* For cxsr */ -if (IS_PINEVIEW (dev_priv)) -pnv_get_mem_freq (dev_priv); -else if (GRAPHICS_VER (dev_priv) ==5 ) -ilk_get_mem_freq (dev_priv); -/* For FIFO watermark updates */ if (HAS_PCH_SPLIT (dev_priv)) {ilk_setup_wm_latency (dev_priv);drivers/gpu/drm/i915/soc/intel_dram.c +128
-0@@ -10,6 +10,7 @@#include "intel_dram.h" #include "intel_mchbar_regs.h" #include "intel_pcode.h" +#include "vlv_sideband.h" struct dram_dimm_info {u16 size;@@ -42,6 +43,156 @@ static const char *intel_dram_type_str(enum intel_dram_type type)#undef DRAM_TYPE_STR +static void pnv_detect_mem_freq (struct drm_i915_private *dev_priv) +{ +u32 tmp; + + tmp =intel_uncore_read (&dev_priv->uncore,CLKCFG ); + +switch (tmp &CLKCFG_FSB_MASK ) { +case CLKCFG_FSB_533 : + dev_priv->fsb_freq =533 ;/* 133*4 */ +break ; +case CLKCFG_FSB_800 : + dev_priv->fsb_freq =800 ;/* 200*4 */ +break ; +case CLKCFG_FSB_667 : + dev_priv->fsb_freq =667 ;/* 167*4 */ +break ; +case CLKCFG_FSB_400 : + dev_priv->fsb_freq =400 ;/* 100*4 */ +break ; + } + +switch (tmp &CLKCFG_MEM_MASK ) { +case CLKCFG_MEM_533 : + dev_priv->mem_freq =533 ; +break ; +case CLKCFG_MEM_667 : + dev_priv->mem_freq =667 ; +break ; +case CLKCFG_MEM_800 : + dev_priv->mem_freq =800 ; +break ; + } + +/* detect pineview DDR3 setting */ + tmp =intel_uncore_read (&dev_priv->uncore,CSHRDDR3CTL ); + dev_priv->is_ddr3 = (tmp &CSHRDDR3CTL_DDR3 ) ?1 :0 ; +} + +static void ilk_detect_mem_freq (struct drm_i915_private *dev_priv) +{ +u16 ddrpll, csipll; + + ddrpll =intel_uncore_read16 (&dev_priv->uncore,DDRMPLL1 ); +switch (ddrpll &0xff ) { +case 0xc : + dev_priv->mem_freq =800 ; +break ; +case 0x10 : + dev_priv->mem_freq =1066 ; +break ; +case 0x14 : + dev_priv->mem_freq =1333 ; +break ; +case 0x18 : + dev_priv->mem_freq =1600 ; +break ; +default : +drm_dbg (&dev_priv->drm,"unknown memory frequency 0x%02x\n" , + ddrpll &0xff ); + dev_priv->mem_freq =0 ; +break ; + } + + csipll =intel_uncore_read16 (&dev_priv->uncore,CSIPLL0 ); +switch (csipll &0x3ff ) { +case 0x00c : + dev_priv->fsb_freq =3200 ; +break ; +case 0x00e : + dev_priv->fsb_freq =3733 ; +break ; +case 0x010 : + dev_priv->fsb_freq =4266 ; +break ; +case 0x012 : + dev_priv->fsb_freq =4800 ; +break ; +case 0x014 : + dev_priv->fsb_freq =5333 ; +break ; +case 0x016 : + dev_priv->fsb_freq =5866 ; +break ; +case 0x018 : + dev_priv->fsb_freq =6400 ; +break ; +default : +drm_dbg (&dev_priv->drm,"unknown fsb frequency 0x%04x\n" , + csipll &0x3ff ); + dev_priv->fsb_freq =0 ; +break ; + } +} + +static void chv_detect_mem_freq (struct drm_i915_private *i915) +{ +u32 val; + +vlv_iosf_sb_get (i915,BIT (VLV_IOSF_SB_CCK )); + val =vlv_cck_read (i915,CCK_FUSE_REG ); +vlv_iosf_sb_put (i915,BIT (VLV_IOSF_SB_CCK )); + +switch ((val >>2 ) &0x7 ) { +case 3 : + i915->mem_freq =2000 ; +break ; +default : + i915->mem_freq =1600 ; +break ; + } +} + +static void vlv_detect_mem_freq (struct drm_i915_private *i915) +{ +u32 val; + +vlv_iosf_sb_get (i915,BIT (VLV_IOSF_SB_PUNIT )); + val =vlv_punit_read (i915,PUNIT_REG_GPU_FREQ_STS ); +vlv_iosf_sb_put (i915,BIT (VLV_IOSF_SB_PUNIT )); + +switch ((val >>6 ) &3 ) { +case 0 : +case 1 : + i915->mem_freq =800 ; +break ; +case 2 : + i915->mem_freq =1066 ;
drivers/gpu/drm/i915/soc/intel_dram.c static const char *intel_dram_type_str(enum intel_dram_type type) · line 182
Quoted 10 lines
drivers/gpu/drm/i915/soc/intel_dram.c +10
-0+break ; +case 3 : + i915->mem_freq =1333 ; +break ; + } +} + +static void detect_mem_freq (struct drm_i915_private *i915) +{ +/* For cxsr */
Not true for all the platforms...
Quoted 17 lines
drivers/gpu/drm/i915/soc/intel_dram.c +13
-0+if (IS_PINEVIEW (i915)) +pnv_detect_mem_freq (i915); +else if (GRAPHICS_VER (i915) ==5 ) +ilk_detect_mem_freq (i915); +else if (IS_CHERRYVIEW (i915)) +chv_detect_mem_freq (i915); +else if (IS_VALLEYVIEW (i915)) +vlv_detect_mem_freq (i915); + +if (i915->mem_freq) +drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); +} +static int intel_dimm_num_devices (const struct dram_dimm_info *dimm) {return dimm->ranks *64 / (dimm->width ?:1 );
drivers/gpu/drm/i915/soc/intel_dram.c void intel_dram_detect(struct drm_i915_private *i915) · line 662
Quoted 6 lines
drivers/gpu/drm/i915/soc/intel_dram.c +2
-1@@ -507,8 +658,13 @@ void intel_dram_detect(struct drm_i915_private *i915)struct dram_info *dram_info = &i915->dram_info;int ret; -if (GRAPHICS_VER (i915) <9 ||IS_DG2 (i915) || !HAS_DISPLAY (i915)) +if (!HAS_DISPLAY (i915) ||IS_DG2 (i915)) +return ;
...which also means doing the HAS_DISPLAY check befoae detect_mem_freq() is kinda wrong.
I suppose we don't have any !HAS_DISPLAY stuff on these platforms, but would seem better to be consistent anyway.
Quoted 10 lines
drivers/gpu/drm/i915/soc/intel_dram.c +4
-0+ +if (GRAPHICS_VER (i915) <9 ) { +detect_mem_freq (i915);return ; + }/* * Assume level 0 watermark latency adjustment is needed until proven Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel
Re: [Intel-gfx] [PATCH 02/10] drm/i915/wm: move remaining watermark code out of intel_pm.c
In reply to Jani NikulaQuoted 12 lines · Jani Nikula
drivers/gpu/drm/i915/intel_pm.c +3
-3- +static void gen9_init_clock_gating (struct drm_i915_private *dev_priv) +{ +if (HAS_LLC (dev_priv)) {/* -* Always set WM_LP_SPRITE_EN when spr_val != 0, even if the -* level is disabled. Doing otherwise could cause underruns.
drivers/gpu/drm/i915/intel_pm.c struct drm_i915_clock_gating_funcs { · line 3235
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +5
-4+* WaCompressedResourceDisplayNewHashMode:skl,kbl +* Display WA #0390: skl,kbl +* +* Must match Sampler, Pixel Back End, and Media. See +* WaCompressedResourceSamplerPbeMediaNewHashMode. */ -if (DISPLAY_VER (dev_priv) <=6 && r->spr_val) { -drm_WARN_ON (&dev_priv->drm, wm_lp !=1 ); - results->wm_lp_spr[wm_lp -1 ] |=WM_LP_SPRITE_ENABLE ; - }
git diff screwed up was some of the untouched stuff got reordered? Maybe --patience helps?
Signature · 2 lines
Ville Syrjälä Intel
Re: [Intel-gfx] [PATCH 07/10] drm/i915/wm: add *_wm_num_levels() functions
In reply to Jani NikulaQuoted 6 lines · Jani Nikula
Add
intel_wm_num_levels(),i9xx_wm_num_levels()andskl_wm_num_levels()functions.There's a difference between
i9xx_wm_num_levels()andg4x_wm_num_levels(), but leave that unresolved for now to avoid functional changes.
Uff. I guess I should resurrect
https://patchwork.freedesktop.org/series/50802/
Quoted 161 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_wm.c | 17 +++++++++++++++++ drivers/gpu/drm/i915/display/i9xx_wm.h | 1 + .../drm/i915/display/intel_display_debugfs.c | 19 +++---------------- drivers/gpu/drm/i915/display/intel_wm.c | 8 ++++++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + drivers/gpu/drm/i915/display/skl_watermark.c | 8 ++++++++ drivers/gpu/drm/i915/display/skl_watermark.h | 1 + 7 files changed, 39 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +17
-0@@ -2684,6 +2684,23 @@ int ilk_wm_max_level(const struct drm_i915_private *dev_priv)return 2 ; } +/* FIXME: reconcile the difference with g4x_wm_num_levels() */ +int i9xx_wm_num_levels (const struct drm_i915_private *i915) +{ +int num_levels; + +if (IS_CHERRYVIEW (i915)) + num_levels =3 ; +else if (IS_VALLEYVIEW (i915)) + num_levels =1 ; +else if (IS_G4X (i915)) + num_levels =3 ; +else + num_levels =ilk_wm_max_level (i915) +1 ; + +return num_levels; +} +static bool ilk_increase_wm_latency (struct drm_i915_private *dev_priv,u16 wm[5 ],u16 min) {drivers/gpu/drm/i915/display/i9xx_wm.h +1
-0@@ -13,6 +13,7 @@ struct intel_crtc_state;struct intel_plane_state ;int ilk_wm_max_level (const struct drm_i915_private *i915); +int i9xx_wm_num_levels (const struct drm_i915_private *i915);bool ilk_disable_lp_wm (struct drm_i915_private *i915);bool intel_set_memory_cxsr (struct drm_i915_private *i915,bool enable);void i9xx_wm_init (struct drm_i915_private *i915);drivers/gpu/drm/i915/display/intel_display_debugfs.c +3
-16@@ -30,6 +30,7 @@#include "intel_pm.h" #include "intel_psr.h" #include "intel_sprite.h" +#include "intel_wm.h" #include "skl_watermark.h" static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node)@@ -1289,14 +1290,7 @@ static void wm_latency_show(struct seq_file *m, const u16 wm[8])int level;int num_levels; -if (IS_CHERRYVIEW (dev_priv)) - num_levels =3 ; -else if (IS_VALLEYVIEW (dev_priv)) - num_levels =1 ; -else if (IS_G4X (dev_priv)) - num_levels =3 ; -else - num_levels =ilk_wm_max_level (dev_priv) +1 ; + num_levels =intel_wm_num_levels (dev_priv);drm_modeset_lock_all (&dev_priv->drm);@@ -1408,14 +1402,7 @@ static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,int ret;char tmp[32 ]; -if (IS_CHERRYVIEW (dev_priv)) - num_levels =3 ; -else if (IS_VALLEYVIEW (dev_priv)) - num_levels =1 ; -else if (IS_G4X (dev_priv)) - num_levels =3 ; -else - num_levels =ilk_wm_max_level (dev_priv) +1 ; + num_levels =intel_wm_num_levels (dev_priv);if (len >=sizeof (tmp))return -EINVAL ;drivers/gpu/drm/i915/display/intel_wm.c +8
-0@@ -292,6 +292,14 @@ void intel_wm_sanitize(struct drm_i915_private *dev_priv)drm_modeset_acquire_fini (&ctx); } +int intel_wm_num_levels (const struct drm_i915_private *i915) +{ +if (DISPLAY_VER (i915) >=9 ) +return skl_wm_num_levels (i915); +else +return i9xx_wm_num_levels (i915); +} +void intel_wm_init (struct drm_i915_private *i915) {if (DISPLAY_VER (i915) >=9 )drivers/gpu/drm/i915/display/intel_wm.h +1
-0@@ -32,6 +32,7 @@ bool intel_wm_plane_visible(const struct intel_crtc_state *crtc_state,void intel_print_wm_latency (struct drm_i915_private *i915,const char *name,const u16 wm[]);void intel_wm_sanitize (struct drm_i915_private *i915); +int intel_wm_num_levels (const struct drm_i915_private *i915);void intel_wm_init (struct drm_i915_private *i915);#endif /* __INTEL_WM_H__ */ drivers/gpu/drm/i915/display/skl_watermark.c +8
-0@@ -3278,6 +3278,14 @@ static const struct intel_wm_funcs skl_wm_funcs = { .get_hw_state = skl_wm_get_hw_state_and_sanitize, }; +int skl_wm_num_levels (const struct drm_i915_private *i915) +{ +if (HAS_HW_SAGV_WM (i915)) +return 6 ; +else +return 8 ; +} +void skl_wm_init (struct drm_i915_private *i915) {intel_sagv_init (i915);drivers/gpu/drm/i915/display/skl_watermark.h +1
-0@@ -46,6 +46,7 @@ void skl_watermark_ipc_update(struct drm_i915_private *i915);bool skl_watermark_ipc_enabled (struct drm_i915_private *i915);void skl_watermark_debugfs_register (struct drm_i915_private *i915); +int skl_wm_num_levels (const struct drm_i915_private *i915);void skl_wm_init (struct drm_i915_private *i915);struct intel_dbuf_state {Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel
Re: [Intel-gfx] [PATCH 01/10] drm/i915: move memory frequency detection to intel_dram.c
In reply to Ville SyrjäläQuoted 339 lines · Ville Syrjälä
Quoted 338 lines · Jani Nikula
The memory frequency detection is a bit spread out here and there. Consolidate to
intel_dram.c.Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/gt/intel_rps.c | 29 ----- drivers/gpu/drm/i915/intel_pm.c | 101 ---------------- drivers/gpu/drm/i915/soc/intel_dram.c | 158 +++++++++++++++++++++++++- 3 files changed, 157 insertions(+), 131 deletions(-)drivers/gpu/drm/i915/gt/intel_rps.c +0
-29@@ -1677,7 +1677,6 @@ static void vlv_init_gpll_ref_freq(struct intel_rps *rps)static void vlv_rps_init (struct intel_rps *rps) {struct drm_i915_private *i915 =rps_to_i915 (rps); -u32 val; vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT) |@@ -1686,21 +1685,6 @@ static void vlv_rps_init(struct intel_rps *rps)vlv_init_gpll_ref_freq (rps); - val =vlv_punit_read (i915,PUNIT_REG_GPU_FREQ_STS ); -switch ((val >>6 ) &3 ) { -case 0 : -case 1 : - i915->mem_freq =800 ; -break ; -case 2 : - i915->mem_freq =1066 ; -break ; -case 3 : - i915->mem_freq =1333 ; -break ; - } -drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); - rps->max_freq =vlv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; drm_dbg(&i915->drm, "max GPU freq: %d MHz (%u)\n",@@ -1727,7 +1711,6 @@ static void vlv_rps_init(struct intel_rps *rps)static void chv_rps_init (struct intel_rps *rps) {struct drm_i915_private *i915 =rps_to_i915 (rps); -u32 val; vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT) |@@ -1736,18 +1719,6 @@ static void chv_rps_init(struct intel_rps *rps)vlv_init_gpll_ref_freq (rps); - val =vlv_cck_read (i915,CCK_FUSE_REG ); - -switch ((val >>2 ) &0x7 ) { -case 3 : - i915->mem_freq =2000 ; -break ; -default : - i915->mem_freq =1600 ; -break ; - } -drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); - rps->max_freq =chv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; drm_dbg(&i915->drm, "max GPU freq: %d MHz (%u)\n",drivers/gpu/drm/i915/intel_pm.c +0
-101@@ -131,101 +131,6 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv) PWM1_GATING_DIS | PWM2_GATING_DIS); } -static void pnv_get_mem_freq (struct drm_i915_private *dev_priv) -{ -u32 tmp; - - tmp =intel_uncore_read (&dev_priv->uncore,CLKCFG ); - -switch (tmp &CLKCFG_FSB_MASK ) { -case CLKCFG_FSB_533 : - dev_priv->fsb_freq =533 ;/* 133*4 */ -break ; -case CLKCFG_FSB_800 : - dev_priv->fsb_freq =800 ;/* 200*4 */ -break ; -case CLKCFG_FSB_667 : - dev_priv->fsb_freq =667 ;/* 167*4 */ -break ; -case CLKCFG_FSB_400 : - dev_priv->fsb_freq =400 ;/* 100*4 */ -break ; - } - -switch (tmp &CLKCFG_MEM_MASK ) { -case CLKCFG_MEM_533 : - dev_priv->mem_freq =533 ; -break ; -case CLKCFG_MEM_667 : - dev_priv->mem_freq =667 ; -break ; -case CLKCFG_MEM_800 : - dev_priv->mem_freq =800 ; -break ; - } - -/* detect pineview DDR3 setting */ - tmp =intel_uncore_read (&dev_priv->uncore,CSHRDDR3CTL ); - dev_priv->is_ddr3 = (tmp &CSHRDDR3CTL_DDR3 ) ?1 :0 ; -} - -static void ilk_get_mem_freq (struct drm_i915_private *dev_priv) -{ -u16 ddrpll, csipll; - - ddrpll =intel_uncore_read16 (&dev_priv->uncore,DDRMPLL1 ); - csipll =intel_uncore_read16 (&dev_priv->uncore,CSIPLL0 ); - -switch (ddrpll &0xff ) { -case 0xc : - dev_priv->mem_freq =800 ; -break ; -case 0x10 : - dev_priv->mem_freq =1066 ; -break ; -case 0x14 : - dev_priv->mem_freq =1333 ; -break ; -case 0x18 : - dev_priv->mem_freq =1600 ; -break ; -default : -drm_dbg (&dev_priv->drm,"unknown memory frequency 0x%02x\n" , - ddrpll &0xff ); - dev_priv->mem_freq =0 ; -break ; - } - -switch (csipll &0x3ff ) { -case 0x00c : - dev_priv->fsb_freq =3200 ; -break ; -case 0x00e : - dev_priv->fsb_freq =3733 ; -break ; -case 0x010 : - dev_priv->fsb_freq =4266 ; -break ; -case 0x012 : - dev_priv->fsb_freq =4800 ; -break ; -case 0x014 : - dev_priv->fsb_freq =5333 ; -break ; -case 0x016 : - dev_priv->fsb_freq =5866 ; -break ; -case 0x018 : - dev_priv->fsb_freq =6400 ; -break ; -default : -drm_dbg (&dev_priv->drm,"unknown fsb frequency 0x%04x\n" , - csipll &0x3ff ); - dev_priv->fsb_freq =0 ; -break ; - } -} -static const struct cxsr_latency cxsr_latency_table[] = { {1 ,0 ,800 ,400 ,3382 ,33382 ,3983 ,33983 },/* DDR2-400 SC */ {1 ,0 ,800 ,667 ,3354 ,33354 ,3807 ,33807 },/* DDR2-667 SC */ @@ -4909,12 +4814,6 @@ void intel_init_pm(struct drm_i915_private *dev_priv)return ; } -/* For cxsr */ -if (IS_PINEVIEW (dev_priv)) -pnv_get_mem_freq (dev_priv); -else if (GRAPHICS_VER (dev_priv) ==5 ) -ilk_get_mem_freq (dev_priv); -/* For FIFO watermark updates */ if (HAS_PCH_SPLIT (dev_priv)) {ilk_setup_wm_latency (dev_priv);drivers/gpu/drm/i915/soc/intel_dram.c +132
-0@@ -10,6 +10,7 @@#include "intel_dram.h" #include "intel_mchbar_regs.h" #include "intel_pcode.h" +#include "vlv_sideband.h" struct dram_dimm_info {u16 size;@@ -42,6 +43,156 @@ static const char *intel_dram_type_str(enum intel_dram_type type)#undef DRAM_TYPE_STR +static void pnv_detect_mem_freq (struct drm_i915_private *dev_priv) +{ +u32 tmp; + + tmp =intel_uncore_read (&dev_priv->uncore,CLKCFG ); + +switch (tmp &CLKCFG_FSB_MASK ) { +case CLKCFG_FSB_533 : + dev_priv->fsb_freq =533 ;/* 133*4 */ +break ; +case CLKCFG_FSB_800 : + dev_priv->fsb_freq =800 ;/* 200*4 */ +break ; +case CLKCFG_FSB_667 : + dev_priv->fsb_freq =667 ;/* 167*4 */ +break ; +case CLKCFG_FSB_400 : + dev_priv->fsb_freq =400 ;/* 100*4 */ +break ; + } + +switch (tmp &CLKCFG_MEM_MASK ) { +case CLKCFG_MEM_533 : + dev_priv->mem_freq =533 ; +break ; +case CLKCFG_MEM_667 : + dev_priv->mem_freq =667 ; +break ; +case CLKCFG_MEM_800 : + dev_priv->mem_freq =800 ; +break ; + } + +/* detect pineview DDR3 setting */ + tmp =intel_uncore_read (&dev_priv->uncore,CSHRDDR3CTL ); + dev_priv->is_ddr3 = (tmp &CSHRDDR3CTL_DDR3 ) ?1 :0 ; +} + +static void ilk_detect_mem_freq (struct drm_i915_private *dev_priv) +{ +u16 ddrpll, csipll; + + ddrpll =intel_uncore_read16 (&dev_priv->uncore,DDRMPLL1 ); +switch (ddrpll &0xff ) { +case 0xc : + dev_priv->mem_freq =800 ; +break ; +case 0x10 : + dev_priv->mem_freq =1066 ; +break ; +case 0x14 : + dev_priv->mem_freq =1333 ; +break ; +case 0x18 : + dev_priv->mem_freq =1600 ; +break ; +default : +drm_dbg (&dev_priv->drm,"unknown memory frequency 0x%02x\n" , + ddrpll &0xff ); + dev_priv->mem_freq =0 ; +break ; + } + + csipll =intel_uncore_read16 (&dev_priv->uncore,CSIPLL0 ); +switch (csipll &0x3ff ) { +case 0x00c : + dev_priv->fsb_freq =3200 ; +break ; +case 0x00e : + dev_priv->fsb_freq =3733 ; +break ; +case 0x010 : + dev_priv->fsb_freq =4266 ; +break ; +case 0x012 : + dev_priv->fsb_freq =4800 ; +break ; +case 0x014 : + dev_priv->fsb_freq =5333 ; +break ; +case 0x016 : + dev_priv->fsb_freq =5866 ; +break ; +case 0x018 : + dev_priv->fsb_freq =6400 ; +break ; +default : +drm_dbg (&dev_priv->drm,"unknown fsb frequency 0x%04x\n" , + csipll &0x3ff ); + dev_priv->fsb_freq =0 ; +break ; + } +} + +static void chv_detect_mem_freq (struct drm_i915_private *i915) +{ +u32 val; + +vlv_iosf_sb_get (i915,BIT (VLV_IOSF_SB_CCK )); + val =vlv_cck_read (i915,CCK_FUSE_REG ); +vlv_iosf_sb_put (i915,BIT (VLV_IOSF_SB_CCK )); + +switch ((val >>2 ) &0x7 ) { +case 3 : + i915->mem_freq =2000 ; +break ; +default : + i915->mem_freq =1600 ; +break ; + } +} + +static void vlv_detect_mem_freq (struct drm_i915_private *i915) +{ +u32 val; + +vlv_iosf_sb_get (i915,BIT (VLV_IOSF_SB_PUNIT )); + val =vlv_punit_read (i915,PUNIT_REG_GPU_FREQ_STS ); +vlv_iosf_sb_put (i915,BIT (VLV_IOSF_SB_PUNIT )); + +switch ((val >>6 ) &3 ) { +case 0 : +case 1 : + i915->mem_freq =800 ; +break ; +case 2 : + i915->mem_freq =1066 ; +break ; +case 3 : + i915->mem_freq =1333 ; +break ;
Quoted 8 lines
drivers/gpu/drm/i915/soc/intel_dram.c static const char *intel_dram_type_str(enum intel_dram_type type) · line 182
Quoted 6 lines
drivers/gpu/drm/i915/soc/intel_dram.c +6
-0+ } +} + +static void detect_mem_freq (struct drm_i915_private *i915) +{ +/* For cxsr */ Not true for all the platforms...
Yeah, I think I'll just remove the comment altogether.
Quoted 28 lines
Quoted 18 lines
drivers/gpu/drm/i915/soc/intel_dram.c +13
-0+if (IS_PINEVIEW (i915)) +pnv_detect_mem_freq (i915); +else if (GRAPHICS_VER (i915) ==5 ) +ilk_detect_mem_freq (i915); +else if (IS_CHERRYVIEW (i915)) +chv_detect_mem_freq (i915); +else if (IS_VALLEYVIEW (i915)) +vlv_detect_mem_freq (i915); + +if (i915->mem_freq) +drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); +} +static int intel_dimm_num_devices (const struct dram_dimm_info *dimm) {return dimm->ranks *64 / (dimm->width ?:1 );drivers/gpu/drm/i915/soc/intel_dram.c void intel_dram_detect(struct drm_i915_private *i915) · line 662
Quoted 6 lines
drivers/gpu/drm/i915/soc/intel_dram.c +2
-1@@ -507,8 +658,13 @@ void intel_dram_detect(struct drm_i915_private *i915)struct dram_info *dram_info = &i915->dram_info;int ret; -if (GRAPHICS_VER (i915) <9 ||IS_DG2 (i915) || !HAS_DISPLAY (i915)) +if (!HAS_DISPLAY (i915) ||IS_DG2 (i915)) +return ;...which also means doing the
HAS_DISPLAYcheck befoaedetect_mem_freq()is kinda wrong.
Quoted 2 lines
I suppose we don't have any !HAS_DISPLAY stuff on these platforms, but would seem better to be consistent anyway.
Right. No harm in calling it unconditionally, really.
BR,
Jani.
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/i915/soc/intel_dram.c +4
-0+ +if (GRAPHICS_VER (i915) <9 ) { +detect_mem_freq (i915);return ; + }/* * Assume level 0 watermark latency adjustment is needed until proven Signature · 1 line
2.34.1
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 02/10] drm/i915/wm: move remaining watermark code out of intel_pm.c
In reply to Ville SyrjäläQuoted 18 lines · Ville Syrjälä
Quoted 17 lines · Jani Nikula
drivers/gpu/drm/i915/intel_pm.c +8
-3- +static void gen9_init_clock_gating (struct drm_i915_private *dev_priv) +{ +if (HAS_LLC (dev_priv)) {/* -* Always set WM_LP_SPRITE_EN when spr_val != 0, even if the -* level is disabled. Doing otherwise could cause underruns. +* WaCompressedResourceDisplayNewHashMode:skl,kbl +* Display WA #0390: skl,kbl +* +* Must match Sampler, Pixel Back End, and Media. See +* WaCompressedResourceSamplerPbeMediaNewHashMode. */
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c struct drm_i915_clock_gating_funcs { · line 3235
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +0
-4-if (DISPLAY_VER (dev_priv) <=6 && r->spr_val) { -drm_WARN_ON (&dev_priv->drm, wm_lp !=1 ); - results->wm_lp_spr[wm_lp -1 ] |=WM_LP_SPRITE_ENABLE ; - }git diff screwed up was some of the untouched stuff got reordered? Maybe --patience helps?
Locally --patience seems to do a nicer job, will use that for v2.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 04/10] drm/i915/wm: add .get_hw_state to watermark funcs
In reply to Ville SyrjäläQuoted 14 lines · Ville Syrjälä
Quoted 6 lines · Jani Nikula
Get rid of the if ladder in
intel_modeset_setup_hw_state()and hide a number of functions by adding a .get_hw_state() hook to watermark functions. At least for now, combine the platform specific sanitization to the hw state readouts on the relevant platforms instead of adding a separate hook for that.Quoted 6 lines
There's a functional change on PCH split platforms: If
i9xx_wm_init()fails to read plane latency and chooses the nop functions,ilk_wm_get_hw_state()won't get called for readout. Add theilk_init_lp_watermarks()call on that path which now won't be called in .get_hw_state(), as it looks like the only thing that could make a difference.
Quoted 2 lines
That ilk+
nop_funcsstuff is just nonsense. We should just simply nuke it.
Dates back to 2010 and commit 7f8a85698f5c ("drm/i915: Add the support of memory self-refresh on Ironlake"), with no explanations. The usual.
I'll add it on top. I mean remove from the top. Something.
BR,
Jani.
Quoted 254 lines
Quoted 254 lines
Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_wm.c | 24 +++++++++++++++---- drivers/gpu/drm/i915/display/i9xx_wm.h | 5 ---- .../gpu/drm/i915/display/intel_display_core.h | 1 + .../drm/i915/display/intel_modeset_setup.c | 14 ++--------- drivers/gpu/drm/i915/display/intel_wm.c | 6 +++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + drivers/gpu/drm/i915/display/skl_watermark.c | 11 +++++++-- drivers/gpu/drm/i915/display/skl_watermark.h | 3 --- 8 files changed, 39 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +20
-4@@ -3505,7 +3505,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv,#undef _FW_WM#undef _FW_WM_VLV -void g4x_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void g4x_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct g4x_wm_values *wm = &dev_priv->display.wm.g4x;struct intel_crtc *crtc;@@ -3598,7 +3598,7 @@ void g4x_wm_get_hw_state(struct drm_i915_private *dev_priv) str_yes_no(wm->fbc_en)); } -void g4x_wm_sanitize (struct drm_i915_private *dev_priv) +static void g4x_wm_sanitize (struct drm_i915_private *dev_priv) {struct intel_plane *plane;struct intel_crtc *crtc;@@ -3647,7 +3647,13 @@ void g4x_wm_sanitize(struct drm_i915_private *dev_priv)mutex_unlock (&dev_priv->display.wm.wm_mutex); } -void vlv_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void g4x_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +g4x_wm_get_hw_state (i915); +g4x_wm_sanitize (i915); +} + +static void vlv_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct vlv_wm_values *wm = &dev_priv->display.wm.vlv;struct intel_crtc *crtc;@@ -3747,7 +3753,7 @@ void vlv_wm_get_hw_state(struct drm_i915_private *dev_priv) wm->sr.plane, wm->sr.cursor, wm->level, wm->cxsr); } -void vlv_wm_sanitize (struct drm_i915_private *dev_priv) +static void vlv_wm_sanitize (struct drm_i915_private *dev_priv) {struct intel_plane *plane;struct intel_crtc *crtc;@@ -3793,6 +3799,12 @@ void vlv_wm_sanitize(struct drm_i915_private *dev_priv)mutex_unlock (&dev_priv->display.wm.wm_mutex); } +static void vlv_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +vlv_wm_get_hw_state (i915); +vlv_wm_sanitize (i915); +} +/* * FIXME should probably kill this and improve * the real watermark readout/sanitation instead @@ -3847,6 +3859,7 @@ static const struct intel_wm_funcs ilk_wm_funcs = { .compute_intermediate_wm = ilk_compute_intermediate_wm, .initial_watermarks = ilk_initial_watermarks, .optimize_watermarks = ilk_optimize_watermarks, + .get_hw_state = ilk_wm_get_hw_state, };static const struct intel_wm_funcs vlv_wm_funcs = {@@ -3855,6 +3868,7 @@ static const struct intel_wm_funcs vlv_wm_funcs = { .initial_watermarks = vlv_initial_watermarks, .optimize_watermarks = vlv_optimize_watermarks, .atomic_update_watermarks = vlv_atomic_update_fifo, + .get_hw_state = vlv_wm_get_hw_state_and_sanitize, };static const struct intel_wm_funcs g4x_wm_funcs = {@@ -3862,6 +3876,7 @@ static const struct intel_wm_funcs g4x_wm_funcs = { .compute_intermediate_wm = g4x_compute_intermediate_wm, .initial_watermarks = g4x_initial_watermarks, .optimize_watermarks = g4x_optimize_watermarks, + .get_hw_state = g4x_wm_get_hw_state_and_sanitize, };static const struct intel_wm_funcs pnv_wm_funcs = {@@ -3895,6 +3910,7 @@ void i9xx_wm_init(struct drm_i915_private *dev_priv) dev_priv->display.wm.spr_latency[0] && dev_priv->display.wm.cur_latency[0])) { dev_priv->display.funcs.wm = &ilk_wm_funcs; } else { +ilk_init_lp_watermarks (dev_priv);drm_dbg_kms (&dev_priv->drm,"Failed to read display plane latency. " "Disable CxSR\n" );drivers/gpu/drm/i915/display/i9xx_wm.h +0
-5@@ -13,11 +13,6 @@ struct intel_crtc_state;struct intel_plane_state ;int ilk_wm_max_level (const struct drm_i915_private *i915); -void g4x_wm_get_hw_state (struct drm_i915_private *i915); -void vlv_wm_get_hw_state (struct drm_i915_private *i915); -void ilk_wm_get_hw_state (struct drm_i915_private *i915); -void g4x_wm_sanitize (struct drm_i915_private *i915); -void vlv_wm_sanitize (struct drm_i915_private *i915);bool ilk_disable_lp_wm (struct drm_i915_private *i915);bool intel_set_memory_cxsr (struct drm_i915_private *i915,bool enable);void i9xx_wm_init (struct drm_i915_private *i915);drivers/gpu/drm/i915/display/intel_display_core.h +1
-0@@ -85,6 +85,7 @@ struct intel_wm_funcs {void (*optimize_watermarks)(struct intel_atomic_state *state,struct intel_crtc *crtc);int (*compute_global_watermarks)(struct intel_atomic_state *state); +void (*get_hw_state)(struct drm_i915_private *i915); };struct intel_audio_state {drivers/gpu/drm/i915/display/intel_modeset_setup.c +2
-12@@ -25,6 +25,7 @@#include "intel_modeset_setup.h" #include "intel_pch_display.h" #include "intel_pm.h" +#include "intel_wm.h" #include "skl_watermark.h" static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,@@ -724,18 +725,7 @@ void intel_modeset_setup_hw_state(struct drm_i915_private *i915,intel_dpll_sanitize_state (i915); -if (IS_G4X (i915)) { -g4x_wm_get_hw_state (i915); -g4x_wm_sanitize (i915); - }else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) { -vlv_wm_get_hw_state (i915); -vlv_wm_sanitize (i915); - }else if (DISPLAY_VER (i915) >=9 ) { -skl_wm_get_hw_state (i915); -skl_wm_sanitize (i915); - }else if (HAS_PCH_SPLIT (i915)) { -ilk_wm_get_hw_state (i915); - } +intel_wm_get_hw_state (i915);for_each_intel_crtc (&i915->drm, crtc) { struct intel_crtc_state *crtc_state =drivers/gpu/drm/i915/display/intel_wm.c +6
-0@@ -114,6 +114,12 @@ int intel_compute_global_watermarks(struct intel_atomic_state *state)return 0 ; } +void intel_wm_get_hw_state (struct drm_i915_private *i915) +{ +if (i915->display.funcs.wm->get_hw_state) +return i915->display.funcs.wm->get_hw_state (i915); +} +bool intel_wm_plane_visible (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state) {drivers/gpu/drm/i915/display/intel_wm.h +1
-0@@ -26,6 +26,7 @@ void intel_atomic_update_watermarks(struct intel_atomic_state *state,void intel_optimize_watermarks (struct intel_atomic_state *state,struct intel_crtc *crtc);int intel_compute_global_watermarks (struct intel_atomic_state *state); +void intel_wm_get_hw_state (struct drm_i915_private *i915);bool intel_wm_plane_visible (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); void intel_print_wm_latency(struct drm_i915_private *i915,drivers/gpu/drm/i915/display/skl_watermark.c +9
-2@@ -2861,7 +2861,7 @@ static void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, } } -void skl_wm_get_hw_state (struct drm_i915_private *i915) +static void skl_wm_get_hw_state (struct drm_i915_private *i915) {struct intel_dbuf_state *dbuf_state =to_intel_dbuf_state (i915->display.dbuf.obj.state);@@ -2961,7 +2961,7 @@ static bool skl_dbuf_is_misconfigured(struct drm_i915_private *i915)return false; } -void skl_wm_sanitize (struct drm_i915_private *i915) +static void skl_wm_sanitize (struct drm_i915_private *i915) {struct intel_crtc *crtc;@@ -2997,6 +2997,12 @@ void skl_wm_sanitize(struct drm_i915_private *i915) } } +static void skl_wm_get_hw_state_and_sanitize (struct drm_i915_private *i915) +{ +skl_wm_get_hw_state (i915); +skl_wm_sanitize (i915); +} +void intel_wm_state_verify (struct intel_crtc *crtc,struct intel_crtc_state *new_crtc_state) {@@ -3269,6 +3275,7 @@ static void skl_setup_wm_latency(struct drm_i915_private *i915)static const struct intel_wm_funcs skl_wm_funcs = { .compute_global_watermarks = skl_compute_wm, + .get_hw_state = skl_wm_get_hw_state_and_sanitize, };void skl_wm_init (struct drm_i915_private *i915)drivers/gpu/drm/i915/display/skl_watermark.h +0
-3@@ -38,9 +38,6 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb,const struct skl_ddb_entry *entries, int num_entries, int ignore_idx); -void skl_wm_get_hw_state (struct drm_i915_private *i915); -void skl_wm_sanitize (struct drm_i915_private *i915); -void intel_wm_state_verify (struct intel_crtc *crtc,struct intel_crtc_state *new_crtc_state);Signature · 1 line
2.34.1
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center