1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/gpu/drm/i915/display
José Roberto de Souza 278da06c03 drm/i915/display: Do not re-enable PSR after it was marked as not reliable
If a error happens and sink_not_reliable is set, PSR should be disabled
for good but that is not happening.
It would be disabled by the function handling the PSR error but then
on the next fastset it would be enabled again in
_intel_psr_post_plane_update().
It would only be disabled for good in the next modeset where has_psr
will be set false.

v2:
- release psr lock before continue

Fixes: 9ce5884e51 ("drm/i915/display: Only keep PSR enabled if there is active planes")
Reported-by: Khaled Almahallawy <khaled.almahallawy@intel.com>
Reported-by: Charlton Lin <charlton.lin@intel.com>
Cc: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220311185149.110527-2-jose.souza@intel.com
(cherry picked from commit 15f26bdc81)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2022-03-16 08:17:40 +02:00
..
dvo_ch7xxx.c
dvo_ch7017.c
dvo_ivch.c
dvo_ns2501.c
dvo_sil164.c
dvo_tfp410.c
g4x_dp.c drm/i915: Program pch transcoder m2/n2 2022-02-01 11:33:23 +02:00
g4x_dp.h drm/i915: Give g4x_{dp,hdmi}.c g4x_ namespace 2021-03-19 18:31:49 +02:00
g4x_hdmi.c drm/i915/trace: split out display trace to a separate file 2021-12-09 11:21:46 +02:00
g4x_hdmi.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
hsw_ips.c drm/i915: Extract hsw_ips_get_config() 2022-02-09 21:51:56 +02:00
hsw_ips.h drm/i915: Extract hsw_ips_get_config() 2022-02-09 21:51:56 +02:00
i9xx_plane.c drm/i915: Clean up PIPESRC defines 2022-01-26 21:39:53 +02:00
i9xx_plane.h drm/i915: migrate i9xx plane get config 2021-02-08 12:09:28 +02:00
icl_dsi.c drm/i915/reg: split out icl_dsi_regs.h 2022-02-21 12:06:15 +02:00
icl_dsi.h drm/i915/dsi: split out icl_dsi.h 2021-11-23 13:11:42 +02:00
icl_dsi_regs.h drm/i915/reg: split out icl_dsi_regs.h 2022-02-21 12:06:15 +02:00
intel_acpi.c drm/i915: Free the returned object of acpi_evaluate_dsm() 2021-10-13 13:41:16 +03:00
intel_acpi.h drm/i915: Associate ACPI connector nodes with connector entries (v2) 2021-09-09 12:59:07 +02:00
intel_atomic.c drm/i915: Fix the async flip wm0/ddb optimization 2022-03-08 08:35:11 +02:00
intel_atomic.h drm/i915: Clean up the bigjoiner state copy logic 2022-02-11 22:42:23 +02:00
intel_atomic_plane.c drm/i915: Fix the async flip wm0/ddb optimization 2022-03-08 08:35:11 +02:00
intel_atomic_plane.h drm/i915: Introduce intel_crtc_planes_update_arm() 2022-02-18 08:42:28 +02:00
intel_audio.c drm/i915: s/intel_get_first_crtc/intel_first_crtc/ 2021-12-09 16:18:30 +02:00
intel_audio.h drm/i915/audio: rename intel_init_audio_hooks to intel_audio_hooks_init 2021-11-05 13:05:14 +02:00
intel_backlight.c drm/i915: split out PCI config space registers from i915_reg.h 2022-01-10 16:17:46 +02:00
intel_backlight.h drm/i915/backlight: mass rename functions to have intel_backlight_ prefix 2021-08-26 10:40:41 +03:00
intel_bios.c Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_bios.h drm/i915/bios: add intel_bios_encoder_data to encoder, use for iboost 2021-03-18 14:44:16 +02:00
intel_bw.c drm/i915: Extract intel_bw_check_data_rate() 2022-02-23 13:31:50 +02:00
intel_bw.h drm/i915: Widen the QGV point mask 2022-02-16 15:04:28 +02:00
intel_cdclk.c drm/i915: Move MCHBAR registers to their own header 2022-02-16 12:29:47 -08:00
intel_cdclk.h drm/i915/cdclk: update intel_dump_cdclk_config() logging 2022-01-24 15:20:21 +02:00
intel_color.c drm/i915: Make the CHV CGM CSC register writes lockless 2022-02-18 17:27:31 +02:00
intel_color.h
intel_combo_phy.c drm/i915: Move combo PHY registers to their own header 2022-01-11 14:03:25 -08:00
intel_combo_phy.h
intel_combo_phy_regs.h drm/i915: Move combo PHY registers to their own header 2022-01-11 14:03:25 -08:00
intel_connector.c drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() 2021-10-01 13:45:37 +03:00
intel_connector.h drm/i915: Split intel_attach_colorspace_property() into HDMI vs. DP variants 2020-12-02 01:29:31 +05:30
intel_crt.c drm/i915/display: remove intel_wait_for_vblank() 2021-12-02 13:45:29 +02:00
intel_crt.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_crtc.c drm/i915: Fix the async flip wm0/ddb optimization 2022-03-08 08:35:11 +02:00
intel_crtc.h drm/i915: s/intel_get_first_crtc/intel_first_crtc/ 2021-12-09 16:18:30 +02:00
intel_cursor.c drm/i915: Clean up cursor registers 2022-01-18 04:03:27 +02:00
intel_cursor.h drm/i915: refactor cursor code out of i915_display.c 2020-12-22 10:09:05 +02:00
intel_ddi.c drm/i915/adlp: Add TypeC PHY TBT->DP-alt/legacy mode switch workaround 2022-02-21 18:50:59 +02:00
intel_ddi.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_ddi_buf_trans.c Merge drm/drm-next into drm-intel-gt-next 2022-02-25 13:44:44 +00:00
intel_ddi_buf_trans.h drm/i915: Shrink {icl_mg,tgl_dkl}_phy_ddi_buf_trans 2021-10-14 18:45:59 +03:00
intel_de.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_display.c drm/i915: Fix the async flip wm0/ddb optimization 2022-03-08 08:35:11 +02:00
intel_display.h drm/i915: Change bigjoiner state tracking to use the pipe bitmask 2022-02-15 14:41:05 +02:00
intel_display_debugfs.c drm/i915: Dump hw.enable and pipe_mode 2022-02-23 13:28:53 +02:00
intel_display_debugfs.h drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() 2021-10-01 13:45:37 +03:00
intel_display_power.c drm/i915: Move MCHBAR registers to their own header 2022-02-16 12:29:47 -08:00
intel_display_power.h drm/i915: Disable unused power wells left enabled by BIOS 2022-02-03 12:39:26 +02:00
intel_display_trace.c drm/i915/trace: split out display trace to a separate file 2021-12-09 11:21:46 +02:00
intel_display_trace.h drm/i915: stop including i915_irq.h from i915_drv.h 2022-01-05 17:57:06 +02:00
intel_display_types.h drm/i915: Fix the async flip wm0/ddb optimization 2022-03-08 08:35:11 +02:00
intel_dmc.c drm/i915/dmc: Eliminate remnant GEN<n> references 2022-01-20 11:06:46 -08:00
intel_dmc.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_dp.c drm/i915/display: Fix HPD short pulse handling for eDP 2022-03-16 08:17:36 +02:00
intel_dp.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_dp_aux.c drm/i915/dp: make intel_dp_pack_aux() static again 2022-01-13 15:20:48 +02:00
intel_dp_aux.h drm/i915/dp: make intel_dp_pack_aux() static again 2022-01-13 15:20:48 +02:00
intel_dp_aux_backlight.c Linux 5.16-rc5 2021-12-14 10:24:28 +01:00
intel_dp_aux_backlight.h
intel_dp_hdcp.c drm/dp: Move public DisplayPort headers into dp/ 2022-01-17 11:25:44 +01:00
intel_dp_hdcp.h drm/i915/hdcp: add intel_dp_hdcp.h and rename init accordingly 2021-04-28 11:07:01 +03:00
intel_dp_link_training.c drm/i915/dp: remove accidental static on what should be a local variable 2022-02-18 10:02:33 +02:00
intel_dp_link_training.h Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_dp_mst.c drm/i915/mst: update slot information for 128b/132b 2022-02-11 11:35:37 +02:00
intel_dp_mst.h drm/i915/mst: abstract intel_dp_mst_source_support() 2021-10-08 13:14:25 +03:00
intel_dpio_phy.c drm/i915: split out vlv sideband to a separate file 2021-10-14 12:22:55 +03:00
intel_dpio_phy.h drm/i915: De-wrapper bxt_ddi_phy_set_signal_levels() 2021-10-04 12:43:01 +03:00
intel_dpll.c drm/i915/dpll: hide struct intel_dpll_funcs 2022-02-09 13:39:46 +02:00
intel_dpll.h drm/i915/dpll: add intel_dpll_crtc_compute_clock() 2022-02-09 13:39:43 +02:00
intel_dpll_mgr.c drm/i915/display/tgl+: Implement new PLL programming step 2022-02-18 06:35:44 -08:00
intel_dpll_mgr.h drm/i915/display/tgl+: Implement new PLL programming step 2022-02-18 06:35:44 -08:00
intel_dpt.c Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_dpt.h drm/i915: Restore memory mapping for DPT FBs across system suspend/resume 2021-11-03 11:07:24 +02:00
intel_drrs.c drm/i915: Clear DP M2/N2 when not doing DRRS 2022-02-01 11:33:23 +02:00
intel_drrs.h drm/i915/display: Prepare DRRS for frontbuffer rendering drop 2021-09-07 15:39:43 -07:00
intel_dsb.c drm/i915: split out i915_gem_internal.h from i915_drv.h 2022-02-11 12:52:50 +02:00
intel_dsb.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_dsi.c drm/i915/display: stop including i915_drv.h from intel_display_types.h 2021-12-03 11:46:33 +02:00
intel_dsi.h drm/i915/dsi: disassociate VBT video transfer mode from register values 2022-02-21 12:06:06 +02:00
intel_dsi_dcs_backlight.c drm/i915/dsi: transmit brightness command in HS state 2021-11-11 11:51:58 +02:00
intel_dsi_dcs_backlight.h
intel_dsi_vbt.c drm/i915/reg: split out vlv_dsi_regs.h and vlv_dsi_pll_regs.h 2022-02-21 12:06:10 +02:00
intel_dsi_vbt.h drm/i915/dsi: split out intel_dsi_vbt.h 2021-11-23 13:11:13 +02:00
intel_dvo.c drm/i915: Introduce intel_panel_compute_config() 2021-09-30 11:20:13 +03:00
intel_dvo.h
intel_dvo_dev.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_fb.c drm/i915/display: stop including i915_drv.h from intel_display_types.h 2021-12-03 11:46:33 +02:00
intel_fb.h drm/i915/fb: move intel_fb_uses_dpt to intel_fb.c and un-inline 2021-12-03 11:23:15 +02:00
intel_fb_pin.c Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_fb_pin.h drm/i915/display: move pin/unpin fb/plane code to a new file. 2021-10-12 12:58:40 +03:00
intel_fbc.c Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_fbc.h drm/i915/fbc: Register per-crtc debugfs files 2021-12-15 17:02:40 +02:00
intel_fbdev.c drm/i915: add io_size plumbing 2022-02-28 08:47:27 +00:00
intel_fbdev.h drm/i915/fbdev: add intel_fbdev_framebuffer() helper 2022-02-17 10:01:21 +02:00
intel_fdi.c drm/i915/fdi: hide struct intel_fdi_funcs 2022-02-09 13:39:40 +02:00
intel_fdi.h drm/i915: Move intel_ddi_fdi_post_disable() to fdi code 2021-10-19 09:40:13 +03:00
intel_fifo_underrun.c drm/i915/trace: split out display trace to a separate file 2021-12-09 11:21:46 +02:00
intel_fifo_underrun.h
intel_frontbuffer.c drm/i915/trace: split out display trace to a separate file 2021-12-09 11:21:46 +02:00
intel_frontbuffer.h drm/i915/fb: reduce include dependencies 2021-12-13 12:04:59 +02:00
intel_global_state.c drm/i915: Fix global state use-after-frees with a refcount 2020-06-02 16:35:24 +03:00
intel_global_state.h drm/i915: Fix global state use-after-frees with a refcount 2020-06-02 16:35:24 +03:00
intel_gmbus.c drm/i915/dg2: Enable 5th port 2022-02-18 16:03:31 -08:00
intel_gmbus.h drm/i915: Remove unused intel_gmbus_set_speed() function 2021-12-16 16:17:01 +01:00
intel_hdcp.c drm/i915/pcode: rename sandybridge_pcode_* to snb_pcode_* 2022-01-13 15:20:57 +02:00
intel_hdcp.h drm/i915/hdcp: Pass dig_port to intel_hdcp_init 2021-01-13 08:29:32 +05:30
intel_hdmi.c Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_hdmi.h drm/i915/dp: Reuse intel_hdmi_tmds_clock() 2022-02-11 22:36:00 +02:00
intel_hotplug.c drm/i915/hpd: hide struct intel_hotplug_funcs 2022-02-09 13:39:35 +02:00
intel_hotplug.h drm/i915: Reorder hpd init vs. display resume 2020-10-20 20:18:32 +03:00
intel_lpe_audio.c drm/i915/audio: name the audio sub-struct in drm_i915_private 2021-11-05 13:04:48 +02:00
intel_lpe_audio.h
intel_lspcon.c Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_lspcon.h drm/i915/display: Implement DRM infoframe read for LSPCON 2020-12-02 01:29:52 +05:30
intel_lvds.c drm/i915/dpll: move dpll modeset asserts to intel_dpll.c 2021-10-01 10:48:59 +03:00
intel_lvds.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_opregion.c drm/i915/opregion: debug log about Mailbox #2 for backlight 2022-02-11 09:54:46 +02:00
intel_opregion.h drm/i915/opregion: add support for mailbox #5 EDID 2021-12-31 12:13:54 +02:00
intel_overlay.c drm/i915: split out i915_gem_internal.h from i915_drv.h 2022-02-11 12:52:50 +02:00
intel_overlay.h
intel_panel.c drm/i915: Reject user modes that don't match fixed mode's refresh rate 2021-09-30 11:20:40 +03:00
intel_panel.h drm/i915: Introduce intel_panel_compute_config() 2021-09-30 11:20:13 +03:00
intel_pch_display.c drm/i915: Program pch transcoder m2/n2 2022-02-01 11:33:23 +02:00
intel_pch_display.h drm/i915: Program pch transcoder m2/n2 2022-02-01 11:33:23 +02:00
intel_pch_refclk.c drm/i915: Move PCH refclock stuff into its own file 2021-10-19 09:36:22 +03:00
intel_pch_refclk.h drm/i915: Move PCH refclock stuff into its own file 2021-10-19 09:36:22 +03:00
intel_pipe_crc.c drm/i915: Don't include intel_de.h from intel_display_types.h 2021-05-05 21:04:42 +03:00
intel_pipe_crc.h
intel_plane_initial.c Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next 2022-02-23 15:03:51 -05:00
intel_plane_initial.h drm/i915/display: refactor initial plane config to a separate file 2021-10-12 12:58:33 +03:00
intel_pps.c drm/i915/display: Fix HPD short pulse handling for eDP 2022-03-16 08:17:36 +02:00
intel_pps.h drm/i915/display: Fix HPD short pulse handling for eDP 2022-03-16 08:17:36 +02:00
intel_psr.c drm/i915/display: Do not re-enable PSR after it was marked as not reliable 2022-03-16 08:17:40 +02:00
intel_psr.h drm/i915/psr: avoid intel_frontbuffer.h include with declaration 2021-12-13 12:04:54 +02:00
intel_qp_tables.c drm/i915/xelpd: Add rc_qp_table for rcparams calculation 2021-05-19 23:59:12 -07:00
intel_qp_tables.h drm/i915/xelpd: Add rc_qp_table for rcparams calculation 2021-05-19 23:59:12 -07:00
intel_quirks.c drm/i915/display: stop including i915_drv.h from intel_display_types.h 2021-12-03 11:46:33 +02:00
intel_quirks.h
intel_sdvo.c drm/i915/display: add intel_crtc_wait_for_next_vblank() and use it 2021-12-02 11:39:50 +02:00
intel_sdvo.h drm/i915: Only include i915_reg.h from .c files 2022-02-02 07:59:54 -08:00
intel_sdvo_regs.h drm/i915/sdvo: Fix SDVO colorimetry bit defines 2020-07-09 16:14:47 +03:00
intel_snps_phy.c drm/i915/dg2: Drop 38.4 MHz MPLLB tables 2022-02-18 16:03:31 -08:00
intel_snps_phy.h drm/i915: Nuke useless .set_signal_levels() wrappers 2021-10-04 12:42:55 +03:00
intel_snps_phy_regs.h drm/i915: Move SNPS PHY registers to their own header 2022-01-11 14:03:25 -08:00
intel_sprite.c drm/i915/sprite: convert to drm device based logging 2022-01-24 15:20:15 +02:00
intel_sprite.h drm/i915: Move function prototypes to the correct header 2021-10-21 22:22:58 +03:00
intel_tc.c drm/i915: Disconnect PHYs left connected by BIOS on disabled ports 2022-02-18 12:39:20 +02:00
intel_tc.h drm/i915/tc: Fix TypeC PHY connect/disconnect logic on ADL-P 2021-09-29 23:58:04 +03:00
intel_tc_phy_regs.h drm/i915: Drop unused _PORT3 and _PORT4 TC phy register offsets 2022-01-11 14:03:26 -08:00
intel_tv.c drm/i915/trace: split out display trace to a separate file 2021-12-09 11:21:46 +02:00
intel_tv.h
intel_vbt_defs.h drm/i915/display/tgl+: Implement new PLL programming step 2022-02-18 06:35:44 -08:00
intel_vdsc.c drm/i915: Change bigjoiner state tracking to use the pipe bitmask 2022-02-15 14:41:05 +02:00
intel_vdsc.h drm/i915: Change bigjoiner state tracking to use the pipe bitmask 2022-02-15 14:41:05 +02:00
intel_vga.c drm/i915/vga: switch to use VGA definitions from video/vga.h 2022-02-02 17:14:40 +02:00
intel_vga.h
intel_vrr.c drm/i915: Fix framestart_delay commens in VRR code 2021-11-18 22:31:15 +02:00
intel_vrr.h drm/i915: Do vblank evasion correctly if vrr push has already been sent 2021-11-18 22:31:15 +02:00
skl_scaler.c drm/i915: Add a table with a descriptor for all i915 modifiers 2021-10-21 21:44:17 +03:00
skl_scaler.h drm/i915: refactor skylake scaler code into new file. 2021-02-08 12:12:41 +02:00
skl_universal_plane.c Merge drm/drm-next into drm-intel-next 2022-01-31 13:19:33 -05:00
skl_universal_plane.h drm/i915/intel_fb: Pull FB plane functions from skl_universal_plane.c 2021-03-29 22:54:50 +03:00
vlv_dsi.c drm/i915/reg: split out vlv_dsi_regs.h and vlv_dsi_pll_regs.h 2022-02-21 12:06:10 +02:00
vlv_dsi.h drm/i915/dsi: split out vlv_dsi.h 2021-11-23 13:11:39 +02:00
vlv_dsi_pll.c drm/i915/reg: split out vlv_dsi_regs.h and vlv_dsi_pll_regs.h 2022-02-21 12:06:10 +02:00
vlv_dsi_pll.h drm/i915/dsi: split out vlv_dsi_pll.h 2021-11-23 13:11:36 +02:00
vlv_dsi_pll_regs.h drm/i915/reg: split out vlv_dsi_regs.h and vlv_dsi_pll_regs.h 2022-02-21 12:06:10 +02:00
vlv_dsi_regs.h drm/i915/reg: split out vlv_dsi_regs.h and vlv_dsi_pll_regs.h 2022-02-21 12:06:10 +02:00