From: Ville Syrjälä Date: Mon, 8 Dec 2025 18:26:33 +0000 (+0200) Subject: drm/i915/crt: Use IS0_R instead of VGA_MIS_W X-Git-Tag: v7.1-rc1~167^2~24^2~223 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dc670f24b055ef9f4a95f7db41e97465695c3f6;p=thirdparty%2Flinux.git drm/i915/crt: Use IS0_R instead of VGA_MIS_W Use the proper IS0_R name for the VGA input status register 0, instead of using the VGA_MIS_W alias which is meant for write accesses to the same address. Yes, VGA registers are weird. Signed-off-by: Ville Syrjälä Link: https://patch.msgid.link/20251208182637.334-16-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c index dedc26f6a2b2f..6f216ba887bcc 100644 --- a/drivers/gpu/drm/i915/display/intel_crt.c +++ b/drivers/gpu/drm/i915/display/intel_crt.c @@ -738,7 +738,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) * border color for Color info. */ intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(display, pipe)); - st00 = intel_vga_read(display, VGA_MIS_W, true); + st00 = intel_vga_read(display, VGA_IS0_R, true); status = ((st00 & (1 << 4)) != 0) ? connector_status_connected : connector_status_disconnected; @@ -786,7 +786,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) do { count++; /* Read the ST00 VGA status register */ - st00 = intel_vga_read(display, VGA_MIS_W, true); + st00 = intel_vga_read(display, VGA_IS0_R, true); if (st00 & (1 << 4)) detect++; } while ((intel_de_read(display, PIPEDSL(display, pipe)) == dsl));