Commit 7e1c3be3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-02-15' of... 

Merge tag 'drm-intel-fixes-2024-02-15' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

Fix for #10172: Blank screen on JSL Chromebooks. Stable fix to limit DP SST link rate to <=8.1Gbps.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Zc37W27F5OvoeSkG@jlahtine-mobl.ger.corp.intel.com
parents 38df7e5e ad26d56d

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

+3 −0
Original line number Diff line number Diff line
@@ -2355,6 +2355,9 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp, 
	limits->min_rate = intel_dp_common_rate(intel_dp, 0);

	limits->max_rate = intel_dp_max_link_rate(intel_dp);



	/* FIXME 128b/132b SST support missing */

	limits->max_rate = min(limits->max_rate, 810000);



	limits->min_lane_count = 1;

	limits->max_lane_count = intel_dp_max_lane_count(intel_dp);

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

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 
#define DSCC_PICTURE_PARAMETER_SET_0		_MMIO(0x6BA00)

#define _DSCA_PPS_0				0x6B200

#define _DSCC_PPS_0				0x6BA00

#define DSCA_PPS(pps)				_MMIO(_DSCA_PPS_0 + (pps) * 4)

#define DSCC_PPS(pps)				_MMIO(_DSCC_PPS_0 + (pps) * 4)

#define DSCA_PPS(pps)				_MMIO(_DSCA_PPS_0 + ((pps) < 12 ? (pps) : (pps) + 12) * 4)

#define DSCC_PPS(pps)				_MMIO(_DSCC_PPS_0 + ((pps) < 12 ? (pps) : (pps) + 12) * 4)

#define _ICL_DSC0_PICTURE_PARAMETER_SET_0_PB	0x78270

#define _ICL_DSC1_PICTURE_PARAMETER_SET_0_PB	0x78370

#define _ICL_DSC0_PICTURE_PARAMETER_SET_0_PC	0x78470