diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-01-25 12:41:16 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-01-25 12:41:16 +0300 |
| commit | 902ecddc95c68efe71be733c57e8976948537926 (patch) | |
| tree | cab01d5d8595a2fd554d1a18658e13e205294ce5 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | 81f66500f7c9e80c01bde8eb2cb78054051058e2 (diff) | |
| parent | 68de345e101ce9a24e5c8849e69dd0dba2e8c9b2 (diff) | |
| download | linux-902ecddc95c68efe71be733c57e8976948537926.tar.xz | |
Merge drm/drm-next into drm-intel-next
Backmerge to get the EDID handling changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index e89236cf96dc..bad36a67d873 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -118,6 +118,9 @@ #define GU_CNTL _MMIO(0x101010) #define LMEM_INIT REG_BIT(7) +#define DRIVERFLR REG_BIT(31) +#define GU_DEBUG _MMIO(0x101018) +#define DRIVERFLR_STATUS REG_BIT(31) #define GEN6_STOLEN_RESERVED _MMIO(0x1082C0) #define GEN6_STOLEN_RESERVED_ADDR_MASK (0xFFF << 20) |