| Message ID | 20200106151655.311413-2-christian.gmeiner@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | update hwdw for gc400 | expand |
Hi Christian, series applied to etnaviv/next. Regards, Lucas On Mo, 2020-01-06 at 16:16 +0100, Christian Gmeiner wrote: > Update the state HI header from rnndb commit > 7f1ce75 ("rnndb: document some GPU identity register") > > Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> > --- > drivers/gpu/drm/etnaviv/state_hi.xml.h | 29 ++++++++++++++++------ > ---- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/etnaviv/state_hi.xml.h > b/drivers/gpu/drm/etnaviv/state_hi.xml.h > index 41d8da2b6f4f..004d8ddacf6a 100644 > --- a/drivers/gpu/drm/etnaviv/state_hi.xml.h > +++ b/drivers/gpu/drm/etnaviv/state_hi.xml.h > @@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng > headergen tool in this git repository > git clone git://0x04.net/rules-ng-ng > > The rules-ng-ng source files this header was generated from are: > -- state.xml ( 26087 bytes, from 2017-12-18 16:51:59) > -- common.xml ( 35468 bytes, from 2018-01-22 13:48:54) > -- common_3d.xml ( 14615 bytes, from 2017-12-18 16:51:59) > -- state_hi.xml ( 30232 bytes, from 2018-02-15 15:48:01) > -- copyright.xml ( 1597 bytes, from 2016-12-08 16:37:56) > -- state_2d.xml ( 51552 bytes, from 2016-12-08 16:37:56) > -- state_3d.xml ( 79992 bytes, from 2017-12-18 16:51:59) > -- state_blt.xml ( 13405 bytes, from 2017-12-18 16:51:59) > -- state_vg.xml ( 5975 bytes, from 2016-12-08 16:37:56) > - > -Copyright (C) 2012-2018 by the following authors: > +- state.xml ( 26666 bytes, from 2019-12-20 21:20:35) > +- common.xml ( 35468 bytes, from 2018-02-10 13:09:26) > +- common_3d.xml ( 15058 bytes, from 2019-12-28 20:02:03) > +- state_hi.xml ( 30552 bytes, from 2019-12-28 20:02:48) > +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) > +- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26) > +- state_3d.xml ( 83098 bytes, from 2019-12-28 20:02:03) > +- state_blt.xml ( 14252 bytes, from 2019-10-20 19:59:15) > +- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) > + > +Copyright (C) 2012-2019 by the following authors: > - Wladimir J. van der Laan <laanwj@gmail.com> > - Christian Gmeiner <christian.gmeiner@gmail.com> > - Lucas Stach <l.stach@pengutronix.de> > @@ -48,6 +48,9 @@ DEALINGS IN THE SOFTWARE. > #define MMU_EXCEPTION_SLAVE_NOT_PRESENT > 0x00000001 > #define MMU_EXCEPTION_PAGE_NOT_PRESENT > 0x00000002 > #define MMU_EXCEPTION_WRITE_VIOLATION > 0x00000003 > +#define MMU_EXCEPTION_OUT_OF_BOUND 0x00000 > 004 > +#define MMU_EXCEPTION_READ_SECURITY_VIOLATION > 0x00000005 > +#define MMU_EXCEPTION_WRITE_SECURITY_VIOLATION > 0x00000006 > #define VIVS_HI > 0x00000000 > > #define VIVS_HI_CLOCK_CONTROL > 0x00000000 > @@ -140,6 +143,8 @@ DEALINGS IN THE SOFTWARE. > > #define VIVS_HI_CHIP_TIME 0x00000 > 02c > > +#define VIVS_HI_CHIP_CUSTOMER_ID 0x00000 > 030 > + > #define VIVS_HI_CHIP_MINOR_FEATURE_0 0x00000 > 034 > > #define VIVS_HI_CACHE_CONTROL > 0x00000038 > @@ -237,6 +242,8 @@ DEALINGS IN THE SOFTWARE. > > #define VIVS_HI_BLT_INTR 0x00000 > 0d4 > > +#define VIVS_HI_CHIP_ECO_ID 0x00000 > 0e8 > + > #define VIVS_HI_AUXBIT > 0x000000ec > > #define VIVS_PM > 0x00000000
diff --git a/drivers/gpu/drm/etnaviv/state_hi.xml.h b/drivers/gpu/drm/etnaviv/state_hi.xml.h index 41d8da2b6f4f..004d8ddacf6a 100644 --- a/drivers/gpu/drm/etnaviv/state_hi.xml.h +++ b/drivers/gpu/drm/etnaviv/state_hi.xml.h @@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng headergen tool in this git repository git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- state.xml ( 26087 bytes, from 2017-12-18 16:51:59) -- common.xml ( 35468 bytes, from 2018-01-22 13:48:54) -- common_3d.xml ( 14615 bytes, from 2017-12-18 16:51:59) -- state_hi.xml ( 30232 bytes, from 2018-02-15 15:48:01) -- copyright.xml ( 1597 bytes, from 2016-12-08 16:37:56) -- state_2d.xml ( 51552 bytes, from 2016-12-08 16:37:56) -- state_3d.xml ( 79992 bytes, from 2017-12-18 16:51:59) -- state_blt.xml ( 13405 bytes, from 2017-12-18 16:51:59) -- state_vg.xml ( 5975 bytes, from 2016-12-08 16:37:56) - -Copyright (C) 2012-2018 by the following authors: +- state.xml ( 26666 bytes, from 2019-12-20 21:20:35) +- common.xml ( 35468 bytes, from 2018-02-10 13:09:26) +- common_3d.xml ( 15058 bytes, from 2019-12-28 20:02:03) +- state_hi.xml ( 30552 bytes, from 2019-12-28 20:02:48) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26) +- state_3d.xml ( 83098 bytes, from 2019-12-28 20:02:03) +- state_blt.xml ( 14252 bytes, from 2019-10-20 19:59:15) +- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) + +Copyright (C) 2012-2019 by the following authors: - Wladimir J. van der Laan <laanwj@gmail.com> - Christian Gmeiner <christian.gmeiner@gmail.com> - Lucas Stach <l.stach@pengutronix.de> @@ -48,6 +48,9 @@ DEALINGS IN THE SOFTWARE. #define MMU_EXCEPTION_SLAVE_NOT_PRESENT 0x00000001 #define MMU_EXCEPTION_PAGE_NOT_PRESENT 0x00000002 #define MMU_EXCEPTION_WRITE_VIOLATION 0x00000003 +#define MMU_EXCEPTION_OUT_OF_BOUND 0x00000004 +#define MMU_EXCEPTION_READ_SECURITY_VIOLATION 0x00000005 +#define MMU_EXCEPTION_WRITE_SECURITY_VIOLATION 0x00000006 #define VIVS_HI 0x00000000 #define VIVS_HI_CLOCK_CONTROL 0x00000000 @@ -140,6 +143,8 @@ DEALINGS IN THE SOFTWARE. #define VIVS_HI_CHIP_TIME 0x0000002c +#define VIVS_HI_CHIP_CUSTOMER_ID 0x00000030 + #define VIVS_HI_CHIP_MINOR_FEATURE_0 0x00000034 #define VIVS_HI_CACHE_CONTROL 0x00000038 @@ -237,6 +242,8 @@ DEALINGS IN THE SOFTWARE. #define VIVS_HI_BLT_INTR 0x000000d4 +#define VIVS_HI_CHIP_ECO_ID 0x000000e8 + #define VIVS_HI_AUXBIT 0x000000ec #define VIVS_PM 0x00000000
Update the state HI header from rnndb commit 7f1ce75 ("rnndb: document some GPU identity register") Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> --- drivers/gpu/drm/etnaviv/state_hi.xml.h | 29 ++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-)