diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-22 22:40:42 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-22 22:40:42 +0200 |
| commit | df7976797fa9af161690dbf4dee81ed92cdc150f (patch) | |
| tree | be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3 /drivers/gpu/drm/radeon/radeon_reg.h | |
| parent | drm/i915: Skip GPU wait for scanout pin while wedged (diff) | |
| parent | drm/i915: load the LUT before pipe enable on ILK+ (diff) | |
| download | linux-df7976797fa9af161690dbf4dee81ed92cdc150f.tar.xz linux-df7976797fa9af161690dbf4dee81ed92cdc150f.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_reg.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_reg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h index ec93a75369e6..bc44a3d35ec6 100644 --- a/drivers/gpu/drm/radeon/radeon_reg.h +++ b/drivers/gpu/drm/radeon/radeon_reg.h @@ -300,6 +300,8 @@ # define RADEON_BUS_READ_BURST (1 << 30) #define RADEON_BUS_CNTL1 0x0034 # define RADEON_BUS_WAIT_ON_LOCK_EN (1 << 4) +#define RV370_BUS_CNTL 0x004c +# define RV370_BUS_BIOS_DIS_ROM (1 << 2) /* rv370/rv380, rv410, r423/r430/r480, r5xx */ #define RADEON_MSI_REARM_EN 0x0160 # define RV370_MSI_REARM_EN (1 << 0) |