Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: Get rid of the INTEL_GMCH_CTRL alias
INTEL_GMCH_CTRL and I830_GMCH_CTRL are the same register.
Get rid of the INTEL_GMCH_CTRL name.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251208182637.334-18-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+4
-3
+1
-1
drivers/gpu/drm/i915/display/intel_vga.c
+1
-1
drivers/gpu/drm/i915/display/intel_vga.c
···
20
20
21
21
static unsigned int intel_gmch_ctrl_reg(struct intel_display *display)
22
22
{
23
-
return DISPLAY_VER(display) >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL;
23
+
return DISPLAY_VER(display) >= 6 ? SNB_GMCH_CTRL : I830_GMCH_CTRL;
24
24
}
25
25
26
26
static bool intel_vga_decode_is_enabled(struct intel_display *display)
+3
-2
include/drm/intel/i915_drm.h
+3
-2
include/drm/intel/i915_drm.h
···
44
44
* This is all handled in the intel-gtt.ko module. i915.ko only
45
45
* cares about the vga bit for the vga arbiter.
46
46
*/
47
-
#define INTEL_GMCH_CTRL 0x52
48
-
#define INTEL_GMCH_VGA_DISABLE (1 << 1)
49
47
#define SNB_GMCH_CTRL 0x50
50
48
#define SNB_GMCH_GGMS_SHIFT 8 /* GTT Graphics Memory Size */
51
49
#define SNB_GMCH_GGMS_MASK 0x3
···
77
79
#define INTEL_GMCH_GMS_STOLEN_160M (0xb << 4)
78
80
#define INTEL_GMCH_GMS_STOLEN_224M (0xc << 4)
79
81
#define INTEL_GMCH_GMS_STOLEN_352M (0xd << 4)
82
+
83
+
/* valid for both I830_GMCH_CTRL and SNB_GMCH_CTRL */
84
+
#define INTEL_GMCH_VGA_DISABLE (1 << 1)
80
85
81
86
#define I830_DRB3 0x63
82
87
#define I85X_DRB3 0x43