Commit 280bd84f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-10-19' of... 

Merge tag 'drm-intel-fixes-2023-10-19' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix display issue that was blocking S0ix (Khaled)
- Retry gtt fault when out of fence registers (Ville)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZTFXbo6M5bWp/hTU@intel.com
parents d43c76c8 e339c6d6

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

+1 −2
Original line number Diff line number Diff line
@@ -2553,8 +2553,7 @@ static void intel_cx0_phy_lane_reset(struct drm_i915_private *i915, 
		drm_warn(&i915->drm, "PHY %c failed to bring out of SOC reset after %dus.\n",

			 phy_name(phy), XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US);



	intel_de_rmw(i915, XELPDP_PORT_BUF_CTL2(port),

		     XELPDP_LANE_PIPE_RESET(0) | XELPDP_LANE_PIPE_RESET(1),

	intel_de_rmw(i915, XELPDP_PORT_BUF_CTL2(port), lane_pipe_reset,

		     lane_pipe_reset);



	if (__intel_de_wait_for_register(i915, XELPDP_PORT_BUF_CTL2(port),

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ static vm_fault_t i915_error_to_vmf_fault(int err) 
	case 0:

	case -EAGAIN:

	case -ENOSPC: /* transient failure to evict? */

	case -ENOBUFS: /* temporarily out of fences? */

	case -ERESTARTSYS:

	case -EINTR:

	case -EBUSY: