Intel Xe and i915 Arc driver fixes to bypass VGA issue.

Author: geerlingguy

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

@@ -7636,6 +7636,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
 	 * FIXME: Cut over to (async) commit helpers instead of hand-rolling
 	 * everything.
 	 */
+#if defined(CONFIG_VGA_CONSOLE)
 	if (state->base.legacy_cursor_update) {
 		struct intel_crtc_state *new_crtc_state;
 		struct intel_crtc *crtc;
@@ -7644,6 +7645,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
 		for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
 			complete_all(&new_crtc_state->uapi.commit->flip_done);
 	}
+#endif
 
 	ret = intel_atomic_prepare_commit(state);
 	if (ret) {

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

@@ -91,7 +91,9 @@ void intel_vga_reset_io_mem(struct intel_display *display)
 	 * and error messages.
 	 */
 	vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
+#if defined(CONFIG_VGA_CONSOLE)
 	outb(inb(VGA_MIS_R), VGA_MIS_W);
+#endif
 	vga_put(pdev, VGA_RSRC_LEGACY_IO);
 }