diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-21 07:15:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-21 07:15:16 +1000 |
| commit | 74e1697478ffdee0e12e48db024a9b3677fd8cee (patch) | |
| tree | ec6e337139cd9020f7b5adc054b1f6caa09c1b0a /drivers/gpu/drm/radeon/rv770d.h | |
| parent | e9f211ad7d65b264998928cea822c11c88e5586b (diff) | |
| parent | 43a23aa450cc19fe8996caf09e7e21ae5f6e56e8 (diff) | |
Merge branch 'drm-next-3.9' of git://people.freedesktop.org/~agd5f/linux into drm-next
More drm-next bits for radeon. Just bug fixes.
* 'drm-next-3.9' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: properly validate the atpx interface
drm/radeon: switch get_gpu_clock() to a callback (v2)
drm/radeon: add a asic callback to get the xclk
drm/radeon: Avoid NULL pointer dereference from atom_index_iio() allocation failure
drm/radeon: remove overzealous warning in hdmi handling
drm/radeon: fix multi-head power profile stability on BTC+ asics
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770d.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv770d.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h index 20e29d23d34..c55f950a4af 100644 --- a/drivers/gpu/drm/radeon/rv770d.h +++ b/drivers/gpu/drm/radeon/rv770d.h @@ -128,6 +128,10 @@ #define GUI_ACTIVE (1<<31) #define GRBM_STATUS2 0x8014 +#define CG_CLKPIN_CNTL 0x660 +# define MUX_TCLK_TO_XCLK (1 << 8) +# define XTALIN_DIVIDE (1 << 9) + #define CG_MULT_THERMAL_STATUS 0x740 #define ASIC_T(x) ((x) << 16) #define ASIC_T_MASK 0x3FF0000 |