drm/i915/wm: legacy watermark code shuffling
Subsystems (3)
v2 cover drm/i915/wm: legacy watermark code shuffling
v2 of [1] rebased on top of Ville's watermark level count changes.
[1] https://patchwork.freedesktop.org/series/113775/
Jani Nikula (7):
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: 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 | 3938 ++++++++++++++++
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 | 218 +-
.../drm/i915/display/intel_display_types.h | 13 +-
.../drm/i915/display/intel_modeset_setup.c | 15 +-
drivers/gpu/drm/i915/display/intel_wm.c | 527 +++
drivers/gpu/drm/i915/display/intel_wm.h | 38 +
.../intel_wm_types.h} | 6 +-
drivers/gpu/drm/i915/display/skl_watermark.c | 22 +-
drivers/gpu/drm/i915/display/skl_watermark.h | 5 +-
drivers/gpu/drm/i915/gt/intel_rps.c | 29 -
drivers/gpu/drm/i915/intel_pm.c | 4052 -----------------
drivers/gpu/drm/i915/intel_pm.h | 13 -
drivers/gpu/drm/i915/soc/intel_dram.c | 152 +
18 files changed, 4712 insertions(+), 4566 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 v2 1/7 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.
v2:
- Remove inaccurate comment (Ville)
- Call detect_mem_freq() unconditionally (Ville)
--- 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 | 152 ++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 130 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 +152 -0
170 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v2 1/7] drm/i915: move memory frequency detection to intel_dram.c
Quoted 9 lines · Jani Nikula
The memory frequency detection is a bit spread out here and there. Consolidate to
intel_dram.c.v2:
- Remove inaccurate comment (Ville)
- Calldetect_mem_freq()unconditionally (Ville)Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Couldn't spot any chicken vs. egg issues anywhere
so seems good.
Quoted 365 lines
--- 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 | 152 ++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 130 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 */ @@ -4893,12 +4798,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 +152
-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,155 @@ 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 ; + } +} + +static void detect_mem_freq (struct drm_i915_private *i915) +{ +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 );@@ -507,6 +657,8 @@ void intel_dram_detect(struct drm_i915_private *i915)struct dram_info *dram_info = &i915->dram_info;int ret; +detect_mem_freq (i915); +if (GRAPHICS_VER (i915) <9 ||IS_DG2 (i915) || !HAS_DISPLAY (i915))return ;Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel
PATCH v2 2/7 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.
v2:
- Rebase
- Fix copyright year
--- drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/display/i9xx_wm.c | 3922 ++++++++++++++++ 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 | 3951 ----------------- drivers/gpu/drm/i915/intel_pm.h | 13 - 12 files changed, 4052 insertions(+), 3981 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 +3922 -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 +0 -3951
3,951 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.
Re: [Intel-gfx] [PATCH v2 2/7] drm/i915/wm: move remaining watermark code out of intel_pm.c
Quoted 11 lines · Jani Nikula
Add 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 eitherskl_wm_init()ori9xx_wm_init(i915)depending on the platform, the latter comprising of the remains ofintel_init_pm().
Quoted 8 lines
Sprinkle in some minor checkpatch fixes while moving the code.
v2:
- Rebase
- Fix copyright yearCc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Signature · 2 lines
Ville Syrjälä Intel
PATCH v2 3/7 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
Re: [Intel-gfx] [PATCH v2 3/7] drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch]
Quoted 5 lines · Jani Nikula
Move the wrappers to call watermark hooks into intel_wm.[ch]. This declutters
intel_display.cnicely.Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 258 lines
--- 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@@ -9,6 +9,111 @@#include "intel_wm.h" #include "skl_watermark.h" +/** +* 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 *i915) +{ +if (i915->display.funcs.wm->update_wm) + i915->display.funcs.wm->update_wm (i915); +} + +int intel_compute_pipe_wm (struct intel_atomic_state *state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *i915 =to_i915 (state->base.dev); + +if (i915->display.funcs.wm->compute_pipe_wm) +return i915->display.funcs.wm->compute_pipe_wm (state, crtc); + +return 0 ; +} + +int intel_compute_intermediate_wm (struct intel_atomic_state *state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *i915 =to_i915 (state->base.dev); + +if (!i915->display.funcs.wm->compute_intermediate_wm) +return 0 ; + +if (drm_WARN_ON (&i915->drm, !i915->display.funcs.wm->compute_pipe_wm)) +return 0 ; + +return i915->display.funcs.wm->compute_intermediate_wm (state, crtc); +} + +bool intel_initial_watermarks (struct intel_atomic_state *state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *i915 =to_i915 (state->base.dev); + +if (i915->display.funcs.wm->initial_watermarks) { + i915->display.funcs.wm->initial_watermarks (state, crtc); +return true; + } + +return false; +} + +void intel_atomic_update_watermarks (struct intel_atomic_state *state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *i915 =to_i915 (state->base.dev); + +if (i915->display.funcs.wm->atomic_update_watermarks) + i915->display.funcs.wm->atomic_update_watermarks (state, crtc); +} + +void intel_optimize_watermarks (struct intel_atomic_state *state, +struct intel_crtc *crtc) +{ +struct drm_i915_private *i915 =to_i915 (state->base.dev); + +if (i915->display.funcs.wm->optimize_watermarks) + i915->display.funcs.wm->optimize_watermarks (state, crtc); +} + +int intel_compute_global_watermarks (struct intel_atomic_state *state) +{ +struct drm_i915_private *i915 =to_i915 (state->base.dev); + +if (i915->display.funcs.wm->compute_global_watermarks) +return i915->display.funcs.wm->compute_global_watermarks (state); + +return 0 ; +} +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 +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
Signature · 2 lines
Ville Syrjälä Intel
PATCH v2 4/7 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.
v2:
- Add missing static (kernel test robot)
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 26 +++++++++++++++---- 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, 40 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +21 -5
@@ -3487,7 +3487,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;
@@ -3580,7 +3580,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;
@@ -3629,7 +3629,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;
@@ -3729,7 +3735,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;
@@ -3775,6 +3781,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
@@ -3791,7 +3803,7 @@ static void ilk_init_lp_watermarks(struct drm_i915_private *dev_priv)*/ } -void ilk_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void ilk_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct ilk_wm_values *hw = &dev_priv->display.wm.hw;struct intel_crtc *crtc;
@@ -3829,6 +3841,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 = {
@@ -3837,6 +3850,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 = {
@@ -3844,6 +3858,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 = {
@@ -3877,6 +3892,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
@@ -2859,7 +2859,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);
@@ -2959,7 +2959,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;
@@ -2995,6 +2995,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) {
@@ -3272,6 +3278,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
Re: [Intel-gfx] [PATCH v2 4/7] drm/i915/wm: add .get_hw_state to watermark funcs
Quoted 13 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.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 5 lines
v2:
- Add missing static (kernel test robot)Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 259 lines
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 26 +++++++++++++++---- 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, 40 insertions(+), 27 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +21
-5@@ -3487,7 +3487,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;@@ -3580,7 +3580,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;@@ -3629,7 +3629,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;@@ -3729,7 +3735,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;@@ -3775,6 +3781,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 @@ -3791,7 +3803,7 @@ static void ilk_init_lp_watermarks(struct drm_i915_private *dev_priv)*/ } -void ilk_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void ilk_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct ilk_wm_values *hw = &dev_priv->display.wm.hw;struct intel_crtc *crtc;@@ -3829,6 +3841,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 = {@@ -3837,6 +3850,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 = {@@ -3844,6 +3858,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 = {@@ -3877,6 +3892,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@@ -2859,7 +2859,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);@@ -2959,7 +2959,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;@@ -2995,6 +2995,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) {@@ -3272,6 +3278,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 v2 4/7] drm/i915/wm: add .get_hw_state to watermark funcs
Quoted 14 lines · Ville Syrjälä
Quoted 13 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.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 7 lines
Quoted 5 lines
v2:
- Add missing static (kernel test robot)Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Thanks, pushed 1-4 to drm-intel-next to keep things moving.
BR,
Jani.
Quoted 260 lines
Quoted 260 lines
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 26 +++++++++++++++---- 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, 40 insertions(+), 27 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +21
-5@@ -3487,7 +3487,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;@@ -3580,7 +3580,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;@@ -3629,7 +3629,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;@@ -3729,7 +3735,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;@@ -3775,6 +3781,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 @@ -3791,7 +3803,7 @@ static void ilk_init_lp_watermarks(struct drm_i915_private *dev_priv)*/ } -void ilk_wm_get_hw_state (struct drm_i915_private *dev_priv) +static void ilk_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct ilk_wm_values *hw = &dev_priv->display.wm.hw;struct intel_crtc *crtc;@@ -3829,6 +3841,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 = {@@ -3837,6 +3850,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 = {@@ -3844,6 +3858,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 = {@@ -3877,6 +3892,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@@ -2859,7 +2859,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);@@ -2959,7 +2959,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;@@ -2995,6 +2995,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) {@@ -3272,6 +3278,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
PATCH v2 5/7 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
Re: [Intel-gfx] [PATCH v2 5/7] drm/i915/wm: move watermark sanitization to intel_wm.[ch]
Quoted 1 line · Jani Nikula
Move the generic
sanitize_watermarks()to intel_wm.[ch] and rename as
It's not generic though. Only the ilk_ stuff uses it.
Quoted 333 lines
intel_wm_sanitize(). The slightly unfortunate downside is having to exposeintel_atomic_check()fromintel_display.c, but this decluttersintel_display.cnicely.Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- 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@@ -5,6 +5,7 @@#include "i915_drv.h" #include "i9xx_wm.h" +#include "intel_atomic.h" #include "intel_display_types.h" #include "intel_wm.h" #include "skl_watermark.h" @@ -173,6 +174,124 @@ void intel_print_wm_latency(struct drm_i915_private *dev_priv, } } +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. +*/ +void intel_wm_sanitize (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); +} +void intel_wm_init (struct drm_i915_private *i915) {if (DISPLAY_VER (i915) >=9 )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
Signature · 2 lines
Ville Syrjälä Intel
Re: [Intel-gfx] [PATCH v2 5/7] drm/i915/wm: move watermark sanitization to intel_wm.[ch]
Quoted 4 lines · Ville Syrjälä
Quoted 1 line · Jani Nikula
Move the generic
sanitize_watermarks()to intel_wm.[ch] and rename asIt's not generic though. Only the
ilk_stuff uses it.
Okay, so the caller side requires HAS_GMCH() and the callee side requires .optimize_watermarks != NULL. That indeed leaves us with PCH split platforms before display version 9.
However, the implementation of sanitize_watermarks() seems pretty generic, right?
I guess the question is, do you suggest moving the whole thing to i9xx_wm.c and specifically not calling it on display 9+, or do you just want the commit message to reflect the above?
BR,
Jani.
Quoted 334 lines
Quoted 334 lines
intel_wm_sanitize(). The slightly unfortunate downside is having to exposeintel_atomic_check()fromintel_display.c, but this decluttersintel_display.cnicely.Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- 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@@ -5,6 +5,7 @@#include "i915_drv.h" #include "i9xx_wm.h" +#include "intel_atomic.h" #include "intel_display_types.h" #include "intel_wm.h" #include "skl_watermark.h" @@ -173,6 +174,124 @@ void intel_print_wm_latency(struct drm_i915_private *dev_priv, } } +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. +*/ +void intel_wm_sanitize (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); +} +void intel_wm_init (struct drm_i915_private *i915) {if (DISPLAY_VER (i915) >=9 )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
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH v2 5/7] drm/i915/wm: move watermark sanitization to intel_wm.[ch]
Quoted 10 lines · Jani Nikula
Quoted 4 lines · Ville Syrjälä
Quoted 1 line · Jani Nikula
Move the generic
sanitize_watermarks()to intel_wm.[ch] and rename asIt's not generic though. Only the
ilk_stuff uses it.Okay, so the caller side requires
HAS_GMCH()and the callee side requires .optimize_watermarks != NULL. That indeed leaves us with PCH split platforms before display version 9.
Quoted 6 lines
However, the implementation of
sanitize_watermarks()seems pretty generic, right?I guess the question is, do you suggest moving the whole thing to
i9xx_wm.cand specifically not calling it on display 9+, or do you just want the commit message to reflect the above?
What I actually want is to just get rid of it entirely. But that would require doing some work on the ilk wm code.
So in the meantime I suppse I'd prefer to hide it away next to all the other ilk wm code so that no one gets any more confusedby it.
Signature · 2 lines
Ville Syrjälä Intel
Re: [Intel-gfx] [PATCH v2 5/7] drm/i915/wm: move watermark sanitization to intel_wm.[ch]
Quoted 18 lines · Ville Syrjälä
Quoted 10 lines · Jani Nikula
Quoted 4 lines · Ville Syrjälä
Quoted 1 line · Jani Nikula
Move the generic
sanitize_watermarks()to intel_wm.[ch] and rename asIt's not generic though. Only the
ilk_stuff uses it.Okay, so the caller side requires
HAS_GMCH()and the callee side requires .optimize_watermarks != NULL. That indeed leaves us with PCH split platforms before display version 9.Quoted 6 lines
However, the implementation of
sanitize_watermarks()seems pretty generic, right?I guess the question is, do you suggest moving the whole thing to
i9xx_wm.cand specifically not calling it on display 9+, or do you just want the commit message to reflect the above?
Quoted 6 lines
What I actually want is to just get rid of it entirely. But that would require doing some work on the ilk wm code.
So in the meantime I suppse I'd prefer to hide it away next to all the other ilk wm code so that no one gets any more confusedby it.
Thanks, new version on the list.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
PATCH v2 6/7 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 | 219 +---------------- drivers/gpu/drm/i915/display/intel_wm.c | 226 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 + 3 files changed, 229 insertions(+), 217 deletions(-)
drivers/gpu/drm/i915/display/intel_display_debugfs.c +2 -217
@@ -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"
@@ -30,7 +29,7 @@#include "intel_pm.h" #include "intel_psr.h" #include "intel_sprite.h" -#include "skl_watermark.h" +#include "intel_wm.h" static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) {
@@ -1283,217 +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; - -drm_modeset_lock_all (&dev_priv->drm); - -for (level =0 ; level < dev_priv->display.wm.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 level; -int ret; -char tmp[32 ]; - -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 != dev_priv->display.wm.num_levels) -return -EINVAL ; - -drm_modeset_lock_all (&dev_priv->drm); - -for (level =0 ; level < dev_priv->display.wm.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,
@@ -1574,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},
@@ -1603,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 +226 -0
229 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_wm.h +1 -0
@@ -33,5 +33,6 @@ 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); +void intel_wm_debugfs_register (struct drm_i915_private *i915);#endif /* __INTEL_WM_H__ */
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v2 6/7] drm/i915/wm: move watermark debugfs to intel_wm.c
Quoted 8 lines · Jani Nikula
Follow the new convention of placing debugfs with the code.
Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_display_debugfs.c | 219 +---------------- drivers/gpu/drm/i915/display/intel_wm.c | 226 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wm.h | 1 +
My most recent though was actually a full skl+ vs. older split for these. But we can ponder that later.
Quoted 507 lines
3 files changed, 229 insertions(+), 217 deletions(-)drivers/gpu/drm/i915/display/intel_display_debugfs.c +2
-217@@ -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" @@ -30,7 +29,7 @@#include "intel_pm.h" #include "intel_psr.h" #include "intel_sprite.h" -#include "skl_watermark.h" +#include "intel_wm.h" static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) {@@ -1283,217 +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; - -drm_modeset_lock_all (&dev_priv->drm); - -for (level =0 ; level < dev_priv->display.wm.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 level; -int ret; -char tmp[32 ]; - -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 != dev_priv->display.wm.num_levels) -return -EINVAL ; - -drm_modeset_lock_all (&dev_priv->drm); - -for (level =0 ; level < dev_priv->display.wm.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,@@ -1574,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},@@ -1603,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 +226
-0@@ -299,3 +299,229 @@ void intel_wm_init(struct drm_i915_private *i915)else i9xx_wm_init (i915); } + +static void wm_latency_show (struct seq_file *m,const u16 wm[8 ]) +{ +struct drm_i915_private *dev_priv = m->private; +int level; + +drm_modeset_lock_all (&dev_priv->drm); + +for (level =0 ; level < dev_priv->display.wm.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 level; +int ret; +char tmp[32 ]; + +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 != dev_priv->display.wm.num_levels) +return -EINVAL ; + +drm_modeset_lock_all (&dev_priv->drm); + +for (level =0 ; level < dev_priv->display.wm.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 +}; + +void intel_wm_debugfs_register (struct drm_i915_private *i915) +{ +struct drm_minor *minor = i915->drm.primary; + +debugfs_create_file ("i915_pri_wm_latency" ,0644 , minor->debugfs_root, + i915, &i915_pri_wm_latency_fops); + +debugfs_create_file ("i915_spr_wm_latency" ,0644 , minor->debugfs_root, + i915, &i915_spr_wm_latency_fops); + +debugfs_create_file ("i915_cur_wm_latency" ,0644 , minor->debugfs_root, + i915, &i915_cur_wm_latency_fops); + +skl_watermark_debugfs_register (i915); +}drivers/gpu/drm/i915/display/intel_wm.h +1
-0@@ -33,5 +33,6 @@ 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); +void intel_wm_debugfs_register (struct drm_i915_private *i915);#endif /* __INTEL_WM_H__ */ Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel
PATCH v2 7/7 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
Re: [Intel-gfx] [PATCH v2 7/7] drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h
Quoted 5 lines · Jani Nikula
The file was never really about pm types, and now it's even more obvious. Move under display as
intel_wm_types.h.Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 73 lines
--- 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
Signature · 2 lines
Ville Syrjälä Intel
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/wm: legacy watermark code shuffling (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/wm: legacy watermark code shuffling (rev2)
URL : https://patchwork.freedesktop.org/series/113775/
State : warning
== Summary ==
Error: dim checkpatch failedf48b5db2b7e9 drm/i915: move memory frequency detection to intel_dram.c f7c1215772b4 drm/i915/wm: move remaining watermark code out of intel_pm.c Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:44: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #44:
new file mode 100644
-:2262: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2262: FILE: drivers/gpu/drm/i915/display/i9xx_wm.c:2214:
+ intel_uncore_write(&dev_priv->uncore, FW_BLC_SELF,
+ FW_BLC_SELF_FIFO_MASK | (srwm & 0xff));
-:2292: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!crtc" #2292: FILE: drivers/gpu/drm/i915/display/i9xx_wm.c:2244:
+ if (crtc == NULL)
-:2300: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #2300: FILE: drivers/gpu/drm/i915/display/i9xx_wm.c:2252:
+ fwater_lo |= (3<<8) | planea_wm;
^
-:2483: WARNING:UNNECESSARY_ELSE: else is not generally useful after a break or return #2483: FILE: drivers/gpu/drm/i915/display/i9xx_wm.c:2435:
+ return level == 0 ? 127 : 511;
+ else
-:3601: WARNING:INDENTED_LABEL: labels should not be indented #3601: FILE: drivers/gpu/drm/i915/display/i9xx_wm.c:3553:
+ out:
-:4112: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "plane_state->hw.fb" #4112: FILE: drivers/gpu/drm/i915/display/intel_wm.c:30:
+ return plane_state->hw.fb != NULL;
-:8120: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #8120: FILE: drivers/gpu/drm/i915/intel_pm.c:84:
+ intel_uncore_rmw(&dev_priv->uncore, GEN8_UCGCTL6, 0, GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ);
-:8127: WARNING:LONG_LINE: line length of 124 exceeds 100 columns #8127: FILE: drivers/gpu/drm/i915/intel_pm.c:90:
+ intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_0, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_0) |
-:8200: WARNING:LONG_LINE: line length of 124 exceeds 100 columns #8200: FILE: drivers/gpu/drm/i915/intel_pm.c:123:
+ intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_0, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_0) |
total: 0 errors, 6 warnings, 4 checks, 8242 lines checked53971ebabc55 drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch] 37758cafa646 drm/i915/wm: add .get_hw_state to watermark funcsf3719280bef8 drm/i915/wm: move watermark sanitization to intel_wm.[ch] 56cfbdf5e75f drm/i915/wm: move watermark debugfs to intel_wm.c5da5cb43ffb9 drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h
-:43: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #43:
rename from drivers/gpu/drm/i915/intel_pm_types.h
total: 0 errors, 1 warnings, 0 checks, 39 lines checked
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/wm: legacy watermark code shuffling (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/wm: legacy watermark code shuffling (rev2)
URL : https://patchwork.freedesktop.org/series/113775/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12733 -> Patchwork_113775v2
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/index.html
Participating hosts (38 -> 37)
------------------------------
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_113775v2:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@reset:
- {bat-rpls-2}: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/bat-rpls-2/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/bat-rpls-2/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_113775v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [PASS][3] -> [DMESG-FAIL][4] ([i915#5334])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-adlm-1}: [DMESG-WARN][5] ([i915#2867]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/bat-adlm-1/igt@gem_exec_suspend@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/bat-adlm-1/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-skl-guc: [DMESG-WARN][7] ([i915#8073]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/fi-skl-guc/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/fi-skl-guc/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6311]: https://gitlab.freedesktop.org/drm/intel/issues/6311
[i915#7359]: https://gitlab.freedesktop.org/drm/intel/issues/7359
[i915#8073]: https://gitlab.freedesktop.org/drm/intel/issues/8073
Build changes
-------------
* Linux: CI_DRM_12733 -> Patchwork_113775v2
CI-20190529: 20190529
CI_DRM_12733: e6aa8599c967748cfd3f9e5393ff45c31049e20f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7160: 45da871dd2684227e93a2fc002b87dfc58bd5fd9 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113775v2: e6aa8599c967748cfd3f9e5393ff45c31049e20f @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
b99a0fb0d460 drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h 0746cc464f1c drm/i915/wm: move watermark debugfs to intel_wm.c a45dac5af611 drm/i915/wm: move watermark sanitization to intel_wm.[ch] 179ff91f5d72 drm/i915/wm: add .get_hw_state to watermark funcs f6e6573873ca drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch] a56ec15a8068 drm/i915/wm: move remaining watermark code out of intel_pm.c 0a2bd3e016eb drm/i915: move memory frequency detection to intel_dram.c
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/wm: legacy watermark code shuffling (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/wm: legacy watermark code shuffling (rev2)
URL : https://patchwork.freedesktop.org/series/113775/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12733_full -> Patchwork_113775v2_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_113775v2_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_113775v2_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/index.html
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_113775v2_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_ctx_isolation@preservation-s3@rcs0:
- shard-apl: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-apl3/igt@gem_ctx_isolation@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl6/igt@gem_ctx_isolation@[email protected]
* igt@gem_mmap_gtt@fault-concurrent-x:
- shard-snb: [PASS][3] -> [ABORT][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-snb7/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-snb2/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_12733_full and Patchwork_113775v2_full:
### New IGT tests (1) ###
* igt@kms_cursor_edge_walk@128x128-top-bottom@pipe-d-hdmi-a-1:
- Statuses : 1 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_113775v2_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_lmem_swapping@smem-oom:
- shard-apl: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl7/igt@[email protected]
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#3886]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl7/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_flip@2x-nonexisting-fb:
- shard-snb: NOTRUN -> [SKIP][7] ([fdo#109271]) +15 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-snb7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt:
- shard-glk: NOTRUN -> [SKIP][8] ([fdo#109271]) +4 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-glk8/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_plane_alpha_blend@alpha-opaque-fb@pipe-a-dp-1:
- shard-apl: NOTRUN -> [FAIL][9] ([i915#4573]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl7/igt@kms_plane_alpha_blend@[email protected]
* igt@kms_psr@psr2_primary_page_flip:
- shard-apl: NOTRUN -> [SKIP][10] ([fdo#109271]) +40 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl7/igt@kms_psr@psr2_primary_page_flip.html
#### Possible fixes ####
* igt@drm_fdinfo@virtual-idle:
- {shard-rkl}: [FAIL][11] ([i915#7742]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-5/igt@[email protected]
* igt@fbdev@unaligned-read:
- {shard-tglu}: [SKIP][13] ([i915#2582]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-tglu-6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-tglu-4/igt@[email protected]
* igt@gem_ctx_persistence@legacy-engines-hang@blt:
- {shard-rkl}: [SKIP][15] ([i915#6252]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-5/igt@gem_ctx_persistence@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-2/igt@gem_ctx_persistence@[email protected]
* igt@gem_eio@in-flight-external:
- {shard-rkl}: [ABORT][17] ([i915#7811]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-3/igt@[email protected]
* igt@gem_eio@in-flight-suspend:
- {shard-rkl}: [FAIL][19] ([i915#5115] / [i915#7052]) -> [PASS][20] +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-1/igt@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-apl: [FAIL][21] ([i915#2842]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-apl2/igt@gem_exec_fair@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_flush@basic-batch-kernel-default-cmd:
- {shard-rkl}: [SKIP][23] ([fdo#109313]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-1/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-5/igt@[email protected]
* igt@gem_exec_reloc@basic-gtt:
- {shard-rkl}: [SKIP][25] ([i915#3281]) -> [PASS][26] +7 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-1/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-5/igt@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- {shard-rkl}: [ABORT][27] ([i915#5122]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-3/igt@gem_exec_suspend@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-1/igt@gem_exec_suspend@[email protected]
* igt@gem_pwrite_snooped:
- {shard-rkl}: [SKIP][29] ([i915#3282]) -> [PASS][30] +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-1/igt@gem_pwrite_snooped.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-5/igt@gem_pwrite_snooped.html
* igt@gen9_exec_parse@bb-start-out:
- {shard-rkl}: [SKIP][31] ([i915#2527]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-1/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-5/igt@[email protected]
* igt@i915_hangman@engine-engine-error@bcs0:
- {shard-rkl}: [SKIP][33] ([i915#6258]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-5/igt@i915_hangman@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-2/igt@i915_hangman@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- {shard-rkl}: [SKIP][35] ([i915#3361]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-5/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-2/igt@[email protected]
* igt@i915_pm_rps@engine-order:
- shard-apl: [FAIL][37] ([i915#6537]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-apl1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl6/igt@[email protected]
* igt@kms_big_fb@y-tiled-8bpp-rotate-180:
- {shard-rkl}: [SKIP][39] ([i915#1845] / [i915#4098]) -> [PASS][40] +6 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size:
- shard-glk: [FAIL][41] ([i915#2346]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-glk3/igt@kms_cursor_legacy@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-glk9/igt@kms_cursor_legacy@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1:
- shard-glk: [FAIL][43] ([i915#79]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-glk2/igt@kms_flip@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-glk8/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend@b-dp1:
- shard-apl: [ABORT][45] -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-apl2/igt@kms_flip@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-apl7/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc:
- {shard-rkl}: [SKIP][47] ([i915#1849] / [i915#4098]) -> [PASS][48] +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt:
- {shard-tglu}: [SKIP][49] ([i915#1849]) -> [PASS][50] +8 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-tglu-4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_psr@sprite_mmap_gtt:
- {shard-rkl}: [SKIP][51] ([i915#1072]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-2/igt@kms_psr@sprite_mmap_gtt.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-6/igt@kms_psr@sprite_mmap_gtt.html
* igt@kms_pwrite_crc:
- {shard-tglu}: [SKIP][53] ([fdo#109274] / [i915#1845]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-tglu-6/igt@kms_pwrite_crc.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-tglu-1/igt@kms_pwrite_crc.html
* igt@kms_universal_plane@universal-plane-pipe-b-sanity:
- {shard-tglu}: [SKIP][55] ([fdo#109274]) -> [PASS][56] +2 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-tglu-6/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-tglu-4/igt@[email protected]
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- {shard-tglu}: [SKIP][57] ([i915#1845] / [i915#7651]) -> [PASS][58] +22 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-tglu-6/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-tglu-4/igt@[email protected]
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][59] ([i915#4349]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-1/igt@perf_pmu@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-5/igt@perf_pmu@[email protected]
* igt@prime_vgem@basic-fence-flip:
- {shard-rkl}: [SKIP][61] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12733/shard-rkl-2/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/shard-rkl-6/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110542]: https://bugs.freedesktop.org/show_bug.cgi?id=110542
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3826]: https://gitlab.freedesktop.org/drm/intel/issues/3826
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4275]: https://gitlab.freedesktop.org/drm/intel/issues/4275
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4879]: https://gitlab.freedesktop.org/drm/intel/issues/4879
[i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881
[i915#4885]: https://gitlab.freedesktop.org/drm/intel/issues/4885
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5115]: https://gitlab.freedesktop.org/drm/intel/issues/5115
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344
[i915#6412]: https://gitlab.freedesktop.org/drm/intel/issues/6412
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#6537]: https://gitlab.freedesktop.org/drm/intel/issues/6537
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7052]: https://gitlab.freedesktop.org/drm/intel/issues/7052
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7582]: https://gitlab.freedesktop.org/drm/intel/issues/7582
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7811]: https://gitlab.freedesktop.org/drm/intel/issues/7811
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949
[i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957
[i915#7981]: https://gitlab.freedesktop.org/drm/intel/issues/7981
[i915#7984]: https://gitlab.freedesktop.org/drm/intel/issues/7984
Build changes
-------------
* Linux: CI_DRM_12733 -> Patchwork_113775v2
CI-20190529: 20190529
CI_DRM_12733: e6aa8599c967748cfd3f9e5393ff45c31049e20f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7160: 45da871dd2684227e93a2fc002b87dfc58bd5fd9 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113775v2: e6aa8599c967748cfd3f9e5393ff45c31049e20f @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113775v2/index.html