github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

- Fix PSR's pipe to vblank conversion (Jani)

Browse Source 
- Disable Panel Replay on MST links (Imre)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmkV3PIACgkQ+mJfZA7r
 E8pOjggAq1g2j7Il+UYpjSKFQJNdYrp8xtmjjkPRaeF4RJT2SWzz7/gQVeAfzeFg
 372NXDU0JoqXoxLAqWQvhvQY9NOvJkN3Vr5n38SP0+kZGdBlIGjo1d7bBLhBmVQw
 6CHt+fSaDAwYXYfeQWApl0anuZs+hQWVFps276bfdaSyoGUjBeTYhdzzNzje+PKq
 dGOUxaJJ95+cJwxYKwclhh/h5nGYeJ8XI1cJuc2UdS1yV1YpdAN3QiWlXRF4897Q
 LdWAiIDsBYQTsk/M04BarclEJ0gaLyQ11/GEpErvC2jnkFP4aTbhJlcY/PCvqKIN
 yf83pynIwXVNNX59wy9o2PMK1heycQ==
 =xBDu
 -----END PGP SIGNATURE-----

Merge tag 'drm-intel-fixes-2025-11-13' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

- Fix PSR's pipe to vblank conversion (Jani)
- Disable Panel Replay on MST links (Imre)

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/aRXdQnitzyFcokhF@intel.com
This commit is contained in:
Dave Airlie 2025-11-14 17:50:36 +10:00
commit 538e0110fe
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/i915/display/intel_psr.c
View File

@ -585,6 +585,10 @@ static void _panel_replay_init_dpcd(struct intel_dp *intel_dp)
struct intel_display *display = to_intel_display(intel_dp);
int ret;
/* TODO: Enable Panel Replay on MST once it's properly implemented. */
if (intel_dp->mst_detect == DRM_DP_MST)
return;
ret = drm_dp_dpcd_read_data(&intel_dp->aux, DP_PANEL_REPLAY_CAP_SUPPORT,
&intel_dp->pr_dpcd, sizeof(intel_dp->pr_dpcd));
if (ret < 0)
@ -888,7 +892,8 @@ static bool is_dc5_dc6_blocked(struct intel_dp *intel_dp)
{
struct intel_display *display = to_intel_display(intel_dp);
u32 current_dc_state = intel_display_power_get_current_dc_state(display);
struct drm_vblank_crtc *vblank = &display->drm->vblank[intel_dp->psr.pipe];
struct intel_crtc *crtc = intel_crtc_for_pipe(display, intel_dp->psr.pipe);
struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(&crtc->base);
return (current_dc_state != DC_STATE_EN_UPTO_DC5 &&
current_dc_state != DC_STATE_EN_UPTO_DC6) ||