Commit f0bb41fa authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/vga: switch to use VGA definitions from video/vga.h 



The video/vga.h has macros for the VGA registers. Switch to use them.

v2: Use direct 0x01 instead of the confusing VGA_SEQ_CLOCK_MODE (Ville)

Suggested-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220202112509.1886660-1-jani.nikula@intel.com
parent 657b15d6

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

+5 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/vgaarb.h>



#include <drm/i915_drm.h>

#include <video/vga.h>



#include "i915_drv.h"

#include "intel_de.h"
@@ -34,9 +35,9 @@ void intel_vga_disable(struct drm_i915_private *dev_priv) 


	/* WaEnableVGAAccessThroughIOPort:ctg,elk,ilk,snb,ivb,vlv,hsw */

	vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);

	outb(SR01, VGA_SR_INDEX);

	sr1 = inb(VGA_SR_DATA);

	outb(sr1 | 1 << 5, VGA_SR_DATA);

	outb(0x01, VGA_SEQ_I);

	sr1 = inb(VGA_SEQ_D);

	outb(sr1 | VGA_SR01_SCREEN_OFF, VGA_SEQ_D);

	vga_put(pdev, VGA_RSRC_LEGACY_IO);

	udelay(300);
@@ -92,7 +93,7 @@ void intel_vga_reset_io_mem(struct drm_i915_private *i915) 
	 * and error messages.

	 */

	vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);

	outb(inb(VGA_MSR_READ), VGA_MSR_WRITE);

	outb(inb(VGA_MIS_R), VGA_MIS_W);

	vga_put(pdev, VGA_RSRC_LEGACY_IO);

}