Commit 5344a8bb authored by Uma Shankar's avatar Uma Shankar
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Link: https://patch.msgid.link/20260205094341.1882816-15-uma.shankar@intel.com
parent 22625d19

drivers/gpu/drm/i915/display/intel_oprom_regs.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/* Copyright © 2026 Intel Corporation */



#ifndef _INTEL_OPROM_REGS_H_

#define _INTEL_OPROM_REGS_H_



#define PRIMARY_SPI_TRIGGER			_MMIO(0x102040)

#define PRIMARY_SPI_ADDRESS			_MMIO(0x102080)

#define PRIMARY_SPI_REGIONID			_MMIO(0x102084)

#define SPI_STATIC_REGIONS			_MMIO(0x102090)

#define   OPTIONROM_SPI_REGIONID_MASK		REG_GENMASK(7, 0)

#define OROM_OFFSET				_MMIO(0x1020c0)

#define   OROM_OFFSET_MASK			REG_GENMASK(20, 16)



#endif

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

+1 −2
Original line number Diff line number Diff line
@@ -7,10 +7,9 @@ 


#include <drm/drm_device.h>



#include "i915_reg.h"



#include "intel_rom.h"

#include "intel_uncore.h"

#include "intel_oprom_regs.h"



struct intel_rom {

	/* for PCI ROM */

drivers/gpu/drm/i915/i915_reg.h

+0 −8
Original line number Diff line number Diff line
@@ -892,14 +892,6 @@ 
#define   SGGI_DIS			REG_BIT(15)

#define   SGR_DIS			REG_BIT(13)



#define PRIMARY_SPI_TRIGGER			_MMIO(0x102040)

#define PRIMARY_SPI_ADDRESS			_MMIO(0x102080)

#define PRIMARY_SPI_REGIONID			_MMIO(0x102084)

#define SPI_STATIC_REGIONS			_MMIO(0x102090)

#define   OPTIONROM_SPI_REGIONID_MASK		REG_GENMASK(7, 0)

#define OROM_OFFSET				_MMIO(0x1020c0)

#define   OROM_OFFSET_MASK			REG_GENMASK(20, 16)



#define MTL_MEDIA_GSI_BASE		0x380000



#endif /* _I915_REG_H_ */