diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 23:36:21 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 23:50:36 +0000 |
| commit | b9e68670cc3a13166b389ce847af19b0d0d33c67 (patch) | |
| tree | bb79d91266490fa5bfe77cfef53ead8a1f7a62f6 /drivers/gpu/drm/radeon/r600_reg.h | |
| parent | 60de2ba51eaba9eefcc355cb20c8582b1481e755 (diff) | |
| parent | 5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_reg.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600_reg.h b/drivers/gpu/drm/radeon/r600_reg.h index d84612ae47e0..33cda016b083 100644 --- a/drivers/gpu/drm/radeon/r600_reg.h +++ b/drivers/gpu/drm/radeon/r600_reg.h @@ -86,6 +86,7 @@ #define R600_HDP_NONSURFACE_BASE 0x2c04 #define R600_BUS_CNTL 0x5420 +# define R600_BIOS_ROM_DIS (1 << 1) #define R600_CONFIG_CNTL 0x5424 #define R600_CONFIG_MEMSIZE 0x5428 #define R600_CONFIG_F0_BASE 0x542C |