Commit f2064ae3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-09-05' of... 

Merge tag 'drm-intel-fixes-2024-09-05' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- drm/i915: Do not attempt to load the GSC multiple times (Daniele Ceraolo Spurio)
- drm/i915: Fix readout degamma_lut mismatch on ilk/snb (Ville Syrjälä)
- drm/i915/fence: Mark debug_fence_init_onstack() with __maybe_unused (Andy Shevchenko)
- drm/i915/fence: Mark debug_fence_free() with __maybe_unused (Andy Shevchenko)
- drm/i915/display: Add mechanism to use sink model when applying quirk [display] (Jouni Högander)
- drm/i915/display: Increase Fast Wake Sync length as a quirk [display] (Jouni Högander)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Ztlo2hVO4SBvfAnq@linux
parents 431c1646 a13494de

drivers/gpu/drm/i915/display/intel_alpm.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ bool intel_alpm_compute_params(struct intel_dp *intel_dp, 
	int tfw_exit_latency = 20; /* eDP spec */

	int phy_wake = 4;	   /* eDP spec */

	int preamble = 8;	   /* eDP spec */

	int precharge = intel_dp_aux_fw_sync_len() - preamble;

	int precharge = intel_dp_aux_fw_sync_len(intel_dp) - preamble;

	u8 max_wake_lines;



	io_wake_time = max(precharge, io_buffer_wake_time(crtc_state)) +

drivers/gpu/drm/i915/display/intel_display_types.h

+4 −0
Original line number Diff line number Diff line
@@ -1885,6 +1885,10 @@ struct intel_dp { 
	} alpm_parameters;



	u8 alpm_dpcd;



	struct {

		unsigned long mask;

	} quirks;

};



enum lspcon_vendor {

drivers/gpu/drm/i915/display/intel_dp.c

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
#include "intel_pch_display.h"

#include "intel_pps.h"

#include "intel_psr.h"

#include "intel_quirks.h"

#include "intel_tc.h"

#include "intel_vdsc.h"

#include "intel_vrr.h"
@@ -3952,6 +3953,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector 


	drm_dp_read_desc(&intel_dp->aux, &intel_dp->desc,

			 drm_dp_is_branch(intel_dp->dpcd));

	intel_init_dpcd_quirks(intel_dp, &intel_dp->desc.ident);



	/*

	 * Read the eDP display control registers.
@@ -4064,6 +4066,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) 
		drm_dp_read_desc(&intel_dp->aux, &intel_dp->desc,

				 drm_dp_is_branch(intel_dp->dpcd));



		intel_init_dpcd_quirks(intel_dp, &intel_dp->desc.ident);



		intel_dp_update_sink_caps(intel_dp);

	}

drivers/gpu/drm/i915/display/intel_dp_aux.c

+11 −5
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "intel_dp_aux.h"

#include "intel_dp_aux_regs.h"

#include "intel_pps.h"

#include "intel_quirks.h"

#include "intel_tc.h"



#define AUX_CH_NAME_BUFSIZE	6
@@ -142,16 +143,21 @@ static int intel_dp_aux_sync_len(void) 
	return precharge + preamble;

}



int intel_dp_aux_fw_sync_len(void)

int intel_dp_aux_fw_sync_len(struct intel_dp *intel_dp)

{

	int precharge = 10; /* 10-16 */

	int preamble = 8;



	/*

	 * We faced some glitches on Dell Precision 5490 MTL laptop with panel:

	 * "Manufacturer: AUO, Model: 63898" when using HW default 18. Using 20

	 * is fixing these problems with the panel. It is still within range

	 * mentioned in eDP specification.

	 * mentioned in eDP specification. Increasing Fast Wake sync length is

	 * causing problems with other panels: increase length as a quirk for

	 * this specific laptop.

	 */

	int precharge = 12; /* 10-16 */

	int preamble = 8;

	if (intel_has_dpcd_quirk(intel_dp, QUIRK_FW_SYNC_LEN))

		precharge += 2;



	return precharge + preamble;

}
@@ -211,7 +217,7 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, 
		DP_AUX_CH_CTL_TIME_OUT_MAX |

		DP_AUX_CH_CTL_RECEIVE_ERROR |

		DP_AUX_CH_CTL_MESSAGE_SIZE(send_bytes) |

		DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(intel_dp_aux_fw_sync_len()) |

		DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(intel_dp_aux_fw_sync_len(intel_dp)) |

		DP_AUX_CH_CTL_SYNC_PULSE_SKL(intel_dp_aux_sync_len());



	if (intel_tc_port_in_tbt_alt_mode(dig_port))

drivers/gpu/drm/i915/display/intel_dp_aux.h

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder); 


void intel_dp_aux_irq_handler(struct drm_i915_private *i915);

u32 intel_dp_aux_pack(const u8 *src, int src_bytes);

int intel_dp_aux_fw_sync_len(void);

int intel_dp_aux_fw_sync_len(struct intel_dp *intel_dp);



#endif /* __INTEL_DP_AUX_H__ */