]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/gmbus: fix spurious timeout on 512-byte burst reads
authorSamasth Norway Ananda <samasth.norway.ananda@oracle.com>
Mon, 16 Mar 2026 23:19:19 +0000 (16:19 -0700)
committerJani Nikula <jani.nikula@intel.com>
Wed, 18 Mar 2026 10:09:27 +0000 (12:09 +0200)
When reading exactly 512 bytes with burst read enabled, the
extra_byte_added path breaks out of the inner do-while without
decrementing len. The outer while(len) then re-enters and gmbus_wait()
times out since all data has been delivered. Decrement len before the
break so the outer loop terminates correctly.

Fixes: d5dc0f43f268 ("drm/i915/gmbus: Enable burst read")
Signed-off-by: Samasth Norway Ananda <samasth.norway.ananda@oracle.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260316231920.135438-2-samasth.norway.ananda@oracle.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_gmbus.c

index df48f27f1cc1813fe54d64fb4b7560c021ef321e..dd79a866b87eb7671bc11b4df50754f12c3e6b77 100644 (file)
@@ -495,8 +495,10 @@ gmbus_xfer_read_chunk(struct intel_display *display,
 
                val = intel_de_read_fw(display, GMBUS3(display));
                do {
-                       if (extra_byte_added && len == 1)
+                       if (extra_byte_added && len == 1) {
+                               len--;
                                break;
+                       }
 
                        *buf++ = val & 0xff;
                        val >>= 8;