summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2015-01-28 05:24:41 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2015-01-28 05:24:41 +0000
commitb6f1f4292e8a2fec078ea7ad10a419e4ae716168 (patch)
tree9dff7ff808867695ba20d353874dc392c3198e98 /sys/dev/pci/drm
parent3383afe0d2f6418d30e3fdea0826fc611ec5b44b (diff)
drm/radeon: fix VGT_GS_INSTANCE_CNT register
From Dave Airlie b7bc799903bbae16795cb15705ddcab80c8f17f1 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm')
-rw-r--r--sys/dev/pci/drm/radeon/cayman_reg_safe.h2
-rw-r--r--sys/dev/pci/drm/radeon/evergreen_reg_safe.h2
-rw-r--r--sys/dev/pci/drm/radeon/reg_srcs/cayman2
-rw-r--r--sys/dev/pci/drm/radeon/reg_srcs/evergreen2
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/radeon/cayman_reg_safe.h b/sys/dev/pci/drm/radeon/cayman_reg_safe.h
index 41c676e7149..aa9682b634e 100644
--- a/sys/dev/pci/drm/radeon/cayman_reg_safe.h
+++ b/sys/dev/pci/drm/radeon/cayman_reg_safe.h
@@ -324,7 +324,7 @@ static const unsigned cayman_reg_safe_bm[2047] = {
0x00000E00, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0xFFFFFCF8, 0xFE07FF00,
0x3CF1F003, 0xE39E7BCF, 0xFFFFFFFF, 0xFFFFFFFF,
- 0xE7020000, 0xDDD898DD, 0x279FA3FD, 0x011FFFF0,
+ 0xE7020000, 0xDDD898DD, 0x079FA3FD, 0x011FFFE0,
0xBFFF0000, 0xEFC3DF87, 0x7BF0F7E1, 0x1EFC3DF8,
0xDFBF0F7E, 0xFFFFF7EF, 0xFFFFFFFF, 0x00000000,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
diff --git a/sys/dev/pci/drm/radeon/evergreen_reg_safe.h b/sys/dev/pci/drm/radeon/evergreen_reg_safe.h
index d4445908b73..083686f2a9d 100644
--- a/sys/dev/pci/drm/radeon/evergreen_reg_safe.h
+++ b/sys/dev/pci/drm/radeon/evergreen_reg_safe.h
@@ -324,7 +324,7 @@ static const unsigned evergreen_reg_safe_bm[2047] = {
0x00000E00, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0xC0000000, 0xFFFFF8FF, 0xFE07FF00,
0x3CF1B003, 0xE39E7BCF, 0xFFFFFFFF, 0xFFFFFFFF,
- 0xF7020000, 0xDDD89CDD, 0x201FA3FD, 0xFFFFFFF0,
+ 0xF7020000, 0xDDD89CDD, 0x001FA3FD, 0xFFFFFFE0,
0xBFFF0002, 0xEFC3DF87, 0x7BF0F7E1, 0x1EFC3DF8,
0xDFBF0F7E, 0xFFFFF7EF, 0xFFFFFFFF, 0x00000000,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
diff --git a/sys/dev/pci/drm/radeon/reg_srcs/cayman b/sys/dev/pci/drm/radeon/reg_srcs/cayman
index a072fa8c46b..af7a941adf0 100644
--- a/sys/dev/pci/drm/radeon/reg_srcs/cayman
+++ b/sys/dev/pci/drm/radeon/reg_srcs/cayman
@@ -532,7 +532,7 @@ cayman 0x9400
0x00028B84 PA_SU_POLY_OFFSET_FRONT_OFFSET
0x00028B88 PA_SU_POLY_OFFSET_BACK_SCALE
0x00028B8C PA_SU_POLY_OFFSET_BACK_OFFSET
-0x00028B74 VGT_GS_INSTANCE_CNT
+0x00028B90 VGT_GS_INSTANCE_CNT
0x00028BD4 PA_SC_CENTROID_PRIORITY_0
0x00028BD8 PA_SC_CENTROID_PRIORITY_1
0x00028BDC PA_SC_LINE_CNTL
diff --git a/sys/dev/pci/drm/radeon/reg_srcs/evergreen b/sys/dev/pci/drm/radeon/reg_srcs/evergreen
index b912a37689b..e19ef0e6ff2 100644
--- a/sys/dev/pci/drm/radeon/reg_srcs/evergreen
+++ b/sys/dev/pci/drm/radeon/reg_srcs/evergreen
@@ -545,7 +545,7 @@ evergreen 0x9400
0x00028B84 PA_SU_POLY_OFFSET_FRONT_OFFSET
0x00028B88 PA_SU_POLY_OFFSET_BACK_SCALE
0x00028B8C PA_SU_POLY_OFFSET_BACK_OFFSET
-0x00028B74 VGT_GS_INSTANCE_CNT
+0x00028B90 VGT_GS_INSTANCE_CNT
0x00028C00 PA_SC_LINE_CNTL
0x00028C08 PA_SU_VTX_CNTL
0x00028C0C PA_CL_GB_VERT_CLIP_ADJ