* [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register
@ 2013-11-30 11:07 Dave Airlie
2013-12-02 21:12 ` Alex Deucher
2014-02-10 0:14 ` Marek Olšák
0 siblings, 2 replies; 4+ messages in thread
From: Dave Airlie @ 2013-11-30 11:07 UTC (permalink / raw)
To: dri-devel
this register was incorrect for evergreen and cayman.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
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(-)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index b369d42..e1082be 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -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! */
diff --git a/drivers/gpu/drm/radeon/reg_srcs/cayman b/drivers/gpu/drm/radeon/reg_srcs/cayman
index a072fa8..af7a941 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/cayman
+++ b/drivers/gpu/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/drivers/gpu/drm/radeon/reg_srcs/evergreen b/drivers/gpu/drm/radeon/reg_srcs/evergreen
index b912a37..e19ef0e 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/evergreen
+++ b/drivers/gpu/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
--
1.8.4.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register
2013-11-30 11:07 [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register Dave Airlie
@ 2013-12-02 21:12 ` Alex Deucher
2014-02-10 0:14 ` Marek Olšák
1 sibling, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2013-12-02 21:12 UTC (permalink / raw)
To: Dave Airlie; +Cc: Maling list - DRI developers
Applied. thanks!
On Sat, Nov 30, 2013 at 6:07 AM, Dave Airlie <airlied@gmail.com> wrote:
> this register was incorrect for evergreen and cayman.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
> index b369d42..e1082be 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.h
> +++ b/drivers/gpu/drm/radeon/radeon_drv.h
> @@ -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! */
> diff --git a/drivers/gpu/drm/radeon/reg_srcs/cayman b/drivers/gpu/drm/radeon/reg_srcs/cayman
> index a072fa8..af7a941 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/cayman
> +++ b/drivers/gpu/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/drivers/gpu/drm/radeon/reg_srcs/evergreen b/drivers/gpu/drm/radeon/reg_srcs/evergreen
> index b912a37..e19ef0e 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/evergreen
> +++ b/drivers/gpu/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
> --
> 1.8.4.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register
2013-11-30 11:07 [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register Dave Airlie
2013-12-02 21:12 ` Alex Deucher
@ 2014-02-10 0:14 ` Marek Olšák
2014-02-10 0:34 ` Dave Airlie
1 sibling, 1 reply; 4+ messages in thread
From: Marek Olšák @ 2014-02-10 0:14 UTC (permalink / raw)
To: Dave Airlie; +Cc: dri-devel
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
On Sat, Nov 30, 2013 at 12:07 PM, Dave Airlie <airlied@gmail.com> wrote:
> this register was incorrect for evergreen and cayman.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
> index b369d42..e1082be 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.h
> +++ b/drivers/gpu/drm/radeon/radeon_drv.h
> @@ -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! */
> diff --git a/drivers/gpu/drm/radeon/reg_srcs/cayman b/drivers/gpu/drm/radeon/reg_srcs/cayman
> index a072fa8..af7a941 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/cayman
> +++ b/drivers/gpu/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/drivers/gpu/drm/radeon/reg_srcs/evergreen b/drivers/gpu/drm/radeon/reg_srcs/evergreen
> index b912a37..e19ef0e 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/evergreen
> +++ b/drivers/gpu/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
> --
> 1.8.4.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register
2014-02-10 0:14 ` Marek Olšák
@ 2014-02-10 0:34 ` Dave Airlie
0 siblings, 0 replies; 4+ messages in thread
From: Dave Airlie @ 2014-02-10 0:34 UTC (permalink / raw)
To: Marek Olšák; +Cc: dri-devel
On Mon, Feb 10, 2014 at 10:14 AM, Marek Olšák <maraeo@gmail.com> wrote:
> 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
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-10 0:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-30 11:07 [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register Dave Airlie
2013-12-02 21:12 ` Alex Deucher
2014-02-10 0:14 ` Marek Olšák
2014-02-10 0:34 ` Dave Airlie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox