Skip to contentSkip to conversation

drm/radeon: fix VGT_GS_INSTANCE_CNT register

PATCH Applied Dave Airlie 3 participants 4 messages Nov 30, 2013 – Feb 10, 2014

Subsystems (2)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 drm/radeon: fix VGT_GS_INSTANCE_CNT register

this register was incorrect for evergreen and cayman.

---
 drivers/gpu/drm/radeon/radeon_drv.h       | 3 ++-
 drivers/gpu/drm/radeon/reg_srcs/cayman    | 2 +-
 drivers/gpu/drm/radeon/reg_srcs/evergreen | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.h +2 -1
index b369d42..e1082be 100644
@@ -108,9 +108,10 @@
  * 1.31- Add support for num Z pipes from GET_PARAM
  * 1.32- fixes for rv740 setup
  * 1.33- Add r6xx/r7xx const buffer support
+ * 1.34- fix evergreen/cayman GS register
  */
 #define DRIVER_MAJOR		1
-#define DRIVER_MINOR		33
+#define DRIVER_MINOR		34
 #define DRIVER_PATCHLEVEL	0
 
 /* The rest of the file is DEPRECATED! */
drivers/gpu/drm/radeon/reg_srcs/cayman +1 -1
index a072fa8..af7a941 100644
@@ -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
drivers/gpu/drm/radeon/reg_srcs/evergreen +1 -1
index b912a37..e19ef0e 100644
@@ -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
Signature · 1 line
1.8.4.2
Applied
#1 lore raw

Applied. thanks!

Quoted 58 lines · Dave Airlie

this register was incorrect for evergreen and cayman.

---
 drivers/gpu/drm/radeon/radeon_drv.h       | 3 ++-
 drivers/gpu/drm/radeon/reg_srcs/cayman    | 2 +-
 drivers/gpu/drm/radeon/reg_srcs/evergreen | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.h +2 -1
index b369d42..e1082be 100644
@@ -108,9 +108,10 @@
  * 1.31- Add support for num Z pipes from GET_PARAM
  * 1.32- fixes for rv740 setup
  * 1.33- Add r6xx/r7xx const buffer support
+ * 1.34- fix evergreen/cayman GS register
  */
 #define DRIVER_MAJOR           1
-#define DRIVER_MINOR           33
+#define DRIVER_MINOR           34
 #define DRIVER_PATCHLEVEL      0
 
 /* The rest of the file is DEPRECATED! */
drivers/gpu/drm/radeon/reg_srcs/cayman +1 -1
index a072fa8..af7a941 100644
@@ -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
drivers/gpu/drm/radeon/reg_srcs/evergreen +1 -2
index b912a37..e19ef0e 100644
@@ -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
--

1.8.4.2

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
In reply to Dave Airlie

Hi Dave,

You bumped the UMS driver version instead of the KMS one.

Sorry for the late review, I actually noticed it when reading the code.

Marek

Quoted 58 lines · Dave Airlie

this register was incorrect for evergreen and cayman.

---
 drivers/gpu/drm/radeon/radeon_drv.h       | 3 ++-
 drivers/gpu/drm/radeon/reg_srcs/cayman    | 2 +-
 drivers/gpu/drm/radeon/reg_srcs/evergreen | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.h +2 -1
index b369d42..e1082be 100644
@@ -108,9 +108,10 @@
  * 1.31- Add support for num Z pipes from GET_PARAM
  * 1.32- fixes for rv740 setup
  * 1.33- Add r6xx/r7xx const buffer support
+ * 1.34- fix evergreen/cayman GS register
  */
 #define DRIVER_MAJOR           1
-#define DRIVER_MINOR           33
+#define DRIVER_MINOR           34
 #define DRIVER_PATCHLEVEL      0
 
 /* The rest of the file is DEPRECATED! */
drivers/gpu/drm/radeon/reg_srcs/cayman +1 -1
index a072fa8..af7a941 100644
@@ -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
drivers/gpu/drm/radeon/reg_srcs/evergreen +1 -2
index b912a37..e19ef0e 100644
@@ -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
--

1.8.4.2

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#3 lore raw
Quoted 5 lines · Marek Olšák

Hi Dave,

You bumped the UMS driver version instead of the KMS one.

Sorry for the late review, I actually noticed it when reading the code.

Oh I noticed, so I should just revert the bump here, as it just happened a kernel released with a kms version bump that I overloaded.

Thanks,
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel