drm/i915/backlight: drop implict dev_priv etc.
Subsystems (3)
cover drm/i915/backlight: drop implict dev_priv etc.
Dump a local branch I've had laying around for a while.
Jani Nikula (5):
drm/i915/backlight: use VLV_DISPLAY_BASE for VLV/CHV backlight
registers
drm/i915/backlight: get rid of the implicit dev_priv drm/i915/backlight: mass rename dev_priv to i915 drm/i915/backlight: drop drm_device local variables in favor of i915 drm/i915/backlight: convert DRM_DEBUG_KMS() to drm_dbg_kms()
.../gpu/drm/i915/display/intel_backlight.c | 539 +++++++++--------- .../drm/i915/display/intel_backlight_regs.h | 27 +- 2 files changed, 271 insertions(+), 295 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/5 drm/i915/backlight: use VLV_DISPLAY_BASE for VLV/CHV backlight registers
Since the VLV/CHV backlight registers are only used on VLV/CHV, there's no need to dynamically look up DISPLAY_MMIO_BASE(). We know it's VLV_DISPLAY_BASE. Use it statically, reducing the implicit dev_priv references.
--- .../drm/i915/display/intel_backlight_regs.h | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight_regs.h +9 -12
@@ -8,20 +8,17 @@#include "intel_display_reg_defs.h" -#define _VLV_BLC_PWM_CTL2_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61250) -#define _VLV_BLC_PWM_CTL2_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61350) -#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, \ - _VLV_BLC_PWM_CTL2_B) +#define _VLV_BLC_PWM_CTL2_A (VLV_DISPLAY_BASE + 0x61250) +#define _VLV_BLC_PWM_CTL2_B (VLV_DISPLAY_BASE + 0x61350) +#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, _VLV_BLC_PWM_CTL2_B) -#define _VLV_BLC_PWM_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61254) -#define _VLV_BLC_PWM_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61354) -#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, \ - _VLV_BLC_PWM_CTL_B) +#define _VLV_BLC_PWM_CTL_A (VLV_DISPLAY_BASE + 0x61254) +#define _VLV_BLC_PWM_CTL_B (VLV_DISPLAY_BASE + 0x61354) +#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, _VLV_BLC_PWM_CTL_B) -#define _VLV_BLC_HIST_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61260) -#define _VLV_BLC_HIST_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61360) -#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, \ - _VLV_BLC_HIST_CTL_B) +#define _VLV_BLC_HIST_CTL_A (VLV_DISPLAY_BASE + 0x61260) +#define _VLV_BLC_HIST_CTL_B (VLV_DISPLAY_BASE + 0x61360) +#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, _VLV_BLC_HIST_CTL_B)/* Backlight control */ #define BLC_PWM_CTL2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61250)/* 965+ only */
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 1/5] drm/i915/backlight: use VLV_DISPLAY_BASE for VLV/CHV backlight registers
Quoted 4 lines · Jani Nikula
Since the VLV/CHV backlight registers are only used on VLV/CHV, there's no need to dynamically look up
DISPLAY_MMIO_BASE(). We know it'sVLV_DISPLAY_BASE. Use it statically, reducing the implicitdev_privreferences.
Hmm, I spotted this, but looks like I didn't spot that none of the *other* backlight register apparently aren't used on VLV/CHV.
Could we just drop DISPLAY_MMIO_BASE() from them altogether?
BR,
Jani.
Quoted 40 lines
Signed-off-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_backlight_regs.h | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/display/intel_backlight_regs.h +9
-12@@ -8,20 +8,17 @@#include "intel_display_reg_defs.h" -#define _VLV_BLC_PWM_CTL2_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61250) -#define _VLV_BLC_PWM_CTL2_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61350) -#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, \ - _VLV_BLC_PWM_CTL2_B) +#define _VLV_BLC_PWM_CTL2_A (VLV_DISPLAY_BASE + 0x61250) +#define _VLV_BLC_PWM_CTL2_B (VLV_DISPLAY_BASE + 0x61350) +#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, _VLV_BLC_PWM_CTL2_B) -#define _VLV_BLC_PWM_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61254) -#define _VLV_BLC_PWM_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61354) -#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, \ - _VLV_BLC_PWM_CTL_B) +#define _VLV_BLC_PWM_CTL_A (VLV_DISPLAY_BASE + 0x61254) +#define _VLV_BLC_PWM_CTL_B (VLV_DISPLAY_BASE + 0x61354) +#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, _VLV_BLC_PWM_CTL_B) -#define _VLV_BLC_HIST_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61260) -#define _VLV_BLC_HIST_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61360) -#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, \ - _VLV_BLC_HIST_CTL_B) +#define _VLV_BLC_HIST_CTL_A (VLV_DISPLAY_BASE + 0x61260) +#define _VLV_BLC_HIST_CTL_B (VLV_DISPLAY_BASE + 0x61360) +#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, _VLV_BLC_HIST_CTL_B)/* Backlight control */ #define BLC_PWM_CTL2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61250)/* 965+ only */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 1/5] drm/i915/backlight: use VLV_DISPLAY_BASE for VLV/CHV backlight registers
Quoted 10 lines · Jani Nikula
Quoted 4 lines · Jani Nikula
Since the VLV/CHV backlight registers are only used on VLV/CHV, there's no need to dynamically look up
DISPLAY_MMIO_BASE(). We know it'sVLV_DISPLAY_BASE. Use it statically, reducing the implicitdev_privreferences.Hmm, I spotted this, but looks like I didn't spot that none of the *other* backlight register apparently aren't used on VLV/CHV.
Could we just drop
DISPLAY_MMIO_BASE()from them altogether?
That would be neat. I hope Ville agrees.
Did you use any sed or coccinele on patch 3?
Feel free to use:
for the series, if you decide to go with it and have this extra removal on a following up work.
Quoted 47 lines
BR,
Jani.Quoted 40 lines
Signed-off-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_backlight_regs.h | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/display/intel_backlight_regs.h +9
-12@@ -8,20 +8,17 @@#include "intel_display_reg_defs.h" -#define _VLV_BLC_PWM_CTL2_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61250) -#define _VLV_BLC_PWM_CTL2_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61350) -#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, \ - _VLV_BLC_PWM_CTL2_B) +#define _VLV_BLC_PWM_CTL2_A (VLV_DISPLAY_BASE + 0x61250) +#define _VLV_BLC_PWM_CTL2_B (VLV_DISPLAY_BASE + 0x61350) +#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, _VLV_BLC_PWM_CTL2_B) -#define _VLV_BLC_PWM_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61254) -#define _VLV_BLC_PWM_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61354) -#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, \ - _VLV_BLC_PWM_CTL_B) +#define _VLV_BLC_PWM_CTL_A (VLV_DISPLAY_BASE + 0x61254) +#define _VLV_BLC_PWM_CTL_B (VLV_DISPLAY_BASE + 0x61354) +#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, _VLV_BLC_PWM_CTL_B) -#define _VLV_BLC_HIST_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61260) -#define _VLV_BLC_HIST_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61360) -#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, \ - _VLV_BLC_HIST_CTL_B) +#define _VLV_BLC_HIST_CTL_A (VLV_DISPLAY_BASE + 0x61260) +#define _VLV_BLC_HIST_CTL_B (VLV_DISPLAY_BASE + 0x61360) +#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, _VLV_BLC_HIST_CTL_B)/* Backlight control */ #define BLC_PWM_CTL2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61250)/* 965+ only */ Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 1/5] drm/i915/backlight: use VLV_DISPLAY_BASE for VLV/CHV backlight registers
Quoted 7 lines · Rodrigo Vivi
Quoted 6 lines · Jani Nikula
Quoted 4 lines · Jani Nikula
Since the VLV/CHV backlight registers are only used on VLV/CHV, there's no need to dynamically look up
DISPLAY_MMIO_BASE(). We know it'sVLV_DISPLAY_BASE. Use it statically, reducing the implicitdev_privreferences.
Quoted 6 lines
Quoted 4 lines
Hmm, I spotted this, but looks like I didn't spot that none of the *other* backlight register apparently aren't used on VLV/CHV.
Could we just drop
DISPLAY_MMIO_BASE()from them altogether?That would be neat. I hope Ville agrees.
Sent v2 with that.
Quoted 2 lines
Did you use any sed or coccinele on patch 3?
Nah, I usually just use query-replace-regexp in Emacs for the one-off replacements.
Quoted 7 lines
Feel free to use:
Reviewed-by Rodrigo Vivi <[email protected]>for the series, if you decide to go with it and have this extra removal on a following up work.
Thanks, I tagged them as # v1 for the patches I had to rebase.
BR,
Jani.
Quoted 48 lines
Quoted 48 lines
BR,
Jani.Quoted 40 lines
Signed-off-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_backlight_regs.h | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/display/intel_backlight_regs.h +9
-12@@ -8,20 +8,17 @@#include "intel_display_reg_defs.h" -#define _VLV_BLC_PWM_CTL2_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61250) -#define _VLV_BLC_PWM_CTL2_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61350) -#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, \ - _VLV_BLC_PWM_CTL2_B) +#define _VLV_BLC_PWM_CTL2_A (VLV_DISPLAY_BASE + 0x61250) +#define _VLV_BLC_PWM_CTL2_B (VLV_DISPLAY_BASE + 0x61350) +#define VLV_BLC_PWM_CTL2 (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL2_A, _VLV_BLC_PWM_CTL2_B) -#define _VLV_BLC_PWM_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61254) -#define _VLV_BLC_PWM_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61354) -#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, \ - _VLV_BLC_PWM_CTL_B) +#define _VLV_BLC_PWM_CTL_A (VLV_DISPLAY_BASE + 0x61254) +#define _VLV_BLC_PWM_CTL_B (VLV_DISPLAY_BASE + 0x61354) +#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, _VLV_BLC_PWM_CTL_B) -#define _VLV_BLC_HIST_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61260) -#define _VLV_BLC_HIST_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61360) -#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, \ - _VLV_BLC_HIST_CTL_B) +#define _VLV_BLC_HIST_CTL_A (VLV_DISPLAY_BASE + 0x61260) +#define _VLV_BLC_HIST_CTL_B (VLV_DISPLAY_BASE + 0x61360) +#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, _VLV_BLC_HIST_CTL_B)/* Backlight control */ #define BLC_PWM_CTL2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61250)/* 965+ only */ Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
PATCH 2/5 drm/i915/backlight: get rid of the implicit dev_priv
In reply to Jani NikulaPass the i915 pointer to the macros where needed.
--- .../gpu/drm/i915/display/intel_backlight.c | 38 +++++++++---------- .../drm/i915/display/intel_backlight_regs.h | 6 +-- 2 files changed, 22 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +19 -19
@@ -159,7 +159,7 @@ static u32 i9xx_get_backlight(struct intel_connector *connector, enum pipe unusestruct intel_panel *panel = &connector->panel;u32 val; - val =intel_de_read (dev_priv,BLC_PWM_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ; + val =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)) &BACKLIGHT_DUTY_CYCLE_MASK ;if (DISPLAY_VER (dev_priv) <4 ) val >>=1 ;
@@ -244,8 +244,8 @@ static void i9xx_set_backlight(const struct drm_connector_state *conn_state, u32 mask =BACKLIGHT_DUTY_CYCLE_MASK_PNV ; } - tmp =intel_de_read (dev_priv,BLC_PWM_CTL ) & ~mask; -intel_de_write (dev_priv,BLC_PWM_CTL , tmp | level); + tmp =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)) & ~mask; +intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv), tmp | level); }static void vlv_set_backlight (const struct drm_connector_state *conn_state,u32 level)
@@ -383,8 +383,8 @@ static void i965_disable_backlight(const struct drm_connector_state *old_conn_stintel_backlight_set_pwm_level (old_conn_state, val); - tmp =intel_de_read (dev_priv,BLC_PWM_CTL2 ); -intel_de_write (dev_priv,BLC_PWM_CTL2 , tmp & ~BLM_PWM_ENABLE ); + tmp =intel_de_read (dev_priv,BLC_PWM_CTL2 (dev_priv)); +intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), tmp & ~BLM_PWM_ENABLE ); }static void vlv_disable_backlight (const struct drm_connector_state *old_conn_state,u32 val)
@@ -585,10 +585,10 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,struct intel_panel *panel = &connector->panel;u32 ctl, freq; - ctl =intel_de_read (dev_priv,BLC_PWM_CTL ); + ctl =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv));if (ctl &BACKLIGHT_DUTY_CYCLE_MASK_PNV ) {drm_dbg_kms (&dev_priv->drm,"backlight already enabled\n" ); -intel_de_write (dev_priv,BLC_PWM_CTL ,0 ); +intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv),0 ); } freq = panel->backlight.pwm_level_max;
@@ -601,8 +601,8 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,if (IS_PINEVIEW (dev_priv) && panel->backlight.active_low_pwm) ctl |=BLM_POLARITY_PNV ; -intel_de_write (dev_priv,BLC_PWM_CTL , ctl); -intel_de_posting_read (dev_priv,BLC_PWM_CTL ); +intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv), ctl); +intel_de_posting_read (dev_priv,BLC_PWM_CTL (dev_priv));/* XXX: combine this into above write? */ intel_backlight_set_pwm_level (conn_state, level);
@@ -613,7 +613,7 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,* that has backlight. */ if (DISPLAY_VER (dev_priv) ==2 ) -intel_de_write (dev_priv,BLC_HIST_CTL ,BLM_HISTOGRAM_ENABLE ); +intel_de_write (dev_priv,BLC_HIST_CTL (dev_priv),BLM_HISTOGRAM_ENABLE ); } static void i965_enable_backlight(const struct intel_crtc_state *crtc_state,
@@ -625,11 +625,11 @@ static void i965_enable_backlight(const struct intel_crtc_state *crtc_state,enum pipe pipe =to_intel_crtc (conn_state->crtc)->pipe;u32 ctl, ctl2, freq; - ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 ); + ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 (dev_priv));if (ctl2 &BLM_PWM_ENABLE ) {drm_dbg_kms (&dev_priv->drm,"backlight already enabled\n" ); ctl2 &= ~BLM_PWM_ENABLE ; -intel_de_write (dev_priv,BLC_PWM_CTL2 , ctl2); +intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), ctl2); } freq = panel->backlight.pwm_level_max;
@@ -637,16 +637,16 @@ static void i965_enable_backlight(const struct intel_crtc_state *crtc_state, freq /=0xff ; ctl = freq <<16 ; -intel_de_write (dev_priv,BLC_PWM_CTL , ctl); +intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv), ctl); ctl2 =BLM_PIPE (pipe);if (panel->backlight.combination_mode) ctl2 |=BLM_COMBINATION_MODE ;if (panel->backlight.active_low_pwm) ctl2 |=BLM_POLARITY_I965 ; -intel_de_write (dev_priv,BLC_PWM_CTL2 , ctl2); -intel_de_posting_read (dev_priv,BLC_PWM_CTL2 ); -intel_de_write (dev_priv,BLC_PWM_CTL2 , ctl2 |BLM_PWM_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), ctl2); +intel_de_posting_read (dev_priv,BLC_PWM_CTL2 (dev_priv)); +intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), ctl2 |BLM_PWM_ENABLE );intel_backlight_set_pwm_level (conn_state, level); }
@@ -1326,7 +1326,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unustruct intel_panel *panel = &connector->panel;u32 ctl, val; - ctl =intel_de_read (dev_priv,BLC_PWM_CTL ); + ctl =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv));if (DISPLAY_VER (dev_priv) ==2 ||IS_I915GM (dev_priv) ||IS_I945GM (dev_priv)) panel->backlight.combination_mode = ctl &BLM_LEGACY_MODE ;
@@ -1364,11 +1364,11 @@ static int i965_setup_backlight(struct intel_connector *connector, enum pipe unustruct intel_panel *panel = &connector->panel;u32 ctl, ctl2; - ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 ); + ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 (dev_priv)); panel->backlight.combination_mode = ctl2 &BLM_COMBINATION_MODE ; panel->backlight.active_low_pwm = ctl2 &BLM_POLARITY_I965 ; - ctl =intel_de_read (dev_priv,BLC_PWM_CTL ); + ctl =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)); panel->backlight.pwm_level_max = ctl >>16 ;if (!panel->backlight.pwm_level_max)
drivers/gpu/drm/i915/display/intel_backlight_regs.h +3 -3
@@ -21,7 +21,7 @@#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, _VLV_BLC_HIST_CTL_B)/* Backlight control */ -#define BLC_PWM_CTL2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61250)/* 965+ only */ +#define BLC_PWM_CTL2 (__i915) _MMIO(DISPLAY_MMIO_BASE(__i915) + 0x61250)/* 965+ only */ #define BLM_PWM_ENABLE (1 << 31)#define BLM_COMBINATION_MODE (1 << 30)/* gen4 only */ #define BLM_PIPE_SELECT (1 << 29)
@@ -44,7 +44,7 @@#define BLM_PHASE_IN_COUNT_MASK (0xff << 8)#define BLM_PHASE_IN_INCR_SHIFT (0)#define BLM_PHASE_IN_INCR_MASK (0xff << 0) -#define BLC_PWM_CTL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61254) +#define BLC_PWM_CTL (__i915) _MMIO(DISPLAY_MMIO_BASE(__i915) + 0x61254)/* * This is the most significant 15 bits of the number of backlight cycles in a * complete cycle of the modulated backlight control.
@@ -66,7 +66,7 @@#define BACKLIGHT_DUTY_CYCLE_MASK_PNV (0xfffe)#define BLM_POLARITY_PNV (1 << 0)/* pnv only */ -#define BLC_HIST_CTL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61260) +#define BLC_HIST_CTL (__i915) _MMIO(DISPLAY_MMIO_BASE(__i915) + 0x61260)#define BLM_HISTOGRAM_ENABLE (1 << 31)/* New registers for PCH-split platforms. Safe where new bits show up, the
Signature · 1 line
2.34.1
PATCH 3/5 drm/i915/backlight: mass rename dev_priv to i915
In reply to Jani NikulaWith the implicit dev_priv usage gone, we can rename dev_priv to i915 throughout. Do some drive-by whitespace cleanups while at it.
--- .../gpu/drm/i915/display/intel_backlight.c | 517 +++++++++--------- 1 file changed, 248 insertions(+), 269 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +248 -269
@@ -83,16 +83,16 @@ static u32 scale_hw_to_user(struct intel_connector *connector,u32 intel_backlight_invert_pwm_level (struct intel_connector *connector,u32 val) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -drm_WARN_ON (&dev_priv->drm, panel->backlight.pwm_level_max ==0 ); +drm_WARN_ON (&i915->drm, panel->backlight.pwm_level_max ==0 ); -if (dev_priv->params.invert_brightness <0 ) +if (i915->params.invert_brightness <0 )return val; -if (dev_priv->params.invert_brightness >0 || -intel_has_quirk (dev_priv,QUIRK_INVERT_BRIGHTNESS )) { +if (i915->params.invert_brightness >0 || +intel_has_quirk (i915,QUIRK_INVERT_BRIGHTNESS )) {return panel->backlight.pwm_level_max - val + panel->backlight.pwm_level_min; }
@@ -111,10 +111,10 @@ void intel_backlight_set_pwm_level(const struct drm_connector_state *conn_state,u32 intel_backlight_level_to_pwm (struct intel_connector *connector,u32 val) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (&i915->drm, panel->backlight.max ==0 || panel->backlight.pwm_level_max ==0 ); val = scale(val, panel->backlight.min, panel->backlight.max,
@@ -125,14 +125,14 @@ u32 intel_backlight_level_to_pwm(struct intel_connector *connector, u32 val)u32 intel_backlight_level_from_pwm (struct intel_connector *connector,u32 val) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (&i915->drm, panel->backlight.max ==0 || panel->backlight.pwm_level_max ==0 ); -if (dev_priv->params.invert_brightness >0 || - (dev_priv->params.invert_brightness ==0 &&intel_has_quirk (dev_priv,QUIRK_INVERT_BRIGHTNESS ))) +if (i915->params.invert_brightness >0 || + (i915->params.invert_brightness ==0 &&intel_has_quirk (i915,QUIRK_INVERT_BRIGHTNESS ))) val = panel->backlight.pwm_level_max - (val - panel->backlight.pwm_level_min); return scale(val, panel->backlight.pwm_level_min, panel->backlight.pwm_level_max,
@@ -141,32 +141,32 @@ u32 intel_backlight_level_from_pwm(struct intel_connector *connector, u32 val)static u32 lpt_get_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev); -return intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ) &BACKLIGHT_DUTY_CYCLE_MASK ; +return intel_de_read (i915,BLC_PWM_PCH_CTL2 ) &BACKLIGHT_DUTY_CYCLE_MASK ; }static u32 pch_get_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev); -return intel_de_read (dev_priv,BLC_PWM_CPU_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ; +return intel_de_read (i915,BLC_PWM_CPU_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ; }static u32 i9xx_get_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 val; - val =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)) &BACKLIGHT_DUTY_CYCLE_MASK ; -if (DISPLAY_VER (dev_priv) <4 ) + val =intel_de_read (i915,BLC_PWM_CTL (i915)) &BACKLIGHT_DUTY_CYCLE_MASK ; +if (DISPLAY_VER (i915) <4 ) val >>=1 ;if (panel->backlight.combination_mode) {u8 lbpc; -pci_read_config_byte (to_pci_dev (dev_priv->drm.dev),LBPC , &lbpc); +pci_read_config_byte (to_pci_dev (i915->drm.dev),LBPC , &lbpc); val *= lbpc; }
@@ -175,21 +175,20 @@ static u32 i9xx_get_backlight(struct intel_connector *connector, enum pipe unusestatic u32 vlv_get_backlight (struct intel_connector *connector,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev); -if (drm_WARN_ON (&dev_priv->drm, pipe !=PIPE_A && pipe !=PIPE_B )) +if (drm_WARN_ON (&i915->drm, pipe !=PIPE_A && pipe !=PIPE_B ))return 0 ; -return intel_de_read (dev_priv,VLV_BLC_PWM_CTL (pipe)) &BACKLIGHT_DUTY_CYCLE_MASK ; +return intel_de_read (i915,VLV_BLC_PWM_CTL (pipe)) &BACKLIGHT_DUTY_CYCLE_MASK ; }static u32 bxt_get_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -return intel_de_read (dev_priv, -BXT_BLC_PWM_DUTY (panel->backlight.controller)); +return intel_de_read (i915,BXT_BLC_PWM_DUTY (panel->backlight.controller)); }static u32 ext_pwm_get_backlight (struct intel_connector *connector,enum pipe unused)
@@ -204,69 +203,69 @@ static u32 ext_pwm_get_backlight(struct intel_connector *connector, enum pipe unstatic void lpt_set_backlight (const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev); +u32 val; -u32 val =intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; -intel_de_write (dev_priv,BLC_PWM_PCH_CTL2 , val | level); + val =intel_de_read (i915,BLC_PWM_PCH_CTL2 ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; +intel_de_write (i915,BLC_PWM_PCH_CTL2 , val | level); }static void pch_set_backlight (const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);u32 tmp; - tmp =intel_de_read (dev_priv,BLC_PWM_CPU_CTL ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; -intel_de_write (dev_priv,BLC_PWM_CPU_CTL , tmp | level); + tmp =intel_de_read (i915,BLC_PWM_CPU_CTL ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; +intel_de_write (i915,BLC_PWM_CPU_CTL , tmp | level); }static void i9xx_set_backlight (const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 tmp, mask; -drm_WARN_ON (&dev_priv->drm, panel->backlight.pwm_level_max ==0 ); +drm_WARN_ON (&i915->drm, panel->backlight.pwm_level_max ==0 );if (panel->backlight.combination_mode) {u8 lbpc; lbpc = level *0xfe / panel->backlight.pwm_level_max +1 ; level /= lbpc; -pci_write_config_byte (to_pci_dev (dev_priv->drm.dev),LBPC , lbpc); +pci_write_config_byte (to_pci_dev (i915->drm.dev),LBPC , lbpc); } -if (DISPLAY_VER (dev_priv) ==4 ) { +if (DISPLAY_VER (i915) ==4 ) { mask =BACKLIGHT_DUTY_CYCLE_MASK ; }else { level <<=1 ; mask =BACKLIGHT_DUTY_CYCLE_MASK_PNV ; } - tmp =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)) & ~mask; -intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv), tmp | level); + tmp =intel_de_read (i915,BLC_PWM_CTL (i915)) & ~mask; +intel_de_write (i915,BLC_PWM_CTL (i915), tmp | level); }static void vlv_set_backlight (const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);enum pipe pipe =to_intel_crtc (conn_state->crtc)->pipe;u32 tmp; - tmp =intel_de_read (dev_priv,VLV_BLC_PWM_CTL (pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK ; -intel_de_write (dev_priv,VLV_BLC_PWM_CTL (pipe), tmp | level); + tmp =intel_de_read (i915,VLV_BLC_PWM_CTL (pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK ; +intel_de_write (i915,VLV_BLC_PWM_CTL (pipe), tmp | level); }static void bxt_set_backlight (const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -intel_de_write (dev_priv, -BXT_BLC_PWM_DUTY (panel->backlight.controller), level); +intel_de_write (i915,BXT_BLC_PWM_DUTY (panel->backlight.controller), level); }static void ext_pwm_set_backlight (const struct drm_connector_state *conn_state,u32 level)
@@ -296,7 +295,7 @@ void intel_backlight_set_acpi(const struct drm_connector_state *conn_state, u32 user_level, u32 user_max) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 hw_level;
@@ -309,9 +308,9 @@ void intel_backlight_set_acpi(const struct drm_connector_state *conn_state,if (!panel->backlight.present || !conn_state->crtc)return ; -mutex_lock (&dev_priv->display.backlight.lock); +mutex_lock (&i915->display.backlight.lock); -drm_WARN_ON (&dev_priv->drm, panel->backlight.max ==0 ); +drm_WARN_ON (&i915->drm, panel->backlight.max ==0 ); hw_level =clamp_user_to_hw (connector, user_level, user_max); panel->backlight.level = hw_level;
@@ -325,13 +324,13 @@ void intel_backlight_set_acpi(const struct drm_connector_state *conn_state,if (panel->backlight.enabled)intel_panel_actually_set_backlight (conn_state, hw_level); -mutex_unlock (&dev_priv->display.backlight.lock); +mutex_unlock (&i915->display.backlight.lock); }static void lpt_disable_backlight (const struct drm_connector_state *old_conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (old_conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);u32 tmp;intel_backlight_set_pwm_level (old_conn_state, level);
@@ -344,31 +343,29 @@ static void lpt_disable_backlight(const struct drm_connector_state *old_conn_sta* This needs rework if we need to add support for CPU PWM on PCH split * platforms. */ - tmp =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ); + tmp =intel_de_read (i915,BLC_PWM_CPU_CTL2 );if (tmp &BLM_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm, -"cpu backlight was enabled, disabling\n" ); -intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , - tmp & ~BLM_PWM_ENABLE ); +drm_dbg_kms (&i915->drm,"cpu backlight was enabled, disabling\n" ); +intel_de_write (i915,BLC_PWM_CPU_CTL2 , tmp & ~BLM_PWM_ENABLE ); } - tmp =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); + tmp =intel_de_read (i915,BLC_PWM_PCH_CTL1 ); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); }static void pch_disable_backlight (const struct drm_connector_state *old_conn_state,u32 val) {struct intel_connector *connector =to_intel_connector (old_conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);u32 tmp;intel_backlight_set_pwm_level (old_conn_state, val); - tmp =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ); -intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , tmp & ~BLM_PWM_ENABLE ); + tmp =intel_de_read (i915,BLC_PWM_CPU_CTL2 ); +intel_de_write (i915,BLC_PWM_CPU_CTL2 , tmp & ~BLM_PWM_ENABLE ); - tmp =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); + tmp =intel_de_read (i915,BLC_PWM_PCH_CTL1 ); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); }static void i9xx_disable_backlight (const struct drm_connector_state *old_conn_state,u32 val)
@@ -378,62 +375,59 @@ static void i9xx_disable_backlight(const struct drm_connector_state *old_conn_ststatic void i965_disable_backlight (const struct drm_connector_state *old_conn_state,u32 val) { -struct drm_i915_private *dev_priv =to_i915 (old_conn_state->connector->dev); +struct drm_i915_private *i915 =to_i915 (old_conn_state->connector->dev);u32 tmp;intel_backlight_set_pwm_level (old_conn_state, val); - tmp =intel_de_read (dev_priv,BLC_PWM_CTL2 (dev_priv)); -intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), tmp & ~BLM_PWM_ENABLE ); + tmp =intel_de_read (i915,BLC_PWM_CTL2 (i915)); +intel_de_write (i915,BLC_PWM_CTL2 (i915), tmp & ~BLM_PWM_ENABLE ); }static void vlv_disable_backlight (const struct drm_connector_state *old_conn_state,u32 val) {struct intel_connector *connector =to_intel_connector (old_conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);enum pipe pipe =to_intel_crtc (old_conn_state->crtc)->pipe;u32 tmp;intel_backlight_set_pwm_level (old_conn_state, val); - tmp =intel_de_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe)); -intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), - tmp & ~BLM_PWM_ENABLE ); + tmp =intel_de_read (i915,VLV_BLC_PWM_CTL2 (pipe)); +intel_de_write (i915,VLV_BLC_PWM_CTL2 (pipe), tmp & ~BLM_PWM_ENABLE ); }static void bxt_disable_backlight (const struct drm_connector_state *old_conn_state,u32 val) {struct intel_connector *connector =to_intel_connector (old_conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 tmp;intel_backlight_set_pwm_level (old_conn_state, val); - tmp =intel_de_read (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller)); -intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + tmp =intel_de_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), tmp & ~BXT_BLC_PWM_ENABLE );if (panel->backlight.controller ==1 ) { - val =intel_de_read (dev_priv,UTIL_PIN_CTL ); + val =intel_de_read (i915,UTIL_PIN_CTL ); val &= ~UTIL_PIN_ENABLE ; -intel_de_write (dev_priv,UTIL_PIN_CTL , val); +intel_de_write (i915,UTIL_PIN_CTL , val); } }static void cnp_disable_backlight (const struct drm_connector_state *old_conn_state,u32 val) {struct intel_connector *connector =to_intel_connector (old_conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 tmp;intel_backlight_set_pwm_level (old_conn_state, val); - tmp =intel_de_read (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller)); -intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + tmp =intel_de_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), tmp & ~BXT_BLC_PWM_ENABLE ); }
@@ -451,7 +445,7 @@ static void ext_pwm_disable_backlight(const struct drm_connector_state *old_connvoid intel_backlight_disable (const struct drm_connector_state *old_conn_state) {struct intel_connector *connector =to_intel_connector (old_conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;if (!panel->backlight.present)
@@ -463,68 +457,66 @@ void intel_backlight_disable(const struct drm_connector_state *old_conn_state)* backlight. This will leave the backlight on unnecessarily when * another client is not activated. */ -if (dev_priv->drm.switch_power_state ==DRM_SWITCH_POWER_CHANGING ) { -drm_dbg_kms (&dev_priv->drm, -"Skipping backlight disable on vga switch\n" ); +if (i915->drm.switch_power_state ==DRM_SWITCH_POWER_CHANGING ) { +drm_dbg_kms (&i915->drm,"Skipping backlight disable on vga switch\n" );return ; } -mutex_lock (&dev_priv->display.backlight.lock); +mutex_lock (&i915->display.backlight.lock);if (panel->backlight.device) panel->backlight.device->props.power =FB_BLANK_POWERDOWN ; panel->backlight.enabled = false; panel->backlight.funcs->disable (old_conn_state,0 ); -mutex_unlock (&dev_priv->display.backlight.lock); +mutex_unlock (&i915->display.backlight.lock); }static void lpt_enable_backlight (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 pch_ctl1, pch_ctl2, schicken; - pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (i915,BLC_PWM_PCH_CTL1 );if (pch_ctl1 &BLM_PCH_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm,"pch backlight already enabled\n" ); +drm_dbg_kms (&i915->drm,"pch backlight already enabled\n" ); pch_ctl1 &= ~BLM_PCH_PWM_ENABLE ; -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , pch_ctl1); } -if (HAS_PCH_LPT (dev_priv)) { - schicken =intel_de_read (dev_priv,SOUTH_CHICKEN2 ); +if (HAS_PCH_LPT (i915)) { + schicken =intel_de_read (i915,SOUTH_CHICKEN2 );if (panel->backlight.alternate_pwm_increment) schicken |=LPT_PWM_GRANULARITY ;else schicken &= ~LPT_PWM_GRANULARITY ; -intel_de_write (dev_priv,SOUTH_CHICKEN2 , schicken); +intel_de_write (i915,SOUTH_CHICKEN2 , schicken); }else { - schicken =intel_de_read (dev_priv,SOUTH_CHICKEN1 ); + schicken =intel_de_read (i915,SOUTH_CHICKEN1 );if (panel->backlight.alternate_pwm_increment) schicken |=SPT_PWM_GRANULARITY ;else schicken &= ~SPT_PWM_GRANULARITY ; -intel_de_write (dev_priv,SOUTH_CHICKEN1 , schicken); +intel_de_write (i915,SOUTH_CHICKEN1 , schicken); } pch_ctl2 = panel->backlight.pwm_level_max <<16 ; -intel_de_write (dev_priv,BLC_PWM_PCH_CTL2 , pch_ctl2); +intel_de_write (i915,BLC_PWM_PCH_CTL2 , pch_ctl2); pch_ctl1 =0 ;if (panel->backlight.active_low_pwm) pch_ctl1 |=BLM_PCH_POLARITY ;/* After LPT, override is the default. */ -if (HAS_PCH_LPT (dev_priv)) +if (HAS_PCH_LPT (i915)) pch_ctl1 |=BLM_PCH_OVERRIDE_ENABLE ; -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); -intel_de_posting_read (dev_priv,BLC_PWM_PCH_CTL1 ); -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , - pch_ctl1 |BLM_PCH_PWM_ENABLE ); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_posting_read (i915,BLC_PWM_PCH_CTL1 ); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , pch_ctl1 |BLM_PCH_PWM_ENABLE );/* This won't stick until the above enable. */ intel_backlight_set_pwm_level (conn_state, level);
@@ -534,61 +526,60 @@ static void pch_enable_backlight(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 cpu_ctl2, pch_ctl1, pch_ctl2; - cpu_ctl2 =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ); + cpu_ctl2 =intel_de_read (i915,BLC_PWM_CPU_CTL2 );if (cpu_ctl2 &BLM_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm,"cpu backlight already enabled\n" ); +drm_dbg_kms (&i915->drm,"cpu backlight already enabled\n" ); cpu_ctl2 &= ~BLM_PWM_ENABLE ; -intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , cpu_ctl2); +intel_de_write (i915,BLC_PWM_CPU_CTL2 , cpu_ctl2); } - pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (i915,BLC_PWM_PCH_CTL1 );if (pch_ctl1 &BLM_PCH_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm,"pch backlight already enabled\n" ); +drm_dbg_kms (&i915->drm,"pch backlight already enabled\n" ); pch_ctl1 &= ~BLM_PCH_PWM_ENABLE ; -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , pch_ctl1); }if (cpu_transcoder ==TRANSCODER_EDP ) cpu_ctl2 =BLM_TRANSCODER_EDP ;else cpu_ctl2 =BLM_PIPE (cpu_transcoder); -intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , cpu_ctl2); -intel_de_posting_read (dev_priv,BLC_PWM_CPU_CTL2 ); -intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , cpu_ctl2 |BLM_PWM_ENABLE ); +intel_de_write (i915,BLC_PWM_CPU_CTL2 , cpu_ctl2); +intel_de_posting_read (i915,BLC_PWM_CPU_CTL2 ); +intel_de_write (i915,BLC_PWM_CPU_CTL2 , cpu_ctl2 |BLM_PWM_ENABLE );/* This won't stick until the above enable. */ intel_backlight_set_pwm_level (conn_state, level); pch_ctl2 = panel->backlight.pwm_level_max <<16 ; -intel_de_write (dev_priv,BLC_PWM_PCH_CTL2 , pch_ctl2); +intel_de_write (i915,BLC_PWM_PCH_CTL2 , pch_ctl2); pch_ctl1 =0 ;if (panel->backlight.active_low_pwm) pch_ctl1 |=BLM_PCH_POLARITY ; -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); -intel_de_posting_read (dev_priv,BLC_PWM_PCH_CTL1 ); -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , - pch_ctl1 |BLM_PCH_PWM_ENABLE ); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_posting_read (i915,BLC_PWM_PCH_CTL1 ); +intel_de_write (i915,BLC_PWM_PCH_CTL1 , pch_ctl1 |BLM_PCH_PWM_ENABLE ); }static void i9xx_enable_backlight (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 ctl, freq; - ctl =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)); + ctl =intel_de_read (i915,BLC_PWM_CTL (i915));if (ctl &BACKLIGHT_DUTY_CYCLE_MASK_PNV ) { -drm_dbg_kms (&dev_priv->drm,"backlight already enabled\n" ); -intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv),0 ); +drm_dbg_kms (&i915->drm,"backlight already enabled\n" ); +intel_de_write (i915,BLC_PWM_CTL (i915),0 ); } freq = panel->backlight.pwm_level_max;
@@ -598,11 +589,11 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state, ctl = freq <<17 ;if (panel->backlight.combination_mode) ctl |=BLM_LEGACY_MODE ; -if (IS_PINEVIEW (dev_priv) && panel->backlight.active_low_pwm) +if (IS_PINEVIEW (i915) && panel->backlight.active_low_pwm) ctl |=BLM_POLARITY_PNV ; -intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv), ctl); -intel_de_posting_read (dev_priv,BLC_PWM_CTL (dev_priv)); +intel_de_write (i915,BLC_PWM_CTL (i915), ctl); +intel_de_posting_read (i915,BLC_PWM_CTL (i915));/* XXX: combine this into above write? */ intel_backlight_set_pwm_level (conn_state, level);
@@ -612,24 +603,24 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,* 855gm only, but checking for gen2 is safe, as 855gm is the only gen2 * that has backlight. */ -if (DISPLAY_VER (dev_priv) ==2 ) -intel_de_write (dev_priv,BLC_HIST_CTL (dev_priv),BLM_HISTOGRAM_ENABLE ); +if (DISPLAY_VER (i915) ==2 ) +intel_de_write (i915,BLC_HIST_CTL (i915),BLM_HISTOGRAM_ENABLE ); }static void i965_enable_backlight (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;enum pipe pipe =to_intel_crtc (conn_state->crtc)->pipe;u32 ctl, ctl2, freq; - ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 (dev_priv)); + ctl2 =intel_de_read (i915,BLC_PWM_CTL2 (i915));if (ctl2 &BLM_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm,"backlight already enabled\n" ); +drm_dbg_kms (&i915->drm,"backlight already enabled\n" ); ctl2 &= ~BLM_PWM_ENABLE ; -intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), ctl2); +intel_de_write (i915,BLC_PWM_CTL2 (i915), ctl2); } freq = panel->backlight.pwm_level_max;
@@ -637,16 +628,16 @@ static void i965_enable_backlight(const struct intel_crtc_state *crtc_state, freq /=0xff ; ctl = freq <<16 ; -intel_de_write (dev_priv,BLC_PWM_CTL (dev_priv), ctl); +intel_de_write (i915,BLC_PWM_CTL (i915), ctl); ctl2 =BLM_PIPE (pipe);if (panel->backlight.combination_mode) ctl2 |=BLM_COMBINATION_MODE ;if (panel->backlight.active_low_pwm) ctl2 |=BLM_POLARITY_I965 ; -intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), ctl2); -intel_de_posting_read (dev_priv,BLC_PWM_CTL2 (dev_priv)); -intel_de_write (dev_priv,BLC_PWM_CTL2 (dev_priv), ctl2 |BLM_PWM_ENABLE ); +intel_de_write (i915,BLC_PWM_CTL2 (i915), ctl2); +intel_de_posting_read (i915,BLC_PWM_CTL2 (i915)); +intel_de_write (i915,BLC_PWM_CTL2 (i915), ctl2 |BLM_PWM_ENABLE );intel_backlight_set_pwm_level (conn_state, level); }
@@ -655,20 +646,20 @@ static void vlv_enable_backlight(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;enum pipe pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe;u32 ctl, ctl2; - ctl2 =intel_de_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe)); + ctl2 =intel_de_read (i915,VLV_BLC_PWM_CTL2 (pipe));if (ctl2 &BLM_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm,"backlight already enabled\n" ); +drm_dbg_kms (&i915->drm,"backlight already enabled\n" ); ctl2 &= ~BLM_PWM_ENABLE ; -intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), ctl2); +intel_de_write (i915,VLV_BLC_PWM_CTL2 (pipe), ctl2); } ctl = panel->backlight.pwm_level_max <<16 ; -intel_de_write (dev_priv,VLV_BLC_PWM_CTL (pipe), ctl); +intel_de_write (i915,VLV_BLC_PWM_CTL (pipe), ctl);/* XXX: combine this into above write? */ intel_backlight_set_pwm_level (conn_state, level);
@@ -676,50 +667,45 @@ static void vlv_enable_backlight(const struct intel_crtc_state *crtc_state, ctl2 =0 ;if (panel->backlight.active_low_pwm) ctl2 |=BLM_POLARITY_I965 ; -intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), ctl2); -intel_de_posting_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe)); -intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), - ctl2 |BLM_PWM_ENABLE ); +intel_de_write (i915,VLV_BLC_PWM_CTL2 (pipe), ctl2); +intel_de_posting_read (i915,VLV_BLC_PWM_CTL2 (pipe)); +intel_de_write (i915,VLV_BLC_PWM_CTL2 (pipe), ctl2 |BLM_PWM_ENABLE ); }static void bxt_enable_backlight (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state,u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;enum pipe pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe;u32 pwm_ctl, val;/* Controller 1 uses the utility pin. */ if (panel->backlight.controller ==1 ) { - val =intel_de_read (dev_priv,UTIL_PIN_CTL ); + val =intel_de_read (i915,UTIL_PIN_CTL );if (val &UTIL_PIN_ENABLE ) { -drm_dbg_kms (&dev_priv->drm, -"util pin already enabled\n" ); +drm_dbg_kms (&i915->drm,"util pin already enabled\n" ); val &= ~UTIL_PIN_ENABLE ; -intel_de_write (dev_priv,UTIL_PIN_CTL , val); +intel_de_write (i915,UTIL_PIN_CTL , val); } val =0 ;if (panel->backlight.util_pin_active_low) val |=UTIL_PIN_POLARITY ; -intel_de_write (dev_priv,UTIL_PIN_CTL , +intel_de_write (i915,UTIL_PIN_CTL , val |UTIL_PIN_PIPE (pipe) |UTIL_PIN_MODE_PWM |UTIL_PIN_ENABLE ); } - pwm_ctl =intel_de_read (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller)); + pwm_ctl =intel_de_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller));if (pwm_ctl &BXT_BLC_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm,"backlight already enabled\n" ); +drm_dbg_kms (&i915->drm,"backlight already enabled\n" ); pwm_ctl &= ~BXT_BLC_PWM_ENABLE ; -intel_de_write (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller), +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl); } -intel_de_write (dev_priv, -BXT_BLC_PWM_FREQ (panel->backlight.controller), +intel_de_write (i915,BXT_BLC_PWM_FREQ (panel->backlight.controller), panel->backlight.pwm_level_max);intel_backlight_set_pwm_level (conn_state, level);
@@ -728,11 +714,9 @@ static void bxt_enable_backlight(const struct intel_crtc_state *crtc_state,if (panel->backlight.active_low_pwm) pwm_ctl |=BXT_BLC_PWM_POLARITY ; -intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), - pwm_ctl); -intel_de_posting_read (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller)); -intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl); +intel_de_posting_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl |BXT_BLC_PWM_ENABLE ); }
@@ -740,22 +724,19 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 pwm_ctl; - pwm_ctl =intel_de_read (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller)); + pwm_ctl =intel_de_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller));if (pwm_ctl &BXT_BLC_PWM_ENABLE ) { -drm_dbg_kms (&dev_priv->drm,"backlight already enabled\n" ); +drm_dbg_kms (&i915->drm,"backlight already enabled\n" ); pwm_ctl &= ~BXT_BLC_PWM_ENABLE ; -intel_de_write (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller), +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl); } -intel_de_write (dev_priv, -BXT_BLC_PWM_FREQ (panel->backlight.controller), +intel_de_write (i915,BXT_BLC_PWM_FREQ (panel->backlight.controller), panel->backlight.pwm_level_max);intel_backlight_set_pwm_level (conn_state, level);
@@ -764,11 +745,9 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state,if (panel->backlight.active_low_pwm) pwm_ctl |=BXT_BLC_PWM_POLARITY ; -intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), - pwm_ctl); -intel_de_posting_read (dev_priv, -BXT_BLC_PWM_CTL (panel->backlight.controller)); -intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl); +intel_de_posting_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (i915,BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl |BXT_BLC_PWM_ENABLE ); }
@@ -810,37 +789,37 @@ void intel_backlight_enable(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;enum pipe pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe;if (!panel->backlight.present)return ; -drm_dbg_kms (&dev_priv->drm,"pipe %c\n" ,pipe_name (pipe)); +drm_dbg_kms (&i915->drm,"pipe %c\n" ,pipe_name (pipe)); -mutex_lock (&dev_priv->display.backlight.lock); +mutex_lock (&i915->display.backlight.lock);__intel_backlight_enable (crtc_state, conn_state); -mutex_unlock (&dev_priv->display.backlight.lock); +mutex_unlock (&i915->display.backlight.lock); }#if IS_ENABLED (CONFIG_BACKLIGHT_CLASS_DEVICE )static u32 intel_panel_get_backlight (struct intel_connector *connector) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 val =0 ; -mutex_lock (&dev_priv->display.backlight.lock); +mutex_lock (&i915->display.backlight.lock);if (panel->backlight.enabled) val = panel->backlight.funcs->get (connector,intel_connector_get_pipe (connector)); -mutex_unlock (&dev_priv->display.backlight.lock); +mutex_unlock (&i915->display.backlight.lock); -drm_dbg_kms (&dev_priv->drm,"get backlight PWM = %d\n" , val); +drm_dbg_kms (&i915->drm,"get backlight PWM = %d\n" , val);return val; }
@@ -859,16 +838,16 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_sta u32 user_level, u32 user_max) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 hw_level;if (!panel->backlight.present)return ; -mutex_lock (&dev_priv->display.backlight.lock); +mutex_lock (&i915->display.backlight.lock); -drm_WARN_ON (&dev_priv->drm, panel->backlight.max ==0 ); +drm_WARN_ON (&i915->drm, panel->backlight.max ==0 ); hw_level =scale_user_to_hw (connector, user_level, user_max); panel->backlight.level = hw_level;
@@ -876,7 +855,7 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_staif (panel->backlight.enabled)intel_panel_actually_set_backlight (conn_state, hw_level); -mutex_unlock (&dev_priv->display.backlight.lock); +mutex_unlock (&i915->display.backlight.lock); }static int intel_backlight_device_update_status (struct backlight_device *bd)
@@ -915,11 +894,11 @@ static int intel_backlight_device_get_brightness(struct backlight_device *bd) {struct intel_connector *connector =bl_get_data (bd);struct drm_device *dev = connector->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *i915 =to_i915 (dev);intel_wakeref_t wakeref;int ret =0 ; - with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) { + with_intel_runtime_pm(&i915->runtime_pm, wakeref) {u32 hw_level;drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );
@@ -1038,9 +1017,9 @@ void intel_backlight_device_unregister(struct intel_connector *connector)*/ static u32 cnp_hz_to_pwm (struct intel_connector *connector,u32 pwm_freq_hz) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev); -return DIV_ROUND_CLOSEST (KHz (RUNTIME_INFO (dev_priv)->rawclk_freq), +return DIV_ROUND_CLOSEST (KHz (RUNTIME_INFO (i915)->rawclk_freq), pwm_freq_hz); }
@@ -1077,7 +1056,7 @@ static u32 spt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)*/ static u32 lpt_hz_to_pwm (struct intel_connector *connector,u32 pwm_freq_hz) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 mul, clock;
@@ -1086,7 +1065,7 @@ static u32 lpt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)else mul =128 ; -if (HAS_PCH_LPT_H (dev_priv)) +if (HAS_PCH_LPT_H (i915)) clock =MHz (135 );/* LPT:H */ else clock =MHz (24 );/* LPT:LP */
@@ -1100,9 +1079,9 @@ static u32 lpt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)*/ static u32 pch_hz_to_pwm (struct intel_connector *connector,u32 pwm_freq_hz) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev); -return DIV_ROUND_CLOSEST (KHz (RUNTIME_INFO (dev_priv)->rawclk_freq), +return DIV_ROUND_CLOSEST (KHz (RUNTIME_INFO (i915)->rawclk_freq), pwm_freq_hz *128 ); }
@@ -1116,13 +1095,13 @@ static u32 pch_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)*/ static u32 i9xx_hz_to_pwm (struct intel_connector *connector,u32 pwm_freq_hz) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);int clock; -if (IS_PINEVIEW (dev_priv)) - clock =KHz (RUNTIME_INFO (dev_priv)->rawclk_freq); +if (IS_PINEVIEW (i915)) + clock =KHz (RUNTIME_INFO (i915)->rawclk_freq);else - clock =KHz (dev_priv->display.cdclk.hw.cdclk); + clock =KHz (i915->display.cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *32 ); }
@@ -1134,13 +1113,13 @@ static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)*/ static u32 i965_hz_to_pwm (struct intel_connector *connector,u32 pwm_freq_hz) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);int clock; -if (IS_G4X (dev_priv)) - clock =KHz (RUNTIME_INFO (dev_priv)->rawclk_freq); +if (IS_G4X (i915)) + clock =KHz (RUNTIME_INFO (i915)->rawclk_freq);else - clock =KHz (dev_priv->display.cdclk.hw.cdclk); + clock =KHz (i915->display.cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *128 ); }
@@ -1152,17 +1131,17 @@ static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)*/ static u32 vlv_hz_to_pwm (struct intel_connector *connector,u32 pwm_freq_hz) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);int mul, clock; -if ((intel_de_read (dev_priv,CBR1_VLV ) &CBR_PWM_CLOCK_MUX_SELECT ) ==0 ) { -if (IS_CHERRYVIEW (dev_priv)) +if ((intel_de_read (i915,CBR1_VLV ) &CBR_PWM_CLOCK_MUX_SELECT ) ==0 ) { +if (IS_CHERRYVIEW (i915)) clock =KHz (19200 );else clock =MHz (25 ); mul =16 ; }else { - clock =KHz (RUNTIME_INFO (dev_priv)->rawclk_freq); + clock =KHz (RUNTIME_INFO (i915)->rawclk_freq); mul =128 ; }
@@ -1171,16 +1150,16 @@ static u32 vlv_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)static u16 get_vbt_pwm_freq (struct intel_connector *connector) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);u16 pwm_freq_hz = connector->panel.vbt.backlight.pwm_freq_hz;if (pwm_freq_hz) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"VBT defined backlight frequency %u Hz\n" , pwm_freq_hz); }else { pwm_freq_hz =200 ; -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"default backlight frequency %u Hz\n" , pwm_freq_hz); }
@@ -1190,20 +1169,20 @@ static u16 get_vbt_pwm_freq(struct intel_connector *connector)static u32 get_backlight_max_vbt (struct intel_connector *connector) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u16 pwm_freq_hz =get_vbt_pwm_freq (connector);u32 pwm;if (!panel->backlight.pwm_funcs->hz_to_pwm) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"backlight frequency conversion not supported\n" );return 0 ; } pwm = panel->backlight.pwm_funcs->hz_to_pwm (connector, pwm_freq_hz);if (!pwm) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"backlight frequency conversion failed\n" );return 0 ; }
@@ -1216,11 +1195,11 @@ static u32 get_backlight_max_vbt(struct intel_connector *connector)*/ static u32 get_backlight_min_vbt (struct intel_connector *connector) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;int min; -drm_WARN_ON (&dev_priv->drm, panel->backlight.pwm_level_max ==0 ); +drm_WARN_ON (&i915->drm, panel->backlight.pwm_level_max ==0 );/* * XXX: If the vbt value is 255, it makes min equal to max, which leads
@@ -1231,7 +1210,7 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)*/ min =clamp_t (int, connector->panel.vbt.backlight.min_brightness,0 ,64 );if (min != connector->panel.vbt.backlight.min_brightness) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"clamping VBT min backlight %d/255 to %d/255\n" , connector->panel.vbt.backlight.min_brightness, min); }
@@ -1242,24 +1221,24 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)static int lpt_setup_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 cpu_ctl2, pch_ctl1, pch_ctl2, val;bool alt, cpu_mode; -if (HAS_PCH_LPT (dev_priv)) - alt =intel_de_read (dev_priv,SOUTH_CHICKEN2 ) &LPT_PWM_GRANULARITY ; +if (HAS_PCH_LPT (i915)) + alt =intel_de_read (i915,SOUTH_CHICKEN2 ) &LPT_PWM_GRANULARITY ;else - alt =intel_de_read (dev_priv,SOUTH_CHICKEN1 ) &SPT_PWM_GRANULARITY ; + alt =intel_de_read (i915,SOUTH_CHICKEN1 ) &SPT_PWM_GRANULARITY ; panel->backlight.alternate_pwm_increment = alt; - pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (i915,BLC_PWM_PCH_CTL1 ); panel->backlight.active_low_pwm = pch_ctl1 &BLM_PCH_POLARITY ; - pch_ctl2 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ); + pch_ctl2 =intel_de_read (i915,BLC_PWM_PCH_CTL2 ); panel->backlight.pwm_level_max = pch_ctl2 >>16 ; - cpu_ctl2 =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ); + cpu_ctl2 =intel_de_read (i915,BLC_PWM_CPU_CTL2 );if (!panel->backlight.pwm_level_max) panel->backlight.pwm_level_max =get_backlight_max_vbt (connector);
@@ -1271,22 +1250,22 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unus panel->backlight.pwm_enabled = pch_ctl1 &BLM_PCH_PWM_ENABLE ; - cpu_mode = panel->backlight.pwm_enabled &&HAS_PCH_LPT (dev_priv) && + cpu_mode = panel->backlight.pwm_enabled &&HAS_PCH_LPT (i915) && !(pch_ctl1 &BLM_PCH_OVERRIDE_ENABLE ) && (cpu_ctl2 &BLM_PWM_ENABLE );if (cpu_mode) { val =pch_get_backlight (connector, unused); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"CPU backlight register was enabled, switching to PCH override\n" );/* Write converted CPU PWM value to PCH override register */ lpt_set_backlight (connector->base.state, val); -intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , +intel_de_write (i915,BLC_PWM_PCH_CTL1 , pch_ctl1 |BLM_PCH_OVERRIDE_ENABLE ); -intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , +intel_de_write (i915,BLC_PWM_CPU_CTL2 , cpu_ctl2 & ~BLM_PWM_ENABLE ); }
@@ -1295,14 +1274,14 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unusstatic int pch_setup_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 cpu_ctl2, pch_ctl1, pch_ctl2; - pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (i915,BLC_PWM_PCH_CTL1 ); panel->backlight.active_low_pwm = pch_ctl1 &BLM_PCH_POLARITY ; - pch_ctl2 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ); + pch_ctl2 =intel_de_read (i915,BLC_PWM_PCH_CTL2 ); panel->backlight.pwm_level_max = pch_ctl2 >>16 ;if (!panel->backlight.pwm_level_max)
@@ -1313,7 +1292,7 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unus panel->backlight.pwm_level_min =get_backlight_min_vbt (connector); - cpu_ctl2 =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ); + cpu_ctl2 =intel_de_read (i915,BLC_PWM_CPU_CTL2 ); panel->backlight.pwm_enabled = (cpu_ctl2 &BLM_PWM_ENABLE ) && (pch_ctl1 &BLM_PCH_PWM_ENABLE );
@@ -1322,16 +1301,16 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unusstatic int i9xx_setup_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 ctl, val; - ctl =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)); + ctl =intel_de_read (i915,BLC_PWM_CTL (i915)); -if (DISPLAY_VER (dev_priv) ==2 ||IS_I915GM (dev_priv) ||IS_I945GM (dev_priv)) +if (DISPLAY_VER (i915) ==2 ||IS_I915GM (i915) ||IS_I945GM (i915)) panel->backlight.combination_mode = ctl &BLM_LEGACY_MODE ; -if (IS_PINEVIEW (dev_priv)) +if (IS_PINEVIEW (i915)) panel->backlight.active_low_pwm = ctl &BLM_POLARITY_PNV ; panel->backlight.pwm_level_max = ctl >>17 ;
@@ -1360,15 +1339,15 @@ static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unustatic int i965_setup_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 ctl, ctl2; - ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 (dev_priv)); + ctl2 =intel_de_read (i915,BLC_PWM_CTL2 (i915)); panel->backlight.combination_mode = ctl2 &BLM_COMBINATION_MODE ; panel->backlight.active_low_pwm = ctl2 &BLM_POLARITY_I965 ; - ctl =intel_de_read (dev_priv,BLC_PWM_CTL (dev_priv)); + ctl =intel_de_read (i915,BLC_PWM_CTL (i915)); panel->backlight.pwm_level_max = ctl >>16 ;if (!panel->backlight.pwm_level_max)
@@ -1389,17 +1368,17 @@ static int i965_setup_backlight(struct intel_connector *connector, enum pipe unustatic int vlv_setup_backlight (struct intel_connector *connector,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 ctl, ctl2; -if (drm_WARN_ON (&dev_priv->drm, pipe !=PIPE_A && pipe !=PIPE_B )) +if (drm_WARN_ON (&i915->drm, pipe !=PIPE_A && pipe !=PIPE_B ))return -ENODEV ; - ctl2 =intel_de_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe)); + ctl2 =intel_de_read (i915,VLV_BLC_PWM_CTL2 (pipe)); panel->backlight.active_low_pwm = ctl2 &BLM_POLARITY_I965 ; - ctl =intel_de_read (dev_priv,VLV_BLC_PWM_CTL (pipe)); + ctl =intel_de_read (i915,VLV_BLC_PWM_CTL (pipe)); panel->backlight.pwm_level_max = ctl >>16 ;if (!panel->backlight.pwm_level_max)
@@ -1418,25 +1397,25 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipestatic int bxt_setup_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 pwm_ctl, val; panel->backlight.controller = connector->panel.vbt.backlight.controller; - pwm_ctl =intel_de_read (dev_priv, + pwm_ctl =intel_de_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller));/* Controller 1 uses the utility pin. */ if (panel->backlight.controller ==1 ) { - val =intel_de_read (dev_priv,UTIL_PIN_CTL ); + val =intel_de_read (i915,UTIL_PIN_CTL ); panel->backlight.util_pin_active_low = val &UTIL_PIN_POLARITY ; } panel->backlight.active_low_pwm = pwm_ctl &BXT_BLC_PWM_POLARITY ; panel->backlight.pwm_level_max = -intel_de_read (dev_priv,BXT_BLC_PWM_FREQ (panel->backlight.controller)); +intel_de_read (i915,BXT_BLC_PWM_FREQ (panel->backlight.controller));if (!panel->backlight.pwm_level_max) panel->backlight.pwm_level_max =get_backlight_max_vbt (connector);
@@ -1454,7 +1433,7 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)static int cnp_setup_backlight (struct intel_connector *connector,enum pipe unused) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;u32 pwm_ctl;
@@ -1465,12 +1444,12 @@ cnp_setup_backlight(struct intel_connector *connector, enum pipe unused)*/ panel->backlight.controller =0 ; - pwm_ctl =intel_de_read (dev_priv, + pwm_ctl =intel_de_read (i915,BXT_BLC_PWM_CTL (panel->backlight.controller)); panel->backlight.active_low_pwm = pwm_ctl &BXT_BLC_PWM_POLARITY ; panel->backlight.pwm_level_max = -intel_de_read (dev_priv,BXT_BLC_PWM_FREQ (panel->backlight.controller)); +intel_de_read (i915,BXT_BLC_PWM_FREQ (panel->backlight.controller));if (!panel->backlight.pwm_level_max) panel->backlight.pwm_level_max =get_backlight_max_vbt (connector);
@@ -1489,7 +1468,7 @@ static int ext_pwm_setup_backlight(struct intel_connector *connector, enum pipe pipe) {struct drm_device *dev = connector->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *i915 =to_i915 (dev);struct intel_panel *panel = &connector->panel;const char *desc;u32 level;
@@ -1504,7 +1483,7 @@ static int ext_pwm_setup_backlight(struct intel_connector *connector, }if (IS_ERR (panel->backlight.pwm)) { -drm_err (&dev_priv->drm,"Failed to get the %s PWM chip\n" , +drm_err (&i915->drm,"Failed to get the %s PWM chip\n" , desc); panel->backlight.pwm =NULL ;return -ENODEV ;
@@ -1522,7 +1501,7 @@ static int ext_pwm_setup_backlight(struct intel_connector *connector, level =intel_backlight_invert_pwm_level (connector, level); panel->backlight.pwm_enabled = true; -drm_dbg_kms (&dev_priv->drm,"PWM already enabled at freq %ld, VBT freq %d, level %d\n" , +drm_dbg_kms (&i915->drm,"PWM already enabled at freq %ld, VBT freq %d, level %d\n" ,NSEC_PER_SEC / (unsigned long )panel->backlight.pwm_state.period,get_vbt_pwm_freq (connector), level); }else {
@@ -1531,7 +1510,7 @@ static int ext_pwm_setup_backlight(struct intel_connector *connector,NSEC_PER_SEC /get_vbt_pwm_freq (connector); } -drm_info (&dev_priv->drm,"Using %s PWM for LCD backlight control\n" , +drm_info (&i915->drm,"Using %s PWM for LCD backlight control\n" , desc);return 0 ; }
@@ -1594,47 +1573,47 @@ void intel_backlight_update(struct intel_atomic_state *state, const struct drm_connector_state *conn_state) {struct intel_connector *connector =to_intel_connector (conn_state->connector); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;if (!panel->backlight.present)return ; -mutex_lock (&dev_priv->display.backlight.lock); +mutex_lock (&i915->display.backlight.lock);if (!panel->backlight.enabled)__intel_backlight_enable (crtc_state, conn_state); -mutex_unlock (&dev_priv->display.backlight.lock); +mutex_unlock (&i915->display.backlight.lock); }int intel_backlight_setup (struct intel_connector *connector,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;int ret;if (!connector->panel.vbt.backlight.present) { -if (intel_has_quirk (dev_priv,QUIRK_BACKLIGHT_PRESENT )) { -drm_dbg_kms (&dev_priv->drm, +if (intel_has_quirk (i915,QUIRK_BACKLIGHT_PRESENT )) { +drm_dbg_kms (&i915->drm,"no backlight present per VBT, but present per quirk\n" ); }else { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"no backlight present per VBT\n" );return 0 ; } }/* ensure intel_panel has been initialized first */ -if (drm_WARN_ON (&dev_priv->drm, !panel->backlight.funcs)) +if (drm_WARN_ON (&i915->drm, !panel->backlight.funcs))return -ENODEV ;/* set level and max in panel struct */ -mutex_lock (&dev_priv->display.backlight.lock); +mutex_lock (&i915->display.backlight.lock); ret = panel->backlight.funcs->setup (connector, pipe); -mutex_unlock (&dev_priv->display.backlight.lock); +mutex_unlock (&i915->display.backlight.lock);if (ret) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (&i915->drm,"failed to setup backlight for connector %s\n" , connector->base.name);return ret;
@@ -1642,7 +1621,7 @@ int intel_backlight_setup(struct intel_connector *connector, enum pipe pipe) panel->backlight.present = true; - drm_dbg_kms(&dev_priv->drm, + drm_dbg_kms(&i915->drm, "Connector %s backlight initialized, %s, brightness %u/%u\n", connector->base.name, str_enabled_disabled(panel->backlight.enabled),
@@ -1753,30 +1732,30 @@ void intel_backlight_init_funcs(struct intel_panel *panel) {struct intel_connector *connector = container_of(panel, struct intel_connector, panel); -struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);if (connector->base.connector_type ==DRM_MODE_CONNECTOR_DSI &&intel_dsi_dcs_init_backlight_funcs (connector) ==0 )return ; -if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) { +if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) { panel->backlight.pwm_funcs = &bxt_pwm_funcs; - }else if (INTEL_PCH_TYPE (dev_priv) >=PCH_CNP ) { + }else if (INTEL_PCH_TYPE (i915) >=PCH_CNP ) { panel->backlight.pwm_funcs = &cnp_pwm_funcs; - }else if (INTEL_PCH_TYPE (dev_priv) >=PCH_LPT ) { -if (HAS_PCH_LPT (dev_priv)) + }else if (INTEL_PCH_TYPE (i915) >=PCH_LPT ) { +if (HAS_PCH_LPT (i915)) panel->backlight.pwm_funcs = &lpt_pwm_funcs;else panel->backlight.pwm_funcs = &spt_pwm_funcs; - }else if (HAS_PCH_SPLIT (dev_priv)) { + }else if (HAS_PCH_SPLIT (i915)) { panel->backlight.pwm_funcs = &pch_pwm_funcs; - }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { + }else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) {if (connector->base.connector_type ==DRM_MODE_CONNECTOR_DSI ) { panel->backlight.pwm_funcs = &ext_pwm_funcs; }else { panel->backlight.pwm_funcs = &vlv_pwm_funcs; } - }else if (DISPLAY_VER (dev_priv) ==4 ) { + }else if (DISPLAY_VER (i915) ==4 ) { panel->backlight.pwm_funcs = &i965_pwm_funcs; }else { panel->backlight.pwm_funcs = &i9xx_pwm_funcs;
@@ -1786,7 +1765,7 @@ void intel_backlight_init_funcs(struct intel_panel *panel)if (intel_dp_aux_init_backlight_funcs (connector) ==0 )return ; -if (!intel_has_quirk (dev_priv,QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK )) +if (!intel_has_quirk (i915,QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK )) connector->panel.backlight.power = intel_pps_backlight_power; }
Signature · 1 line
2.34.1
PATCH 4/5 drm/i915/backlight: drop drm_device local variables in favor of i915
In reply to Jani NikulaPrefer only having struct drm_i915_private *i915 around. Drop the drm_device *dev locals.
--- .../gpu/drm/i915/display/intel_backlight.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +11 -11
@@ -861,10 +861,11 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_stastatic int intel_backlight_device_update_status (struct backlight_device *bd) {struct intel_connector *connector =bl_get_data (bd); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -struct drm_device *dev = connector->base.dev; -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +drm_modeset_lock (&i915->drm.mode_config.connection_mutex,NULL ); +DRM_DEBUG_KMS ("updating intel_backlight, brightness=%d/%d\n" , bd->props.brightness, bd->props.max_brightness); intel_panel_set_backlight(connector->base.state, bd->props.brightness,
@@ -886,28 +887,28 @@ static int intel_backlight_device_update_status(struct backlight_device *bd) bd->props.power =FB_BLANK_POWERDOWN ; } -drm_modeset_unlock (&dev->mode_config.connection_mutex); +drm_modeset_unlock (&i915->drm.mode_config.connection_mutex); +return 0 ; }static int intel_backlight_device_get_brightness (struct backlight_device *bd) {struct intel_connector *connector =bl_get_data (bd); -struct drm_device *dev = connector->base.dev; -struct drm_i915_private *i915 =to_i915 (dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);intel_wakeref_t wakeref;int ret =0 ; with_intel_runtime_pm(&i915->runtime_pm, wakeref) {u32 hw_level; -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +drm_modeset_lock (&i915->drm.mode_config.connection_mutex,NULL ); hw_level =intel_panel_get_backlight (connector); ret =scale_hw_to_user (connector, hw_level, bd->props.max_brightness); -drm_modeset_unlock (&dev->mode_config.connection_mutex); +drm_modeset_unlock (&i915->drm.mode_config.connection_mutex); }return ret;
@@ -1467,18 +1468,17 @@ cnp_setup_backlight(struct intel_connector *connector, enum pipe unused)static int ext_pwm_setup_backlight (struct intel_connector *connector,enum pipe pipe) { -struct drm_device *dev = connector->base.dev; -struct drm_i915_private *i915 =to_i915 (dev); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;const char *desc;u32 level;/* Get the right PWM chip for DSI backlight according to VBT */ if (connector->panel.vbt.dsi.config->pwm_blc ==PPS_BLC_PMIC ) { - panel->backlight.pwm =pwm_get (dev->dev,"pwm_pmic_backlight" ); + panel->backlight.pwm =pwm_get (i915->drm.dev,"pwm_pmic_backlight" ); desc ="PMIC" ; }else { - panel->backlight.pwm =pwm_get (dev->dev,"pwm_soc_backlight" ); + panel->backlight.pwm =pwm_get (i915->drm.dev,"pwm_soc_backlight" ); desc ="SoC" ; }
Signature · 1 line
2.34.1
PATCH 5/5 drm/i915/backlight: convert DRM_DEBUG_KMS() to drm_dbg_kms()
In reply to Jani NikulaFix the final straggler.
--- drivers/gpu/drm/i915/display/intel_backlight.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +2 -2
@@ -866,8 +866,8 @@ static int intel_backlight_device_update_status(struct backlight_device *bd)drm_modeset_lock (&i915->drm.mode_config.connection_mutex,NULL ); -DRM_DEBUG_KMS ("updating intel_backlight, brightness=%d/%d\n" , - bd->props.brightness, bd->props.max_brightness); +drm_dbg_kms (&i915->drm,"updating intel_backlight, brightness=%d/%d\n" , + bd->props.brightness, bd->props.max_brightness);intel_panel_set_backlight (connector->base.state, bd->props.brightness, bd->props.max_brightness);
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/backlight: drop implict dev_priv etc.
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/backlight: drop implict dev_priv etc.
URL : https://patchwork.freedesktop.org/series/111628/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately. +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return' +./include/linux/find.h:168:45: warning: shift count is negative (-13) +./include/linux/find.h:168:45: warning: shift count is negative (-13)
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/backlight: drop implict dev_priv etc.
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/backlight: drop implict dev_priv etc.
URL : https://patchwork.freedesktop.org/series/111628/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12467 -> Patchwork_111628v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_111628v1 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_111628v1, 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_111628v1/index.html
Participating hosts (41 -> 44)
------------------------------
Additional (3): fi-kbl-soraka fi-adl-ddr5 bat-atsm-1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_111628v1:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@guc_multi_lrc:
- fi-kbl-soraka: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@i915_selftest@live@guc_multi_lrc.html
* igt@i915_selftest@live@workarounds:
- bat-dg1-6: [PASS][2] -> [INCOMPLETE][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/bat-dg1-6/igt@i915_selftest@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/bat-dg1-6/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_111628v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- fi-adl-ddr5: NOTRUN -> [SKIP][4] ([i915#7456])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@gem_exec_gttfill@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271]) +7 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][6] ([i915#6179])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-rkl-11600/igt@gem_exec_suspend@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#2190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#4613]) +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-adl-ddr5: NOTRUN -> [SKIP][9] ([i915#4613]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@gem_tiled_pread_basic:
- fi-adl-ddr5: NOTRUN -> [SKIP][10] ([i915#3282])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- fi-adl-ddr5: NOTRUN -> [SKIP][11] ([i915#7561])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-kbl-soraka: NOTRUN -> [DMESG-WARN][12] ([i915#1982])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [PASS][13] -> [DMESG-FAIL][14] ([i915#5334])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][15] ([i915#5334])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][16] ([i915#1886])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@hangcheck:
- fi-adl-ddr5: NOTRUN -> [DMESG-WARN][17] ([i915#5591])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@i915_selftest@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-hsw-4770: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111827])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-hsw-4770/igt@[email protected]
* igt@kms_chamelium@dp-edid-read:
- fi-adl-ddr5: NOTRUN -> [SKIP][19] ([fdo#111827]) +8 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][20] ([fdo#109271] / [fdo#111827]) +7 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-kbl-soraka/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-adl-ddr5: NOTRUN -> [SKIP][21] ([i915#4103])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-adl-ddr5: NOTRUN -> [SKIP][22] ([fdo#109285])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@kms_psr@primary_page_flip:
- fi-adl-ddr5: NOTRUN -> [SKIP][23] ([i915#1072]) +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@kms_psr@primary_page_flip.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-adl-ddr5: NOTRUN -> [SKIP][24] ([i915#3555])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-adl-ddr5: NOTRUN -> [SKIP][25] ([fdo#109295] / [i915#3301])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@prime_vgem@basic-write:
- fi-adl-ddr5: NOTRUN -> [SKIP][26] ([fdo#109295] / [i915#3291]) +2 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-adl-ddr5/igt@[email protected]
* igt@runner@aborted:
- bat-dg1-6: NOTRUN -> [FAIL][27] ([i915#4312])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/bat-dg1-6/igt@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload:
- {bat-rpls-2}: [DMESG-WARN][28] ([i915#6434]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/bat-rpls-2/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/bat-rpls-2/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-cfl-8109u: [DMESG-FAIL][30] ([i915#5334]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/fi-cfl-8109u/igt@i915_selftest@live@gt_heartbeat.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-cfl-8109u/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][32] ([i915#4785]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/fi-hsw-4770/igt@i915_selftest@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-hsw-4770/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@requests:
- {bat-rpls-2}: [INCOMPLETE][34] ([i915#6257]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/bat-rpls-2/igt@i915_selftest@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- {bat-adln-1}: [DMESG-FAIL][36] ([i915#6997]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/bat-adln-1/igt@i915_selftest@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/bat-adln-1/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_module_load@load:
- fi-bsw-n3050: [DMESG-WARN][38] ([i915#7430]) -> [DMESG-WARN][39] ([i915#1982] / [i915#7430])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/fi-bsw-n3050/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-bsw-n3050/igt@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: [INCOMPLETE][40] ([i915#4817]) -> [FAIL][41] ([fdo#103375])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12467/fi-rkl-11600/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/fi-rkl-11600/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#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077
[i915#6078]: https://gitlab.freedesktop.org/drm/intel/issues/6078
[i915#6093]: https://gitlab.freedesktop.org/drm/intel/issues/6093
[i915#6094]: https://gitlab.freedesktop.org/drm/intel/issues/6094
[i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166
[i915#6179]: https://gitlab.freedesktop.org/drm/intel/issues/6179
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6311]: https://gitlab.freedesktop.org/drm/intel/issues/6311
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6434]: https://gitlab.freedesktop.org/drm/intel/issues/6434
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7357]: https://gitlab.freedesktop.org/drm/intel/issues/7357
[i915#7430]: https://gitlab.freedesktop.org/drm/intel/issues/7430
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
Build changes
-------------
* Linux: CI_DRM_12467 -> Patchwork_111628v1
CI-20190529: 20190529
CI_DRM_12467: 8b1064b1f2700cf5dd6b1ebd677beda7e7bcf2a7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7082: c5bc18db358ec5ec0b26909526f467afb6ed4e68 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_111628v1: 8b1064b1f2700cf5dd6b1ebd677beda7e7bcf2a7 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
058f0470c66b drm/i915/backlight: convert DRM_DEBUG_KMS() to drm_dbg_kms() 4a380343ef8e drm/i915/backlight: drop drm_device local variables in favor of i915 0be46e5fc7a7 drm/i915/backlight: mass rename dev_priv to i915 16bb5effbc2b drm/i915/backlight: get rid of the implicit dev_priv 3b309cb73d39 drm/i915/backlight: use VLV_DISPLAY_BASE for VLV/CHV backlight registers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111628v1/index.html