On Mon, 08 Dec 2025, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > 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ä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_vga.c | 2 +- > include/drm/intel/i915_drm.h | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_vga.c > b/drivers/gpu/drm/i915/display/intel_vga.c > index 9e1f3ab632d5..6fc3e3702cb8 100644 > --- a/drivers/gpu/drm/i915/display/intel_vga.c > +++ b/drivers/gpu/drm/i915/display/intel_vga.c > @@ -20,7 +20,7 @@ > > static unsigned int intel_gmch_ctrl_reg(struct intel_display *display) > { > - return DISPLAY_VER(display) >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL; > + return DISPLAY_VER(display) >= 6 ? SNB_GMCH_CTRL : I830_GMCH_CTRL; > } > > static bool intel_vga_decode_is_enabled(struct intel_display *display) > diff --git a/include/drm/intel/i915_drm.h b/include/drm/intel/i915_drm.h > index adff68538484..91f628367f1f 100644 > --- a/include/drm/intel/i915_drm.h > +++ b/include/drm/intel/i915_drm.h > @@ -44,8 +44,6 @@ extern struct resource intel_graphics_stolen_res; > * This is all handled in the intel-gtt.ko module. i915.ko only > * cares about the vga bit for the vga arbiter. > */ > -#define INTEL_GMCH_CTRL 0x52 > -#define INTEL_GMCH_VGA_DISABLE (1 << 1) > #define SNB_GMCH_CTRL 0x50 > #define SNB_GMCH_GGMS_SHIFT 8 /* GTT Graphics Memory Size */ > #define SNB_GMCH_GGMS_MASK 0x3 > @@ -80,6 +78,9 @@ extern struct resource intel_graphics_stolen_res; > #define INTEL_GMCH_GMS_STOLEN_224M (0xc << 4) > #define INTEL_GMCH_GMS_STOLEN_352M (0xd << 4) > > +/* valid for both I830_GMCH_CTRL and SNB_GMCH_CTRL */ > +#define INTEL_GMCH_VGA_DISABLE (1 << 1) > + > #define I830_DRB3 0x63 > #define I85X_DRB3 0x43 > #define I865_TOUD 0xc4 -- Jani Nikula, Intel
