Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/i915: Remove i915_reg.h from intel_rom.c

Make intel_rom.c free from including i915_reg.h.

v5: Use SPDX (Jani)

v4: Move oprom reg to separate header (Ville)

v3: Update patch header

v2: Use display header instead of gmd common include (Jani)

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Link: https://patch.msgid.link/20260205094341.1882816-15-uma.shankar@intel.com

+16 -10
+15
drivers/gpu/drm/i915/display/intel_oprom_regs.h
··· 1 + /* SPDX-License-Identifier: MIT */ 2 + /* Copyright © 2026 Intel Corporation */ 3 + 4 + #ifndef _INTEL_OPROM_REGS_H_ 5 + #define _INTEL_OPROM_REGS_H_ 6 + 7 + #define PRIMARY_SPI_TRIGGER _MMIO(0x102040) 8 + #define PRIMARY_SPI_ADDRESS _MMIO(0x102080) 9 + #define PRIMARY_SPI_REGIONID _MMIO(0x102084) 10 + #define SPI_STATIC_REGIONS _MMIO(0x102090) 11 + #define OPTIONROM_SPI_REGIONID_MASK REG_GENMASK(7, 0) 12 + #define OROM_OFFSET _MMIO(0x1020c0) 13 + #define OROM_OFFSET_MASK REG_GENMASK(20, 16) 14 + 15 + #endif
+1 -2
drivers/gpu/drm/i915/display/intel_rom.c
··· 7 7 8 8 #include <drm/drm_device.h> 9 9 10 - #include "i915_reg.h" 11 - 12 10 #include "intel_rom.h" 13 11 #include "intel_uncore.h" 12 + #include "intel_oprom_regs.h" 14 13 15 14 struct intel_rom { 16 15 /* for PCI ROM */
-8
drivers/gpu/drm/i915/i915_reg.h
··· 892 892 #define SGGI_DIS REG_BIT(15) 893 893 #define SGR_DIS REG_BIT(13) 894 894 895 - #define PRIMARY_SPI_TRIGGER _MMIO(0x102040) 896 - #define PRIMARY_SPI_ADDRESS _MMIO(0x102080) 897 - #define PRIMARY_SPI_REGIONID _MMIO(0x102084) 898 - #define SPI_STATIC_REGIONS _MMIO(0x102090) 899 - #define OPTIONROM_SPI_REGIONID_MASK REG_GENMASK(7, 0) 900 - #define OROM_OFFSET _MMIO(0x1020c0) 901 - #define OROM_OFFSET_MASK REG_GENMASK(20, 16) 902 - 903 895 #define MTL_MEDIA_GSI_BASE 0x380000 904 896 905 897 #endif /* _I915_REG_H_ */