tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'drm-fixes-2025-07-26' of https://gitlab.freedesktop.org/drm/kernel

Pull drm fixes (part 2) from Dave Airlie:
"Just the follow up fixes for i915 and xe, all pretty minor.

i915:
- Fix DP 2.7 Gbps DP_LINK_BW value on g4x
- Fix return value on intel_atomic_commit_fence_wait

xe:
- Fix build without debugfs"

* tag 'drm-fixes-2025-07-26' of https://gitlab.freedesktop.org/drm/kernel:
drm/xe: Fix build without debugfs
drm/i915/display: Fix dma_fence_wait_timeout() return value handling
drm/i915/dp: Fix 2.7 Gbps DP_LINK_BW value on g4x

Linus Torvalds 5f33ebd2 32757967

+9 -2
+2 -1
drivers/gpu/drm/i915/display/intel_display.c
··· 7061 7061 struct drm_i915_private *i915 = to_i915(intel_state->base.dev); 7062 7062 struct drm_plane *plane; 7063 7063 struct drm_plane_state *new_plane_state; 7064 - int ret, i; 7064 + long ret; 7065 + int i; 7065 7066 7066 7067 for_each_new_plane_in_state(&intel_state->base, plane, new_plane_state, i) { 7067 7068 if (new_plane_state->fence) {
+6
drivers/gpu/drm/i915/display/intel_dp.c
··· 1604 1604 void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock, 1605 1605 u8 *link_bw, u8 *rate_select) 1606 1606 { 1607 + struct intel_display *display = to_intel_display(intel_dp); 1608 + 1609 + /* FIXME g4x can't generate an exact 2.7GHz with the 96MHz non-SSC refclk */ 1610 + if (display->platform.g4x && port_clock == 268800) 1611 + port_clock = 270000; 1612 + 1607 1613 /* eDP 1.4 rate select method. */ 1608 1614 if (intel_dp->use_rate_select) { 1609 1615 *link_bw = 0;
+1 -1
drivers/gpu/drm/xe/xe_gt.h
··· 24 24 extern struct fault_attr gt_reset_failure; 25 25 static inline bool xe_fault_inject_gt_reset(void) 26 26 { 27 - return should_fail(&gt_reset_failure, 1); 27 + return IS_ENABLED(CONFIG_DEBUG_FS) && should_fail(&gt_reset_failure, 1); 28 28 } 29 29 30 30 struct xe_gt *xe_gt_alloc(struct xe_tile *tile);