diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 02:22:20 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 02:22:20 -0400 |
| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /drivers/gpu/drm/radeon/reg_srcs/r600 | |
| parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 (diff) | |
| parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Diffstat (limited to 'drivers/gpu/drm/radeon/reg_srcs/r600')
| -rw-r--r-- | drivers/gpu/drm/radeon/reg_srcs/r600 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r600 b/drivers/gpu/drm/radeon/reg_srcs/r600 index 5e659b034d9a..f93e45d869f4 100644 --- a/drivers/gpu/drm/radeon/reg_srcs/r600 +++ b/drivers/gpu/drm/radeon/reg_srcs/r600 | |||
| @@ -744,14 +744,6 @@ r600 0x9400 | |||
| 744 | 0x00028C38 CB_CLRCMP_DST | 744 | 0x00028C38 CB_CLRCMP_DST |
| 745 | 0x00028C3C CB_CLRCMP_MSK | 745 | 0x00028C3C CB_CLRCMP_MSK |
| 746 | 0x00028C34 CB_CLRCMP_SRC | 746 | 0x00028C34 CB_CLRCMP_SRC |
| 747 | 0x00028100 CB_COLOR0_MASK | ||
| 748 | 0x00028104 CB_COLOR1_MASK | ||
| 749 | 0x00028108 CB_COLOR2_MASK | ||
| 750 | 0x0002810C CB_COLOR3_MASK | ||
| 751 | 0x00028110 CB_COLOR4_MASK | ||
| 752 | 0x00028114 CB_COLOR5_MASK | ||
| 753 | 0x00028118 CB_COLOR6_MASK | ||
| 754 | 0x0002811C CB_COLOR7_MASK | ||
| 755 | 0x00028808 CB_COLOR_CONTROL | 747 | 0x00028808 CB_COLOR_CONTROL |
| 756 | 0x0002842C CB_FOG_BLUE | 748 | 0x0002842C CB_FOG_BLUE |
| 757 | 0x00028428 CB_FOG_GREEN | 749 | 0x00028428 CB_FOG_GREEN |