Enable/disable gamma/csc dynamically and fix C8
Subsystems (2)
v3 cover Enable/disable gamma/csc dynamically and fix C8
From: Ville Syrjälä <[email protected]>
Here's the remainder of my gamma stuff. All reviwed so should be good to land as soon as CI gives the green light.
Only real change from the last posting is dealing with fastboot (I hope even correctly).
Ville Syrjälä (7):
drm/i915: Populate gamma_mode for all platforms drm/i915: Track pipe gamma enable/disable in crtc state drm/i915: Track pipe csc enable in crtc state drm/i915: Turn off pipe gamma when it's not needed drm/i915: Turn off pipe CSC when it's not needed drm/i915: Disable pipe gamma when C8 pixel format is used drm/i915: Update DSPCNTR gamma/csc bits during crtc_enable()
drivers/gpu/drm/i915/i915_reg.h | 14 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 5 + drivers/gpu/drm/i915/intel_color.c | 160 +++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 104 +++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 7 + drivers/gpu/drm/i915/intel_sprite.c | 23 +++- 6 files changed, 272 insertions(+), 41 deletions(-)
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/7 drm/i915: Populate gamma_mode for all platforms
From: Ville Syrjälä <[email protected]>
On pre-HSW gamma mode is configured via PIPECONF. The bits are the same except shifted up, so we can reuse just store them in crtc_state->gamma_mode in the HSW+ way, allowing us to share some code later.
v2: Allow fastboot with gamma_mode changes (Maarten)
Add space around the '<<' in the reg macro Deal with HAS_GMCH
--- drivers/gpu/drm/i915/i915_reg.h | 10 ++++- drivers/gpu/drm/i915/intel_color.c | 60 +++++++++++++++++++++------- drivers/gpu/drm/i915/intel_display.c | 14 ++++++- 3 files changed, 66 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +8 -2
@@ -5590,9 +5590,15 @@ enum {#define PIPECONF_SINGLE_WIDE 0#define PIPECONF_PIPE_UNLOCKED 0#define PIPECONF_PIPE_LOCKED (1 << 25) -#define PIPECONF_PALETTE 0 -#define PIPECONF_GAMMA (1 << 24)#define PIPECONF_FORCE_BORDER (1 << 25) +#define PIPECONF_GAMMA_MODE_MASK_I9XX (1 << 24)/* gmch */ +#define PIPECONF_GAMMA_MODE_MASK_ILK (3 << 24)/* ilk-ivb */ +#define PIPECONF_GAMMA_MODE_8BIT (0 << 24)/* gmch,ilk-ivb */ +#define PIPECONF_GAMMA_MODE_10BIT (1 << 24)/* gmch,ilk-ivb */ +#define PIPECONF_GAMMA_MODE_12BIT (2 << 24)/* ilk-ivb */ +#define PIPECONF_GAMMA_MODE_SPLIT (3 << 24)/* ivb */ +#define PIPECONF_GAMMA_MODE (x) ((x) << 24)/* pass in GAMMA_MODE_MODE_* */ +#define PIPECONF_GAMMA_MODE_SHIFT 24#define PIPECONF_INTERLACE_MASK (7 << 21)#define PIPECONF_INTERLACE_MASK_HSW (3 << 21)/* Note that pre-gen3 does not support interlaced display directly. Panel
drivers/gpu/drm/i915/intel_color.c +45 -15
79 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +13 -1
@@ -3450,7 +3450,7 @@ static void i9xx_disable_plane(struct intel_plane *plane,* * On pre-g4x there is no way to gamma correct the * pipe bottom color but we'll keep on doing this -* anyway. +* anyway so that the crtc state readout works correctly. */ dspcntr =i9xx_plane_ctl_crtc (crtc_state);
@@ -7692,6 +7692,8 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state) crtc_state->limited_color_range) pipeconf |=PIPECONF_COLOR_RANGE_SELECT ; + pipeconf |=PIPECONF_GAMMA_MODE (crtc_state->gamma_mode); +I915_WRITE (PIPECONF (crtc->pipe), pipeconf);POSTING_READ (PIPECONF (crtc->pipe)); }
@@ -8144,6 +8146,9 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, (tmp & PIPECONF_COLOR_RANGE_SELECT)) pipe_config->limited_color_range = true; + pipe_config->gamma_mode = (tmp &PIPECONF_GAMMA_MODE_MASK_I9XX ) >> +PIPECONF_GAMMA_MODE_SHIFT ; +if (INTEL_GEN (dev_priv) <4 ) pipe_config->double_wide = tmp &PIPECONF_DOUBLE_WIDE ;
@@ -8683,6 +8688,8 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)if (crtc_state->limited_color_range) val |=PIPECONF_COLOR_RANGE_SELECT ; + val |=PIPECONF_GAMMA_MODE (crtc_state->gamma_mode); +I915_WRITE (PIPECONF (pipe), val);POSTING_READ (PIPECONF (pipe)); }
@@ -9217,6 +9224,9 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,if (tmp &PIPECONF_COLOR_RANGE_SELECT ) pipe_config->limited_color_range = true; + pipe_config->gamma_mode = (tmp &PIPECONF_GAMMA_MODE_MASK_ILK ) >> +PIPECONF_GAMMA_MODE_SHIFT ; +if (I915_READ (PCH_TRANSCONF (crtc->pipe)) &TRANS_ENABLE ) {struct intel_shared_dpll *pll;enum intel_dpll_id pll_id;
@@ -12080,6 +12090,8 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,PIPE_CONF_CHECK_I (scaler_state.scaler_id);PIPE_CONF_CHECK_CLOCK_FUZZY (pixel_rate); + +PIPE_CONF_CHECK_X (gamma_mode); }PIPE_CONF_CHECK_BOOL (double_wide);
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/7 drm/i915: Track pipe gamma enable/disable in crtc state
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Track whether pipe gamma is enabled or disabled. For now we stick to the current behaviour of always enabling gamma. But we do get working state readout for this now. On SKL+ we use the pipe bottom color as our hardware state. On pre-SKL we read the state back from the primary plane control register. That only really correct for g4x+, as older platforms never gamma correct pipe bottom color. But doing the readout the same way on all platforms is fine, and there is no other way to do it really.
v2: Initialize val at declaration (Uma)
Drop the bogus skl scaler comment change (Uma) Rebase
v3: Allow fastboot with gamma_enable changes (Maarten)
--- drivers/gpu/drm/i915/intel_color.c | 28 +++++++++++++- drivers/gpu/drm/i915/intel_display.c | 55 ++++++++++++++++++++++------ drivers/gpu/drm/i915/intel_drv.h | 3 ++ drivers/gpu/drm/i915/intel_sprite.c | 17 +++++++-- 4 files changed, 88 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_color.c +27 -1
@@ -387,6 +387,28 @@ static void hsw_color_commit(const struct intel_crtc_state *crtc_state)ilk_load_csc_matrix (crtc_state); } +static void skl_color_commit (const struct intel_crtc_state *crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +enum pipe pipe = crtc->pipe; +u32 val =0 ; + +/* +* We don't (yet) allow userspace to control the pipe background color, +* so force it to black, but apply pipe gamma and CSC appropriately +* so that its handling will match how we program our planes. +*/ +if (crtc_state->gamma_enable) + val |=SKL_BOTTOM_COLOR_GAMMA_ENABLE ; + val |=SKL_BOTTOM_COLOR_CSC_ENABLE ; +I915_WRITE (SKL_BOTTOM_COLOR (pipe), val); + +I915_WRITE (GAMMA_MODE (crtc->pipe), crtc_state->gamma_mode); + +ilk_load_csc_matrix (crtc_state); +} +static void bdw_load_degamma_lut (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);
@@ -644,6 +666,8 @@ int intel_color_check(struct intel_crtc_state *crtc_state) degamma_tests =INTEL_INFO (dev_priv)->color.degamma_lut_tests; gamma_tests =INTEL_INFO (dev_priv)->color.gamma_lut_tests; + crtc_state->gamma_enable = true; +/* Always allow legacy gamma LUT with no further checking. */ if (crtc_state_is_legacy_gamma (crtc_state)) { crtc_state->gamma_mode =GAMMA_MODE_MODE_8BIT ;
@@ -689,7 +713,9 @@ void intel_color_init(struct intel_crtc *crtc)else dev_priv->display.load_luts = i9xx_load_luts; -if (INTEL_GEN (dev_priv) >=8 ||IS_HASWELL (dev_priv)) +if (INTEL_GEN (dev_priv) >=9 ) + dev_priv->display.color_commit = skl_color_commit; +else if (IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) dev_priv->display.color_commit = hsw_color_commit;else dev_priv->display.color_commit = ilk_color_commit;
drivers/gpu/drm/i915/intel_display.c +44 -11
121 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -961,6 +961,9 @@ struct intel_crtc_state {/* Output down scaling is done in LSPCON device */ bool lspcon_downsampling; +/* enable pipe gamma? */ +bool gamma_enable; +/* Display Stream compression state */ struct {bool compression_enable;
drivers/gpu/drm/i915/intel_sprite.c +14 -3
@@ -741,7 +741,12 @@ vlv_update_clrc(const struct intel_plane_state *plane_state)static u32 vlv_sprite_ctl_crtc (const struct intel_crtc_state *crtc_state) { -return SP_GAMMA_ENABLE ; +u32 sprctl =0 ; + +if (crtc_state->gamma_enable) + sprctl |=SP_GAMMA_ENABLE ; + +return sprctl; } static u32 vlv_sprite_ctl(const struct intel_crtc_state *crtc_state,
@@ -919,7 +924,8 @@ static u32 ivb_sprite_ctl_crtc(const struct intel_crtc_state *crtc_state)struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);u32 sprctl =0 ; - sprctl |=SPRITE_GAMMA_ENABLE ; +if (crtc_state->gamma_enable) + sprctl |=SPRITE_GAMMA_ENABLE ;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) sprctl |=SPRITE_PIPE_CSC_ENABLE ;
@@ -1107,7 +1113,12 @@ g4x_sprite_max_stride(struct intel_plane *plane,static u32 g4x_sprite_ctl_crtc (const struct intel_crtc_state *crtc_state) { -return DVS_GAMMA_ENABLE ; +u32 dvscntr =0 ; + +if (crtc_state->gamma_enable) + dvscntr |=DVS_GAMMA_ENABLE ; + +return dvscntr; } static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/7 drm/i915: Track pipe gamma enable/disable in crtc state
From: Ville Syrjälä <[email protected]>
Track whether pipe gamma is enabled or disabled. For now we stick to the current behaviour of always enabling gamma. But we do get working state readout for this now. On SKL+ we use the pipe bottom color as our hardware state. On pre-SKL we read the state back from the primary plane control register. That only really correct for g4x+, as older platforms never gamma correct pipe bottom color. But doing the readout the same way on all platforms is fine, and there is no other way to do it really.
v2: Initialize val at declaration (Uma)
Drop the bogus skl scaler comment change (Uma) Rebase
v3: Allow fastboot with gamma_enable changes (Maarten)
v4: Drop the PIPE_BOTTOM_COLOR write from
intel_update_pipe_config() again. It snuck back in during the rebase
--- drivers/gpu/drm/i915/intel_color.c | 28 +++++++++++- drivers/gpu/drm/i915/intel_display.c | 65 +++++++++++++++++++--------- drivers/gpu/drm/i915/intel_drv.h | 3 ++ drivers/gpu/drm/i915/intel_sprite.c | 17 ++++++-- 4 files changed, 88 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_color.c +27 -1
@@ -387,6 +387,28 @@ static void hsw_color_commit(const struct intel_crtc_state *crtc_state)ilk_load_csc_matrix (crtc_state); } +static void skl_color_commit (const struct intel_crtc_state *crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +enum pipe pipe = crtc->pipe; +u32 val =0 ; + +/* +* We don't (yet) allow userspace to control the pipe background color, +* so force it to black, but apply pipe gamma and CSC appropriately +* so that its handling will match how we program our planes. +*/ +if (crtc_state->gamma_enable) + val |=SKL_BOTTOM_COLOR_GAMMA_ENABLE ; + val |=SKL_BOTTOM_COLOR_CSC_ENABLE ; +I915_WRITE (SKL_BOTTOM_COLOR (pipe), val); + +I915_WRITE (GAMMA_MODE (crtc->pipe), crtc_state->gamma_mode); + +ilk_load_csc_matrix (crtc_state); +} +static void bdw_load_degamma_lut (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);
@@ -644,6 +666,8 @@ int intel_color_check(struct intel_crtc_state *crtc_state) degamma_tests =INTEL_INFO (dev_priv)->color.degamma_lut_tests; gamma_tests =INTEL_INFO (dev_priv)->color.gamma_lut_tests; + crtc_state->gamma_enable = true; +/* Always allow legacy gamma LUT with no further checking. */ if (crtc_state_is_legacy_gamma (crtc_state)) { crtc_state->gamma_mode =GAMMA_MODE_MODE_8BIT ;
@@ -689,7 +713,9 @@ void intel_color_init(struct intel_crtc *crtc)else dev_priv->display.load_luts = i9xx_load_luts; -if (INTEL_GEN (dev_priv) >=8 ||IS_HASWELL (dev_priv)) +if (INTEL_GEN (dev_priv) >=9 ) + dev_priv->display.color_commit = skl_color_commit; +else if (IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) dev_priv->display.color_commit = hsw_color_commit;else dev_priv->display.color_commit = ilk_color_commit;
drivers/gpu/drm/i915/intel_display.c +44 -21
137 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -961,6 +961,9 @@ struct intel_crtc_state {/* Output down scaling is done in LSPCON device */ bool lspcon_downsampling; +/* enable pipe gamma? */ +bool gamma_enable; +/* Display Stream compression state */ struct {bool compression_enable;
drivers/gpu/drm/i915/intel_sprite.c +14 -3
@@ -741,7 +741,12 @@ vlv_update_clrc(const struct intel_plane_state *plane_state)static u32 vlv_sprite_ctl_crtc (const struct intel_crtc_state *crtc_state) { -return SP_GAMMA_ENABLE ; +u32 sprctl =0 ; + +if (crtc_state->gamma_enable) + sprctl |=SP_GAMMA_ENABLE ; + +return sprctl; } static u32 vlv_sprite_ctl(const struct intel_crtc_state *crtc_state,
@@ -919,7 +924,8 @@ static u32 ivb_sprite_ctl_crtc(const struct intel_crtc_state *crtc_state)struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);u32 sprctl =0 ; - sprctl |=SPRITE_GAMMA_ENABLE ; +if (crtc_state->gamma_enable) + sprctl |=SPRITE_GAMMA_ENABLE ;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) sprctl |=SPRITE_PIPE_CSC_ENABLE ;
@@ -1107,7 +1113,12 @@ g4x_sprite_max_stride(struct intel_plane *plane,static u32 g4x_sprite_ctl_crtc (const struct intel_crtc_state *crtc_state) { -return DVS_GAMMA_ENABLE ; +u32 dvscntr =0 ; + +if (crtc_state->gamma_enable) + dvscntr |=DVS_GAMMA_ENABLE ; + +return dvscntr; } static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/7 drm/i915: Track pipe csc enable in crtc state
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Just like we did for pipe gamma, let's also track the pipe csc state. The hardware only exists on ILK+, and currently we always enable it on hsw+ and never on any other platforms. Just like with pipe gamma, the primary plane control register is used for the readout on pre-SKL, and the pipe bottom color register on SKL+.
v2: Rebase
v3: Allow fastboot with csc_enable changes (Maarten)
Deal with HAS_GMCH
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++-- drivers/gpu/drm/i915/intel_color.c | 7 ++++++- drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_sprite.c | 6 ++++-- 5 files changed, 29 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -2
@@ -6130,7 +6130,7 @@ enum {#define MCURSOR_PIPE_SELECT_SHIFT 28#define MCURSOR_PIPE_SELECT (pipe) ((pipe) << 28)#define MCURSOR_GAMMA_ENABLE (1 << 26) -#define MCURSOR_PIPE_CSC_ENABLE (1 << 24) +#define MCURSOR_PIPE_CSC_ENABLE (1 << 24)/* ilk+ */ #define MCURSOR_ROTATE_180 (1 << 15)#define MCURSOR_TRICKLE_FEED_DISABLE (1 << 14)#define _CURABASE 0x70084
@@ -6185,7 +6185,7 @@ enum {#define DISPPLANE_RGBA888 (0xf << 26)#define DISPPLANE_STEREO_ENABLE (1 << 25)#define DISPPLANE_STEREO_DISABLE 0 -#define DISPPLANE_PIPE_CSC_ENABLE (1 << 24) +#define DISPPLANE_PIPE_CSC_ENABLE (1 << 24)/* ilk+ */ #define DISPPLANE_SEL_PIPE_SHIFT 24#define DISPPLANE_SEL_PIPE_MASK (3 << DISPPLANE_SEL_PIPE_SHIFT)#define DISPPLANE_SEL_PIPE (pipe) ((pipe) << DISPPLANE_SEL_PIPE_SHIFT)
drivers/gpu/drm/i915/intel_color.c +6 -1
@@ -401,7 +401,8 @@ static void skl_color_commit(const struct intel_crtc_state *crtc_state)*/ if (crtc_state->gamma_enable) val |=SKL_BOTTOM_COLOR_GAMMA_ENABLE ; - val |=SKL_BOTTOM_COLOR_CSC_ENABLE ; +if (crtc_state->csc_enable) + val |=SKL_BOTTOM_COLOR_CSC_ENABLE ;I915_WRITE (SKL_BOTTOM_COLOR (pipe), val);I915_WRITE (GAMMA_MODE (crtc->pipe), crtc_state->gamma_mode);
@@ -668,6 +669,10 @@ int intel_color_check(struct intel_crtc_state *crtc_state) crtc_state->gamma_enable = true; +if (INTEL_GEN (dev_priv) >=9 || +IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) + crtc_state->csc_enable = true; +/* Always allow legacy gamma LUT with no further checking. */ if (crtc_state_is_legacy_gamma (crtc_state)) { crtc_state->gamma_mode =GAMMA_MODE_MODE_8BIT ;
drivers/gpu/drm/i915/intel_display.c +14 -4
@@ -3224,7 +3224,7 @@ static u32 i9xx_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)if (crtc_state->gamma_enable) dspcntr |=DISPPLANE_GAMMA_ENABLE ; -if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) +if (crtc_state->csc_enable) dspcntr |=DISPPLANE_PIPE_CSC_ENABLE ;if (INTEL_GEN (dev_priv) <5 )
@@ -3705,7 +3705,8 @@ u32 skl_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)if (crtc_state->gamma_enable) plane_ctl |=PLANE_CTL_PIPE_GAMMA_ENABLE ; - plane_ctl |=PLANE_CTL_PIPE_CSC_ENABLE ; +if (crtc_state->csc_enable) + plane_ctl |=PLANE_CTL_PIPE_CSC_ENABLE ;return plane_ctl; }
@@ -3760,7 +3761,8 @@ u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state)if (crtc_state->gamma_enable) plane_color_ctl |=PLANE_COLOR_PIPE_GAMMA_ENABLE ; - plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ; +if (crtc_state->csc_enable) + plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ;return plane_color_ctl; }
@@ -8118,6 +8120,10 @@ static void i9xx_get_pipe_color_config(struct intel_crtc_state *crtc_state)if (tmp &DISPPLANE_GAMMA_ENABLE ) crtc_state->gamma_enable = true; + +if (!HAS_GMCH (dev_priv) && + tmp &DISPPLANE_PIPE_CSC_ENABLE ) + crtc_state->csc_enable = true; } static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
@@ -9889,6 +9895,9 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,if (tmp &SKL_BOTTOM_COLOR_GAMMA_ENABLE ) pipe_config->gamma_enable = true; + +if (tmp &SKL_BOTTOM_COLOR_CSC_ENABLE ) + pipe_config->csc_enable = true; }else {i9xx_get_pipe_color_config (pipe_config); }
@@ -10225,7 +10234,7 @@ static u32 i9xx_cursor_ctl_crtc(const struct intel_crtc_state *crtc_state)if (crtc_state->gamma_enable) cntl =MCURSOR_GAMMA_ENABLE ; -if (HAS_DDI (dev_priv)) +if (crtc_state->csc_enable) cntl |=MCURSOR_PIPE_CSC_ENABLE ;if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv))
@@ -12125,6 +12134,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,PIPE_CONF_CHECK_X (gamma_mode);PIPE_CONF_CHECK_BOOL (gamma_enable); +PIPE_CONF_CHECK_BOOL (csc_enable); }PIPE_CONF_CHECK_BOOL (double_wide);
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -964,6 +964,9 @@ struct intel_crtc_state {/* enable pipe gamma? */ bool gamma_enable; +/* enable pipe csc? */ +bool csc_enable; +/* Display Stream compression state */ struct {bool compression_enable;
drivers/gpu/drm/i915/intel_sprite.c +4 -2
@@ -921,13 +921,12 @@ vlv_plane_get_hw_state(struct intel_plane *plane,static u32 ivb_sprite_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);u32 sprctl =0 ;if (crtc_state->gamma_enable) sprctl |=SPRITE_GAMMA_ENABLE ; -if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) +if (crtc_state->csc_enable) sprctl |=SPRITE_PIPE_CSC_ENABLE ;return sprctl;
@@ -1118,6 +1117,9 @@ static u32 g4x_sprite_ctl_crtc(const struct intel_crtc_state *crtc_state)if (crtc_state->gamma_enable) dvscntr |=DVS_GAMMA_ENABLE ; +if (crtc_state->csc_enable) + dvscntr |=DVS_PIPE_CSC_ENABLE ; +return dvscntr; }
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/7 drm/i915: Turn off pipe gamma when it's not needed
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
The pipe internal precision is higher than what we currently program to the degamma/gamma LUTs. We can get a higher quality image by bypassing the LUTs when they're not needed. Let's do that.
Each plane has its own control bit for this, so we have to update all active planes. The way we've done this we don't actually have to run through the whole .check_plane() thing. And we actually do the .color_check() after .check_plane() so we couldn't even do that without shuffling the code around.
Additionally on pre-skl we have to update the primary plane regardless of whether it's active or not on account of the primary plane gamma enable bit also affecting the pipe bottom color.
v2: Drop the '.' from patch title (Uma)
Fix 'primayr' typo (Uma,Matt)
Rebase
--- drivers/gpu/drm/i915/intel_color.c | 55 ++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_color.c +53 -2
@@ -637,6 +637,51 @@ void intel_color_commit(const struct intel_crtc_state *crtc_state) dev_priv->display.color_commit (crtc_state); } +static bool need_plane_update (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); + +/* +* On pre-SKL the pipe gamma enable and pipe csc enable for +* the pipe bottom color are configured via the primary plane. +* We have to reconfigure that even if the plane is inactive. +*/ +return crtc_state->active_planes &BIT (plane->id) || + (INTEL_GEN (dev_priv) <9 && + plane->id ==PLANE_PRIMARY ); +} + +static int +intel_color_add_affected_planes (struct intel_crtc_state *new_crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_atomic_state *state = +to_intel_atomic_state (new_crtc_state->base.state); +const struct intel_crtc_state *old_crtc_state = +intel_atomic_get_old_crtc_state (state, crtc); +struct intel_plane *plane; + +if (new_crtc_state->gamma_enable == old_crtc_state->gamma_enable) +return 0 ; + +for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) { +struct intel_plane_state *plane_state; + +if (!need_plane_update (plane, new_crtc_state)) +continue ; + + plane_state =intel_atomic_get_plane_state (state, plane); +if (IS_ERR (plane_state)) +return PTR_ERR (plane_state); + + new_crtc_state->update_planes |=BIT (plane->id); + } + +return 0 ; +} +static int check_lut_size (const struct drm_property_blob *lut,int expected) {int len;
@@ -661,20 +706,26 @@ int intel_color_check(struct intel_crtc_state *crtc_state)const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut;int gamma_length, degamma_length;u32 gamma_tests, degamma_tests; +int ret; degamma_length =INTEL_INFO (dev_priv)->color.degamma_lut_size; gamma_length =INTEL_INFO (dev_priv)->color.gamma_lut_size; degamma_tests =INTEL_INFO (dev_priv)->color.degamma_lut_tests; gamma_tests =INTEL_INFO (dev_priv)->color.gamma_lut_tests; - crtc_state->gamma_enable = true; + crtc_state->gamma_enable = gamma_lut || degamma_lut;if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) crtc_state->csc_enable = true; + ret =intel_color_add_affected_planes (crtc_state); +if (ret) +return ret; +/* Always allow legacy gamma LUT with no further checking. */ -if (crtc_state_is_legacy_gamma (crtc_state)) { +if (!crtc_state->gamma_enable || +crtc_state_is_legacy_gamma (crtc_state)) { crtc_state->gamma_mode =GAMMA_MODE_MODE_8BIT ;return 0 ; }
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/7 drm/i915: Turn off pipe CSC when it's not needed
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
As with pipe gamma we can avoid the potential precision loss from the pipe csc unit when there is no need to use it. And again we need the same logic for updating the planes.
v2: Rebase
--- drivers/gpu/drm/i915/intel_color.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_color.c +8 -2
@@ -663,7 +663,8 @@ intel_color_add_affected_planes(struct intel_crtc_state *new_crtc_state)intel_atomic_get_old_crtc_state (state, crtc);struct intel_plane *plane; -if (new_crtc_state->gamma_enable == old_crtc_state->gamma_enable) +if (new_crtc_state->gamma_enable == old_crtc_state->gamma_enable && + new_crtc_state->csc_enable == old_crtc_state->csc_enable)return 0 ;for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) {
@@ -704,6 +705,7 @@ int intel_color_check(struct intel_crtc_state *crtc_state)struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut;const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +bool limited_color_range = false;int gamma_length, degamma_length;u32 gamma_tests, degamma_tests;int ret;
@@ -717,7 +719,11 @@ int intel_color_check(struct intel_crtc_state *crtc_state)if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) - crtc_state->csc_enable = true; + limited_color_range = crtc_state->limited_color_range; + + crtc_state->csc_enable = + crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB || + crtc_state->base.ctm || limited_color_range; ret =intel_color_add_affected_planes (crtc_state);if (ret)
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/7 drm/i915: Disable pipe gamma when C8 pixel format is used
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Planes scanning out C8 will want to use the legacy lut as their palette. That means the LUT content are unlikely to be useful for gamma correction on other planes. Thus we should disable pipe gamma for all the other planes. And we should reject any non legacy LUT configurations when C8 planes are present.
Fixes the appearance of the hw cursor when running X -depth 8.
Note that CHV with it's independent CGM degamma/gamma LUTs could probably use the CGM for gamma correction even when the legacy LUT is used for C8. But that would require a new uapi for configuring the legacy LUT and CGM LUTs at the same time. Totally not worth it.
v2: Fix typo (Uma)
Rebase
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 5 +++++ drivers/gpu/drm/i915/intel_color.c | 8 +++++++- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +5 -0
@@ -119,6 +119,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ new_crtc_state->active_planes &= ~BIT (plane->id); new_crtc_state->nv12_planes &= ~BIT (plane->id); + new_crtc_state->c8_planes &= ~BIT (plane->id); new_plane_state->base.visible = false;if (!new_plane_state->base.crtc && !old_plane_state->base.crtc)
@@ -136,6 +137,10 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ new_plane_state->base.fb->format->format == DRM_FORMAT_NV12) new_crtc_state->nv12_planes |= BIT(plane->id); +if (new_plane_state->base.visible && + new_plane_state->base.fb->format->format ==DRM_FORMAT_C8 ) + new_crtc_state->c8_planes |=BIT (plane->id); +if (new_plane_state->base.visible || old_plane_state->base.visible) new_crtc_state->update_planes |=BIT (plane->id);
drivers/gpu/drm/i915/intel_color.c +7 -1
@@ -715,7 +715,13 @@ int intel_color_check(struct intel_crtc_state *crtc_state) degamma_tests =INTEL_INFO (dev_priv)->color.degamma_lut_tests; gamma_tests =INTEL_INFO (dev_priv)->color.gamma_lut_tests; - crtc_state->gamma_enable = gamma_lut || degamma_lut; +/* C8 needs the legacy LUT all to itself */ +if (crtc_state->c8_planes && + !crtc_state_is_legacy_gamma (crtc_state)) +return -EINVAL ; + + crtc_state->gamma_enable = (gamma_lut || degamma_lut) && + !crtc_state->c8_planes;if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv))
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -945,6 +945,7 @@ struct intel_crtc_state {/* bitmask of visible planes (enum plane_id) */ u8 active_planes;u8 nv12_planes; +u8 c8_planes;/* bitmask of planes that will be updated during the commit */ u8 update_planes;
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/7 drm/i915: Update DSPCNTR gamma/csc bits during crtc_enable()
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
On g4x+ we depend on the primary plane DSPCNTR gamma/csc enable bits for the pipe bottom color. To guarantee that those are correct already when enabling the crtc let's do an explicit ->disable_plane() call before enabling the pipe.
On skl+ this will be handled by the explicit PIPE_BOTTOM_COLOR register which is already part of the normal color commit we do durign crtc enable.
--- drivers/gpu/drm/i915/intel_color.c | 4 ++++ drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+)
drivers/gpu/drm/i915/intel_color.c +4 -0
@@ -663,6 +663,10 @@ intel_color_add_affected_planes(struct intel_crtc_state *new_crtc_state)intel_atomic_get_old_crtc_state (state, crtc);struct intel_plane *plane; +if (!new_crtc_state->base.active || +drm_atomic_crtc_needs_modeset (&new_crtc_state->base)) +return 0 ; +if (new_crtc_state->gamma_enable == old_crtc_state->gamma_enable && new_crtc_state->csc_enable == old_crtc_state->csc_enable)return 0 ;
drivers/gpu/drm/i915/intel_display.c +17 -0
@@ -5752,6 +5752,14 @@ static void intel_encoders_update_pipe(struct drm_crtc *crtc, } } +static void intel_disable_primary_plane (const struct intel_crtc_state *crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_plane *plane =to_intel_plane (crtc->base.primary); + + plane->disable_plane (plane, crtc_state); +} +static void ironlake_crtc_enable (struct intel_crtc_state *pipe_config,struct drm_atomic_state *old_state) {
@@ -5817,6 +5825,8 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,*/ intel_color_load_luts (pipe_config);intel_color_commit (pipe_config); +/* update DSPCNTR to configure gamma for pipe bottom color */ +intel_disable_primary_plane (pipe_config);if (dev_priv->display.initial_watermarks !=NULL ) dev_priv->display.initial_watermarks (old_intel_state, pipe_config);
@@ -5945,6 +5955,9 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,*/ intel_color_load_luts (pipe_config);intel_color_commit (pipe_config); +/* update DSPCNTR to configure gamma/csc for pipe bottom color */ +if (INTEL_GEN (dev_priv) <9 ) +intel_disable_primary_plane (pipe_config);if (INTEL_GEN (dev_priv) >=11 )icl_set_pipe_chicken (intel_crtc);
@@ -6302,6 +6315,8 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,intel_color_load_luts (pipe_config);intel_color_commit (pipe_config); +/* update DSPCNTR to configure gamma for pipe bottom color */ +intel_disable_primary_plane (pipe_config); dev_priv->display.initial_watermarks (old_intel_state, pipe_config);
@@ -6359,6 +6374,8 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,intel_color_load_luts (pipe_config);intel_color_commit (pipe_config); +/* update DSPCNTR to configure gamma for pipe bottom color */ +intel_disable_primary_plane (pipe_config);if (dev_priv->display.initial_watermarks !=NULL ) dev_priv->display.initial_watermarks(old_intel_state,
Signature · 6 lines
2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Enable/disable gamma/csc dynamically and fix C8
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: Enable/disable gamma/csc dynamically and fix C8
URL : https://patchwork.freedesktop.org/series/56365/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5562 -> Patchwork_12171
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_12171 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_12171, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56365/revisions/1/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12171:
### IGT changes ###
#### Possible regressions ####
* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: PASS -> DMESG-WARN
- fi-skl-6700k2: PASS -> DMESG-WARN
- fi-skl-6770hq: PASS -> DMESG-WARN
- fi-kbl-x1275: PASS -> DMESG-WARN
- fi-bxt-j4205: PASS -> DMESG-WARN
- fi-skl-gvtdvm: PASS -> DMESG-WARN
- fi-cfl-8700k: PASS -> DMESG-WARN
- fi-kbl-7500u: PASS -> DMESG-WARN
- fi-glk-j4005: PASS -> DMESG-WARN
- fi-cfl-8109u: PASS -> DMESG-WARN* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- fi-cfl-guc: PASS -> DMESG-WARN
- fi-apl-guc: PASS -> DMESG-WARN
- fi-skl-guc: PASS -> DMESG-WARN#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@kms_busy@basic-flip-a:
- {fi-whl-u}: PASS -> DMESG-WARN
- {fi-icl-u3}: PASS -> DMESG-WARN
- {fi-icl-u2}: PASS -> DMESG-WARN* {igt@runner@aborted}:
- fi-cfl-8109u: NOTRUN -> FAIL
- {fi-icl-u2}: NOTRUN -> FAIL
- fi-kbl-7500u: NOTRUN -> FAIL
- {fi-whl-u}: NOTRUN -> FAIL
- {fi-icl-u3}: NOTRUN -> FAIL
- fi-cfl-guc: NOTRUN -> FAIL
- fi-kbl-7567u: NOTRUN -> FAIL
- fi-kbl-x1275: NOTRUN -> FAIL
- fi-cfl-8700k: NOTRUN -> FAILKnown issues
------------
Here are the changes found in Patchwork_12171 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: PASS -> FAIL [fdo#103182]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]
#### Possible fixes ####
* igt@prime_vgem@basic-fence-flip:
- fi-gdg-551: FAIL [fdo#103182] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108903]: https://bugs.freedesktop.org/show_bug.cgi?id=108903
[fdo#108904]: https://bugs.freedesktop.org/show_bug.cgi?id=108904
[fdo#108905]: https://bugs.freedesktop.org/show_bug.cgi?id=108905
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
[fdo#109373]: https://bugs.freedesktop.org/show_bug.cgi?id=109373
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (48 -> 45)
------------------------------
Additional (1): fi-icl-y
Missing (4): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* Linux: CI_DRM_5562 -> Patchwork_12171
CI_DRM_5562: 4a33b3f86a8f614176f43a7d1ff36a29fecab7eb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4813: 09f506726d0e115ee7f4a1604ae71adcf9f12690 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12171: 649cf2d353ecd5b115d958c61f53000cf1cbd4c6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
649cf2d353ec drm/i915: Update DSPCNTR gamma/csc bits during crtc_enable() fed3bc8c3823 drm/i915: Disable pipe gamma when C8 pixel format is used c702bb24b5ee drm/i915: Turn off pipe CSC when it's not needed 8098c0b8781c drm/i915: Turn off pipe gamma when it's not needed 0ae0ee5b92d1 drm/i915: Track pipe csc enable in crtc state f40126029169 drm/i915: Track pipe gamma enable/disable in crtc state edd927d96724 drm/i915: Populate gamma_mode for all platforms
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12171/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for Enable/disable gamma/csc dynamically and fix C8
Quoted 46 lines · Patchwork
== Series Details ==
Series: Enable/disable gamma/csc dynamically and fix C8
URL : https://patchwork.freedesktop.org/series/56365/
State : failure== Summary ==
CI Bug Log - changes from
CI_DRM_5562->Patchwork_12171
====================================================Summary
-------**FAILURE**
Serious unknown changes coming with
Patchwork_12171absolutely need to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_12171, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.External URL: https://patchwork.freedesktop.org/api/1.0/series/56365/revisions/1/mbox/
Possible new issues
-------------------Here are the unknown changes that may have been introduced in
Patchwork_12171:### IGT changes ###
#### Possible regressions ####
* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: PASS -> DMESG-WARN - fi-skl-6700k2: PASS -> DMESG-WARN - fi-skl-6770hq: PASS -> DMESG-WARN - fi-kbl-x1275: PASS -> DMESG-WARN - fi-bxt-j4205: PASS -> DMESG-WARN - fi-skl-gvtdvm: PASS -> DMESG-WARN - fi-cfl-8700k: PASS -> DMESG-WARN - fi-kbl-7500u: PASS -> DMESG-WARN - fi-glk-j4005: PASS -> DMESG-WARN - fi-cfl-8109u: PASS -> DMESG-WARN
Quoted 4 lines
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- fi-cfl-guc: PASS -> DMESG-WARN - fi-apl-guc: PASS -> DMESG-WARN - fi-skl-guc: PASS -> DMESG-WARN
<3> [128.750643] [drm:pipe_config_err [i915]] *ERROR* mismatch in gamma_enable (expected no, found yes) <3> [128.750756] [drm:pipe_config_err [i915]] *ERROR* mismatch in csc_enable (expected no, found yes)
Good to see that the state checker also caught the rebase fail.
Quoted 91 lines
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@kms_busy@basic-flip-a:
- {fi-whl-u}: PASS -> DMESG-WARN - {fi-icl-u3}: PASS -> DMESG-WARN - {fi-icl-u2}: PASS -> DMESG-WARN* {igt@runner@aborted}:
- fi-cfl-8109u: NOTRUN -> FAIL - {fi-icl-u2}: NOTRUN -> FAIL - fi-kbl-7500u: NOTRUN -> FAIL - {fi-whl-u}: NOTRUN -> FAIL - {fi-icl-u3}: NOTRUN -> FAIL - fi-cfl-guc: NOTRUN -> FAIL - fi-kbl-7567u: NOTRUN -> FAIL - fi-kbl-x1275: NOTRUN -> FAIL - fi-cfl-8700k: NOTRUN -> FAILKnown issues
------------Here are the changes found in
Patchwork_12171that come from known issues:### IGT changes ###
#### Issues hit ####
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: PASS -> FAIL [fdo#103182]* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]#### Possible fixes ####
* igt@prime_vgem@basic-fence-flip:
- fi-gdg-551: FAIL [fdo#103182] -> PASS{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108903]: https://bugs.freedesktop.org/show_bug.cgi?id=108903
[fdo#108904]: https://bugs.freedesktop.org/show_bug.cgi?id=108904
[fdo#108905]: https://bugs.freedesktop.org/show_bug.cgi?id=108905
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
[fdo#109373]: https://bugs.freedesktop.org/show_bug.cgi?id=109373
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321Participating hosts (48 -> 45)
------------------------------Additional (1): fi-icl-y
Missing (4): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyanBuild changes
-------------* Linux:
CI_DRM_5562->Patchwork_12171
CI_DRM_5562:4a33b3f86a8f614176f43a7d1ff36a29fecab7eb@git://anongit.freedesktop.org/gfx-ci/linux
IGT_4813:09f506726d0e115ee7f4a1604ae71adcf9f12690@git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12171:649cf2d353ecd5b115d958c61f53000cf1cbd4c6@git://anongit.freedesktop.org/gfx-ci/linux== Linux commits ==
649cf2d353ecdrm/i915: Update DSPCNTR gamma/csc bits duringcrtc_enable()fed3bc8c3823drm/i915: Disable pipe gamma when C8 pixel format is usedc702bb24b5eedrm/i915: Turn off pipe CSC when it's not needed8098c0b8781cdrm/i915: Turn off pipe gamma when it's not needed0ae0ee5b92d1drm/i915: Track pipe csc enable in crtc statef40126029169drm/i915: Track pipe gamma enable/disable in crtc stateedd927d96724drm/i915: Populategamma_modefor all platforms== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12171/
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Enable/disable gamma/csc dynamically and fix C8 (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: Enable/disable gamma/csc dynamically and fix C8 (rev2)
URL : https://patchwork.freedesktop.org/series/56365/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5563 -> Patchwork_12172
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56365/revisions/2/mbox/
Known issues
------------
Here are the changes found in Patchwork_12172 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-compute:
- fi-kbl-8809g: NOTRUN -> FAIL [fdo#108094]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: PASS -> WARN [fdo#109380]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]
#### Possible fixes ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: DMESG-WARN [fdo#108965] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
* igt@pm_rpm@basic-pci-d3-state:
- fi-byt-n2820: {SKIP} [fdo#109271] -> PASS
* igt@pm_rpm@basic-rte:
- fi-byt-n2820: FAIL [fdo#108800] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#105998]: https://bugs.freedesktop.org/show_bug.cgi?id=105998
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108094]: https://bugs.freedesktop.org/show_bug.cgi?id=108094
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109294]: https://bugs.freedesktop.org/show_bug.cgi?id=109294
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#109527]: https://bugs.freedesktop.org/show_bug.cgi?id=109527
[fdo#109528]: https://bugs.freedesktop.org/show_bug.cgi?id=109528
[fdo#109530]: https://bugs.freedesktop.org/show_bug.cgi?id=109530
Participating hosts (47 -> 42)
------------------------------
Additional (2): fi-icl-y fi-skl-6700hq
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-byt-j1900 fi-hsw-peppy fi-byt-squawks fi-bsw-cyan fi-pnv-d510
Build changes
-------------
* Linux: CI_DRM_5563 -> Patchwork_12172
CI_DRM_5563: 5a4e90aa52dbfcb1960afca7c2ba59a5ce913906 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4813: 09f506726d0e115ee7f4a1604ae71adcf9f12690 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12172: 9191ba374e35593fff71575922faee4d63ef61c5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
9191ba374e35 drm/i915: Update DSPCNTR gamma/csc bits during crtc_enable() 07ad0406d210 drm/i915: Disable pipe gamma when C8 pixel format is used 713ea56d392e drm/i915: Turn off pipe CSC when it's not needed 70b200e53e32 drm/i915: Turn off pipe gamma when it's not needed 59db6a08c9d7 drm/i915: Track pipe csc enable in crtc state f8ecbcbd9d03 drm/i915: Track pipe gamma enable/disable in crtc state 66b7100bb20d drm/i915: Populate gamma_mode for all platforms
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12172/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Enable/disable gamma/csc dynamically and fix C8 (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: Enable/disable gamma/csc dynamically and fix C8 (rev2)
URL : https://patchwork.freedesktop.org/series/56365/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5563_full -> Patchwork_12172_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12172_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_big:
- shard-hsw: PASS -> TIMEOUT [fdo#107937]
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-apl: PASS -> FAIL [fdo#106641]
- shard-glk: PASS -> FAIL [fdo#106641]
- shard-kbl: PASS -> FAIL [fdo#106641] * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
- shard-snb: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
- shard-kbl: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: PASS -> FAIL [fdo#103232] +21
* igt@kms_cursor_crc@cursor-64x21-onscreen:
- shard-apl: PASS -> FAIL [fdo#103232]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
- shard-apl: PASS -> FAIL [fdo#103167] +1
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-glk: PASS -> FAIL [fdo#103167]
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-glk: PASS -> FAIL [fdo#108145]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166] +2
#### Possible fixes ####
* igt@gem_ctx_isolation@vcs0-s3:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS
* igt@gem_tiled_blits@interruptible:
- shard-hsw: INCOMPLETE [fdo#103540] -> PASS +1
* igt@kms_cursor_crc@cursor-128x128-sliding:
- shard-apl: FAIL [fdo#103232] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- shard-apl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-glk: FAIL [fdo#103167] -> PASS +1
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +3
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-apl: FAIL [fdo#108145] -> PASS
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-glk: FAIL [fdo#103166] -> PASS
* igt@kms_setmode@basic:
- shard-hsw: FAIL [fdo#99912] -> PASS
* igt@tools_test@tools_test:
- shard-kbl: {SKIP} [fdo#109271] -> PASS
#### Warnings ####
* igt@i915_suspend@shrink:
- shard-snb: DMESG-WARN [fdo#109244] -> INCOMPLETE [fdo#105411] / [fdo#106886]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[fdo#106886]: https://bugs.freedesktop.org/show_bug.cgi?id=106886
[fdo#107937]: https://bugs.freedesktop.org/show_bug.cgi?id=107937
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109244]: https://bugs.freedesktop.org/show_bug.cgi?id=109244
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* Linux: CI_DRM_5563 -> Patchwork_12172
CI_DRM_5563: 5a4e90aa52dbfcb1960afca7c2ba59a5ce913906 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4813: 09f506726d0e115ee7f4a1604ae71adcf9f12690 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12172: 9191ba374e35593fff71575922faee4d63ef61c5 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12172/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx