diff mbox series

[1/2] drm/i915/backlight: Drop duplicate intel_panel_actually_set_backlight()

Message ID 20211121110032.4720-1-hdegoede@redhat.com (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/i915/backlight: Drop duplicate intel_panel_actually_set_backlight() | expand

Commit Message

Hans de Goede Nov. 21, 2021, 11 a.m. UTC
After the recent refactoring of the backlight code the contents of
intel_panel_actually_set_backlight() is exactly the same (minus a
small wording difference in the drm_dbg_kms() as the contents if the
more widely used intel_backlight_set_pwm_level() function.

Drop the duplicate intel_panel_actually_set_backlight() function.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_backlight.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

Comments

Jani Nikula Nov. 22, 2021, 9:12 a.m. UTC | #1
On Sun, 21 Nov 2021, Hans de Goede <hdegoede@redhat.com> wrote:
> After the recent refactoring of the backlight code the contents of
> intel_panel_actually_set_backlight() is exactly the same (minus a
> small wording difference in the drm_dbg_kms() as the contents if the
> more widely used intel_backlight_set_pwm_level() function.
>
> Drop the duplicate intel_panel_actually_set_backlight() function.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_backlight.c | 16 ++--------------
>  1 file changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
> index 9523411cddd8..03cd730c926a 100644
> --- a/drivers/gpu/drm/i915/display/intel_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c
> @@ -268,18 +268,6 @@ static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state,
>  	pwm_apply_state(panel->backlight.pwm, &panel->backlight.pwm_state);
>  }
>  
> -static void
> -intel_panel_actually_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 *i915 = to_i915(connector->base.dev);
> -	struct intel_panel *panel = &connector->panel;
> -
> -	drm_dbg_kms(&i915->drm, "set backlight level = %d\n", level);
> -
> -	panel->backlight.funcs->set(conn_state, level);
> -}
> -
>  /* set backlight brightness to level in range [0..max], assuming hw min is
>   * respected.
>   */
> @@ -314,7 +302,7 @@ void intel_backlight_set_acpi(const struct drm_connector_state *conn_state,
>  					 panel->backlight.device->props.max_brightness);
>  
>  	if (panel->backlight.enabled)
> -		intel_panel_actually_set_backlight(conn_state, hw_level);
> +		intel_backlight_set_pwm_level(conn_state, hw_level);
>  
>  	mutex_unlock(&dev_priv->backlight_lock);
>  }
> @@ -863,7 +851,7 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_sta
>  	panel->backlight.level = hw_level;
>  
>  	if (panel->backlight.enabled)
> -		intel_panel_actually_set_backlight(conn_state, hw_level);
> +		intel_backlight_set_pwm_level(conn_state, hw_level);
>  
>  	mutex_unlock(&dev_priv->backlight_lock);
>  }
Hans de Goede Nov. 22, 2021, 4:04 p.m. UTC | #2
Hi,

On 11/21/21 14:03, Patchwork wrote:
> *Patch Details*
> *Series:*	series starting with [1/2] drm/i915/backlight: Drop duplicate intel_panel_actually_set_backlight()
> *URL:*	https://patchwork.freedesktop.org/series/97134/ <https://patchwork.freedesktop.org/series/97134/>
> *State:*	failure
> *Details:*	https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/index.html <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/index.html>
> 
> 
>   CI Bug Log - changes from CI_DRM_10908_full -> Patchwork_21646_full
> 
> 
>     Summary
> 
> *FAILURE*
> 
> Serious unknown changes coming with Patchwork_21646_full absolutely need to be
> verified manually.
> 
> If you think the reported changes have nothing to do with the changes
> introduced in Patchwork_21646_full, please notify your bug team to allow them
> to document this new failure mode, which will reduce false positives in CI.
> 
> 
>     Participating hosts (11 -> 11)
> 
> No changes in participating hosts
> 
> 
>     Possible new issues
> 
> Here are the unknown changes that may have been introduced in Patchwork_21646_full:
> 
> 
>       IGT changes
> 
> 
>         Possible regressions
> 
>   *
> 
>     igt@i915_pm_backlight@fade_with_dpms:
> 
>       o shard-iclb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-iclb4/igt@i915_pm_backlight@fade_with_dpms.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-iclb6/igt@i915_pm_backlight@fade_with_dpms.html> +1 similar issue
>   *

This one seems like it might be related, but it must be a false-positive fail,
because patch 1. in this series makes no functional changes (I have triple
checked this) and patch 2 only changes ops used in ext_pwm_funcs and that
only gets used as panel->backlight.pwm_funcs on BYT and CHT and this is
an ICL failure.

> 
>     igt@kms_vblank@pipe-c-wait-busy:
> 
>       o shard-kbl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-kbl2/igt@kms_vblank@pipe-c-wait-busy.html> -> INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl7/igt@kms_vblank@pipe-c-wait-busy.html>

And this is definitely a false-positive since this series only makes
backlight PWM handling changes.

Regards,

Hans





> 
> 
>         Suppressed
> 
> The following results come from untrusted machines, tests, or statuses.
> They do not affect the overall result.
> 
>   * igt@i915_pm_backlight@fade:
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@i915_pm_backlight@fade.html> ([i915#3012]) -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@i915_pm_backlight@fade.html> +1 similar issue
> 
> 
>     Known issues
> 
> Here are the changes found in Patchwork_21646_full that come from known issues:
> 
> 
>       IGT changes
> 
> 
>         Issues hit
> 
>   *
> 
>     igt@gem_create@create-massive:
> 
>       o shard-kbl: NOTRUN -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl1/igt@gem_create@create-massive.html> ([i915#3002])
>   *
> 
>     igt@gem_eio@unwedge-stress:
> 
>       o shard-iclb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-iclb8/igt@gem_eio@unwedge-stress.html> -> TIMEOUT <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-iclb1/igt@gem_eio@unwedge-stress.html> ([i915#2369] / [i915#2481] / [i915#3070])
>   *
> 
>     igt@gem_exec_capture@pi@rcs0:
> 
>       o shard-skl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl8/igt@gem_exec_capture@pi@rcs0.html> -> INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl9/igt@gem_exec_capture@pi@rcs0.html> ([i915#2369])
>   *
> 
>     igt@gem_exec_capture@pi@vecs0:
> 
>       o shard-iclb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-iclb6/igt@gem_exec_capture@pi@vecs0.html> -> INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-iclb8/igt@gem_exec_capture@pi@vecs0.html> ([i915#2369] / [i915#3371])
>   *
> 
>     igt@gem_exec_fair@basic-none-share@rcs0:
> 
>       o shard-apl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-apl8/igt@gem_exec_fair@basic-none-share@rcs0.html> -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl2/igt@gem_exec_fair@basic-none-share@rcs0.html> ([fdo#109271])
>   *
> 
>     igt@gem_exec_fair@basic-pace-share@rcs0:
> 
>       o shard-tglb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-tglb2/igt@gem_exec_fair@basic-pace-share@rcs0.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb3/igt@gem_exec_fair@basic-pace-share@rcs0.html> ([i915#2842]) +1 similar issue
>   *
> 
>     igt@gem_exec_fair@basic-throttle@rcs0:
> 
>       o shard-iclb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-iclb1/igt@gem_exec_fair@basic-throttle@rcs0.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-iclb8/igt@gem_exec_fair@basic-throttle@rcs0.html> ([i915#2849])
>   *
> 
>     igt@gem_exec_params@no-vebox:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@gem_exec_params@no-vebox.html> ([fdo#109283])
>   *
> 
>     igt@gem_pxp@create-regular-context-2:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@gem_pxp@create-regular-context-2.html> ([i915#4270])
>   *
> 
>     igt@gem_userptr_blits@vma-merge:
> 
>       o shard-skl: NOTRUN -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl1/igt@gem_userptr_blits@vma-merge.html> ([i915#3318])
>   *
> 
>     igt@gen9_exec_parse@allowed-all:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb2/igt@gen9_exec_parse@allowed-all.html> ([i915#2856])
>   *
> 
>     igt@i915_pm_dc@dc6-psr:
> 
>       o shard-iclb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-iclb5/igt@i915_pm_dc@dc6-psr.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-iclb3/igt@i915_pm_dc@dc6-psr.html> ([i915#454])
>   *
> 
>     igt@i915_selftest@live@hangcheck:
> 
>       o shard-snb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-snb2/igt@i915_selftest@live@hangcheck.html> -> INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-snb6/igt@i915_selftest@live@hangcheck.html> ([i915#3921])
>   *
> 
>     igt@i915_suspend@sysfs-reader:
> 
>       o shard-apl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-apl4/igt@i915_suspend@sysfs-reader.html> -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl1/igt@i915_suspend@sysfs-reader.html> ([i915#180]) +1 similar issue
>   *
> 
>     igt@kms_big_fb@linear-8bpp-rotate-90:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb2/igt@kms_big_fb@linear-8bpp-rotate-90.html> ([fdo#111614])
>   *
> 
>     igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-async-flip:
> 
>       o shard-skl: NOTRUN -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl8/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-async-flip.html> ([i915#3743])
>   *
> 
>     igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip.html> ([fdo#109271] / [i915#3777])
>   *
> 
>     igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip:
> 
>       o shard-kbl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl2/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip.html> ([fdo#109271] / [i915#3777])
>   *
> 
>     igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb8/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0.html> ([fdo#111615]) +1 similar issue
>   *
> 
>     igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb2/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs.html> ([i915#3689] / [i915#3886]) +1 similar issue
>   *
> 
>     igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +3 similar issues
>   *
> 
>     igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs:
> 
>       o shard-apl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl8/igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs.html> ([fdo#109271] / [i915#3886])
>   *
> 
>     igt@kms_ccs@pipe-b-random-ccs-data-yf_tiled_ccs:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb8/igt@kms_ccs@pipe-b-random-ccs-data-yf_tiled_ccs.html> ([fdo#111615] / [i915#3689]) +1 similar issue
>   *
> 
>     igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
> 
>       o shard-kbl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl1/igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html> ([fdo#109271] / [i915#3886]) +1 similar issue
>   *
> 
>     igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_ccs:
> 
>       o shard-kbl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl2/igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_ccs.html> ([fdo#109271]) +63 similar issues
>   *
> 
>     igt@kms_ccs@pipe-d-random-ccs-data-y_tiled_gen12_mc_ccs:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_ccs@pipe-d-random-ccs-data-y_tiled_gen12_mc_ccs.html> ([i915#3689])
>   *
> 
>     igt@kms_cdclk@plane-scaling:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb2/igt@kms_cdclk@plane-scaling.html> ([i915#3742])
>   *
> 
>     igt@kms_chamelium@hdmi-audio-edid:
> 
>       o shard-kbl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl1/igt@kms_chamelium@hdmi-audio-edid.html> ([fdo#109271] / [fdo#111827]) +3 similar issues
>   *
> 
>     igt@kms_chamelium@vga-hpd:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_chamelium@vga-hpd.html> ([fdo#109284] / [fdo#111827]) +2 similar issues
>   *
> 
>     igt@kms_color@pipe-a-ctm-0-5:
> 
>       o shard-skl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl6/igt@kms_color@pipe-a-ctm-0-5.html> -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@kms_color@pipe-a-ctm-0-5.html> ([i915#1982])
>   *
> 
>     igt@kms_color_chamelium@pipe-c-ctm-negative:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@kms_color_chamelium@pipe-c-ctm-negative.html> ([fdo#109271] / [fdo#111827]) +6 similar issues
>   *
> 
>     igt@kms_content_protection@mei_interface:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_content_protection@mei_interface.html> ([fdo#111828])
>   *
> 
>     igt@kms_cursor_crc@pipe-a-cursor-max-size-offscreen:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_cursor_crc@pipe-a-cursor-max-size-offscreen.html> ([i915#3359])
>   *
> 
>     igt@kms_cursor_crc@pipe-c-cursor-32x32-rapid-movement:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb8/igt@kms_cursor_crc@pipe-c-cursor-32x32-rapid-movement.html> ([i915#3319]) +1 similar issue
>   *
> 
>     igt@kms_cursor_crc@pipe-d-cursor-512x512-offscreen:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb2/igt@kms_cursor_crc@pipe-d-cursor-512x512-offscreen.html> ([fdo#109279] / [i915#3359]) +1 similar issue
>   *
> 
>     igt@kms_cursor_edge_walk@pipe-d-128x128-bottom-edge:
> 
>       o shard-apl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl8/igt@kms_cursor_edge_walk@pipe-d-128x128-bottom-edge.html> ([fdo#109271]) +5 similar issues
>   *
> 
>     igt@kms_cursor_legacy@flip-vs-cursor-legacy:
> 
>       o shard-kbl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-kbl4/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html> -> INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl7/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html> ([i915#2828])
>   *
> 
>     igt@kms_fbcon_fbt@fbc-suspend:
> 
>       o
> 
>         shard-apl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-apl4/igt@kms_fbcon_fbt@fbc-suspend.html> -> INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl7/igt@kms_fbcon_fbt@fbc-suspend.html> ([i915#180] / [i915#1982])
> 
>       o
> 
>         shard-tglb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-tglb6/igt@kms_fbcon_fbt@fbc-suspend.html> -> INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb7/igt@kms_fbcon_fbt@fbc-suspend.html> ([i915#2411] / [i915#456])
> 
>   *
> 
>     igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
> 
>       o shard-skl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html> ([i915#79])
>   *
> 
>     igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
> 
>       o shard-kbl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html> -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html> ([i915#180]) +7 similar issues
>   *
> 
>     igt@kms_flip@flip-vs-suspend@a-dp1:
> 
>       o shard-apl: NOTRUN -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl8/igt@kms_flip@flip-vs-suspend@a-dp1.html> ([i915#180]) +2 similar issues
>   *
> 
>     igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1:
> 
>       o shard-skl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl9/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl9/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html> ([i915#2122])
>   *
> 
>     igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html> ([fdo#109271] / [i915#2672])
>   *
> 
>     igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-mmap-gtt:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-mmap-gtt.html> ([fdo#109271]) +90 similar issues
>   *
> 
>     igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-gtt:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html> ([fdo#111825]) +18 similar issues
>   *
> 
>     igt@kms_hdr@static-swap:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb8/igt@kms_hdr@static-swap.html> ([i915#1187])
>   *
> 
>     igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl1/igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d.html> ([fdo#109271] / [i915#533])
>   *
> 
>     igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
> 
>       o shard-skl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl10/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl10/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html> ([fdo#108145] / [i915#265])
>   *
> 
>     igt@kms_plane_lowres@pipe-c-tiling-yf:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_plane_lowres@pipe-c-tiling-yf.html> ([fdo#111615] / [fdo#112054])
>   *
> 
>     igt@kms_plane_lowres@pipe-d-tiling-none:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_plane_lowres@pipe-d-tiling-none.html> ([i915#3536])
>   *
> 
>     igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl1/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html> ([fdo#109271] / [i915#2733])
>   *
> 
>     igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html> ([i915#2920]) +2 similar issues
>   *
> 
>     igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5:
> 
>       o shard-kbl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5.html> ([fdo#109271] / [i915#658])
>   *
> 
>     igt@kms_psr@psr2_cursor_render:
> 
>       o shard-iclb: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-iclb2/igt@kms_psr@psr2_cursor_render.html> -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-iclb5/igt@kms_psr@psr2_cursor_render.html> ([fdo#109441])
>   *
> 
>     igt@kms_psr@psr2_sprite_blt:
> 
>       o shard-tglb: NOTRUN -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_psr@psr2_sprite_blt.html> ([i915#132] / [i915#3467])
>   *
> 
>     igt@kms_sysfs_edid_timing:
> 
>       o shard-skl: NOTRUN -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl1/igt@kms_sysfs_edid_timing.html> ([IGT#2])
>   *
> 
>     igt@kms_vblank@pipe-a-ts-continuation-suspend:
> 
>       o shard-apl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-apl3/igt@kms_vblank@pipe-a-ts-continuation-suspend.html> -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl6/igt@kms_vblank@pipe-a-ts-continuation-suspend.html> ([i915#180] / [i915#295])
>   *
> 
>     igt@kms_writeback@writeback-check-output:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl1/igt@kms_writeback@writeback-check-output.html> ([fdo#109271] / [i915#2437])
>   *
> 
>     igt@kms_writeback@writeback-fb-id:
> 
>       o shard-kbl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl1/igt@kms_writeback@writeback-fb-id.html> ([fdo#109271] / [i915#2437])
>   *
> 
>     igt@nouveau_crc@pipe-c-source-outp-complete:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb8/igt@nouveau_crc@pipe-c-source-outp-complete.html> ([i915#2530]) +2 similar issues
>   *
> 
>     igt@perf@blocking:
> 
>       o shard-skl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl4/igt@perf@blocking.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl2/igt@perf@blocking.html> ([i915#1542])
>   *
> 
>     igt@perf@polling-parameterized:
> 
>       o shard-apl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-apl6/igt@perf@polling-parameterized.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl4/igt@perf@polling-parameterized.html> ([i915#1542])
>   *
> 
>     igt@perf@polling-small-buf:
> 
>       o shard-skl: PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl9/igt@perf@polling-small-buf.html> -> FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl9/igt@perf@polling-small-buf.html> ([i915#1722])
>   *
> 
>     igt@prime_udl:
> 
>       o shard-tglb: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@prime_udl.html> ([fdo#109291])
>   *
> 
>     igt@sysfs_clients@fair-3:
> 
>       o shard-kbl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl1/igt@sysfs_clients@fair-3.html> ([fdo#109271] / [i915#2994])
>   *
> 
>     igt@sysfs_clients@split-10:
> 
>       o shard-skl: NOTRUN -> SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl4/igt@sysfs_clients@split-10.html> ([fdo#109271] / [i915#2994])
> 
> 
>         Possible fixes
> 
>   *
> 
>     igt@gem_ctx_isolation@preservation-s3@vcs0:
> 
>       o shard-kbl: DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-kbl4/igt@gem_ctx_isolation@preservation-s3@vcs0.html> ([i915#180]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl2/igt@gem_ctx_isolation@preservation-s3@vcs0.html> +4 similar issues
>   *
> 
>     igt@gem_ctx_persistence@many-contexts:
> 
>       o {shard-rkl}: (PASS <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-4/igt@gem_ctx_persistence@many-contexts.html>, FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@gem_ctx_persistence@many-contexts.html>) ([i915#2410]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-2/igt@gem_ctx_persistence@many-contexts.html>
>   *
> 
>     igt@gem_exec_fair@basic-none-solo@rcs0:
> 
>       o {shard-rkl}: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-1/igt@gem_exec_fair@basic-none-solo@rcs0.html> ([i915#2842]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-1/igt@gem_exec_fair@basic-none-solo@rcs0.html>
>   *
> 
>     igt@gem_exec_fair@basic-pace@bcs0:
> 
>       o
> 
>         shard-tglb: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-tglb2/igt@gem_exec_fair@basic-pace@bcs0.html> ([i915#2842]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb6/igt@gem_exec_fair@basic-pace@bcs0.html> +1 similar issue
> 
>       o
> 
>         shard-iclb: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-iclb2/igt@gem_exec_fair@basic-pace@bcs0.html> ([i915#2842]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-iclb2/igt@gem_exec_fair@basic-pace@bcs0.html>
> 
>   *
> 
>     igt@gem_exec_fair@basic-pace@vcs0:
> 
>       o shard-kbl: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-kbl2/igt@gem_exec_fair@basic-pace@vcs0.html> ([i915#2842]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-kbl4/igt@gem_exec_fair@basic-pace@vcs0.html>
>   *
> 
>     igt@gem_exec_whisper@basic-forked-all:
> 
>       o shard-glk: DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-glk8/igt@gem_exec_whisper@basic-forked-all.html> ([i915#118]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-glk5/igt@gem_exec_whisper@basic-forked-all.html> +1 similar issue
>   *
> 
>     igt@i915_pm_backlight@bad-brightness:
> 
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-4/igt@i915_pm_backlight@bad-brightness.html> ([i915#3012]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@i915_pm_backlight@bad-brightness.html>
>   *
> 
>     igt@i915_pm_dc@dc6-psr:
> 
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@i915_pm_dc@dc6-psr.html> ([i915#658]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@i915_pm_dc@dc6-psr.html> +1 similar issue
>   *
> 
>     igt@i915_pm_dc@dc9-dpms:
> 
>       o {shard-rkl}: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-6/igt@i915_pm_dc@dc9-dpms.html> ([i915#4275]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-2/igt@i915_pm_dc@dc9-dpms.html>
>   *
> 
>     igt@i915_pm_rpm@dpms-lpsp:
> 
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@i915_pm_rpm@dpms-lpsp.html> ([i915#1397]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@i915_pm_rpm@dpms-lpsp.html>
>   *
> 
>     igt@i915_pm_rpm@fences-dpms:
> 
>       o {shard-rkl}: (SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-4/igt@i915_pm_rpm@fences-dpms.html>, SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@i915_pm_rpm@fences-dpms.html>) ([i915#1849]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@i915_pm_rpm@fences-dpms.html>
>   *
> 
>     igt@i915_pm_rps@min-max-config-idle:
> 
>       o {shard-rkl}: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-6/igt@i915_pm_rps@min-max-config-idle.html> ([i915#4016]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-2/igt@i915_pm_rps@min-max-config-idle.html>
>   *
> 
>     igt@kms_async_flips@alternate-sync-async-flip:
> 
>       o shard-skl: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl4/igt@kms_async_flips@alternate-sync-async-flip.html> ([i915#2521]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-skl2/igt@kms_async_flips@alternate-sync-async-flip.html>
>   *
> 
>     igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
> 
>       o {shard-rkl}: (SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html>, SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-4/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html>) ([i915#1845]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html> +2 similar issues
>   *
> 
>     igt@kms_color@pipe-b-ctm-0-75:
> 
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@kms_color@pipe-b-ctm-0-75.html> ([i915#1149] / [i915#1849] / [i915#4070]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@kms_color@pipe-b-ctm-0-75.html> +1 similar issue
>   *
> 
>     igt@kms_color@pipe-b-ctm-red-to-blue:
> 
>       o {shard-rkl}: (SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@kms_color@pipe-b-ctm-red-to-blue.html>, SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-4/igt@kms_color@pipe-b-ctm-red-to-blue.html>) ([i915#1149] / [i915#1849] / [i915#4070] / [i915#4098]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@kms_color@pipe-b-ctm-red-to-blue.html> +2 similar issues
>   *
> 
>     igt@kms_cursor_crc@pipe-a-cursor-64x64-rapid-movement:
> 
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@kms_cursor_crc@pipe-a-cursor-64x64-rapid-movement.html> ([fdo#112022] / [i915#4070]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@kms_cursor_crc@pipe-a-cursor-64x64-rapid-movement.html> +4 similar issues
>   *
> 
>     igt@kms_cursor_crc@pipe-b-cursor-suspend:
> 
>       o shard-apl: DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-apl4/igt@kms_cursor_crc@pipe-b-cursor-suspend.html> ([i915#180]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-apl8/igt@kms_cursor_crc@pipe-b-cursor-suspend.html>
>   *
> 
>     igt@kms_cursor_edge_walk@pipe-a-128x128-bottom-edge:
> 
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-4/igt@kms_cursor_edge_walk@pipe-a-128x128-bottom-edge.html> ([i915#4098]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@kms_cursor_edge_walk@pipe-a-128x128-bottom-edge.html>
>   *
> 
>     igt@kms_cursor_edge_walk@pipe-a-64x64-bottom-edge:
> 
>       o shard-tglb: INCOMPLETE <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-tglb8/igt@kms_cursor_edge_walk@pipe-a-64x64-bottom-edge.html> -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-tglb5/igt@kms_cursor_edge_walk@pipe-a-64x64-bottom-edge.html>
>   *
> 
>     igt@kms_cursor_edge_walk@pipe-b-256x256-left-edge:
> 
>       o {shard-rkl}: SKIP <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-rkl-2/igt@kms_cursor_edge_walk@pipe-b-256x256-left-edge.html> ([i915#1849] / [i915#4070]) -> PASS <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21646/shard-rkl-6/igt@kms_cursor_edge_walk@pipe-b-256x256-left-edge.html> +5 similar issues
>   *
> 
>     igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
> 
>       o shard-skl: FAIL <https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10908/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> ([i915#2346]) -> PASS <https://in>
>
Hans de Goede Dec. 16, 2021, 3:14 p.m. UTC | #3
Hi,

On 11/21/21 12:00, Hans de Goede wrote:
> After the recent refactoring of the backlight code the contents of
> intel_panel_actually_set_backlight() is exactly the same (minus a
> small wording difference in the drm_dbg_kms() as the contents if the
> more widely used intel_backlight_set_pwm_level() function.
> 
> Drop the duplicate intel_panel_actually_set_backlight() function.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

I just realized that I did not push this series to drm-intel-next yet.

Before pushing I double checked my work and I noticed that this patch
is wrong there is a subtle but important difference between
intel_panel_actually_set_backlight() and intel_backlight_set_pwm_level()

intel_panel_actually_set_backlight() calls:

	panel->backlight.funcs->set(conn_state, level);

where as intel_backlight_set_pwm_level() calls:

	panel->backlight.pwm_funcs->set(conn_state, level);

I missed the pwm_funcs vs funcs difference, the funcs->set
function is normally just a wrapper for pwm_funcs->set, but
the dp_aux and dsi_dsc code my overwrite the functions to
which backlight.funcs point to so the difference matters.

Tl;DR: self nack for this one.

Patch 2/2 is still valid and I will push that out shortly.

Regards,

Hans





> ---
>  drivers/gpu/drm/i915/display/intel_backlight.c | 16 ++--------------
>  1 file changed, 2 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
> index 9523411cddd8..03cd730c926a 100644
> --- a/drivers/gpu/drm/i915/display/intel_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c
> @@ -268,18 +268,6 @@ static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state,
>  	pwm_apply_state(panel->backlight.pwm, &panel->backlight.pwm_state);
>  }
>  
> -static void
> -intel_panel_actually_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 *i915 = to_i915(connector->base.dev);
> -	struct intel_panel *panel = &connector->panel;
> -
> -	drm_dbg_kms(&i915->drm, "set backlight level = %d\n", level);
> -
> -	panel->backlight.funcs->set(conn_state, level);
> -}
> -
>  /* set backlight brightness to level in range [0..max], assuming hw min is
>   * respected.
>   */
> @@ -314,7 +302,7 @@ void intel_backlight_set_acpi(const struct drm_connector_state *conn_state,
>  					 panel->backlight.device->props.max_brightness);
>  
>  	if (panel->backlight.enabled)
> -		intel_panel_actually_set_backlight(conn_state, hw_level);
> +		intel_backlight_set_pwm_level(conn_state, hw_level);
>  
>  	mutex_unlock(&dev_priv->backlight_lock);
>  }
> @@ -863,7 +851,7 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_sta
>  	panel->backlight.level = hw_level;
>  
>  	if (panel->backlight.enabled)
> -		intel_panel_actually_set_backlight(conn_state, hw_level);
> +		intel_backlight_set_pwm_level(conn_state, hw_level);
>  
>  	mutex_unlock(&dev_priv->backlight_lock);
>  }
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
index 9523411cddd8..03cd730c926a 100644
--- a/drivers/gpu/drm/i915/display/intel_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_backlight.c
@@ -268,18 +268,6 @@  static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state,
 	pwm_apply_state(panel->backlight.pwm, &panel->backlight.pwm_state);
 }
 
-static void
-intel_panel_actually_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 *i915 = to_i915(connector->base.dev);
-	struct intel_panel *panel = &connector->panel;
-
-	drm_dbg_kms(&i915->drm, "set backlight level = %d\n", level);
-
-	panel->backlight.funcs->set(conn_state, level);
-}
-
 /* set backlight brightness to level in range [0..max], assuming hw min is
  * respected.
  */
@@ -314,7 +302,7 @@  void intel_backlight_set_acpi(const struct drm_connector_state *conn_state,
 					 panel->backlight.device->props.max_brightness);
 
 	if (panel->backlight.enabled)
-		intel_panel_actually_set_backlight(conn_state, hw_level);
+		intel_backlight_set_pwm_level(conn_state, hw_level);
 
 	mutex_unlock(&dev_priv->backlight_lock);
 }
@@ -863,7 +851,7 @@  static void intel_panel_set_backlight(const struct drm_connector_state *conn_sta
 	panel->backlight.level = hw_level;
 
 	if (panel->backlight.enabled)
-		intel_panel_actually_set_backlight(conn_state, hw_level);
+		intel_backlight_set_pwm_level(conn_state, hw_level);
 
 	mutex_unlock(&dev_priv->backlight_lock);
 }