On Mon, Sep 14, 2015 at 09:16:01AM -0400, Rob Clark wrote: > On Fri, Sep 11, 2015 at 10:10 AM, Lucas Stach <l.stach@xxxxxxxxxxxxxx> wrote: > > From: Christian Gmeiner <christian.gmeiner@xxxxxxxxx> > > > > This is a squashed commit of the complete etnaviv DRM driver in order > > to make it easy for people to review the code by seeing the driver as a > > whole and is not intended for merging in this form. > > > > If you are interested in the history of individual commits: > > git://git.pengutronix.de/git/lst/linux.git etnaviv-for-upstream > > > > Signed-off-by: Christian Gmeiner <christian.gmeiner@xxxxxxxxx> > > Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> > > Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> > > --- > > drivers/staging/Kconfig | 2 + > > drivers/staging/Makefile | 1 + > > drivers/staging/etnaviv/Kconfig | 20 + > > drivers/staging/etnaviv/Makefile | 18 + > > drivers/staging/etnaviv/cmdstream.xml.h | 218 ++++ > > drivers/staging/etnaviv/common.xml.h | 249 +++++ > > drivers/staging/etnaviv/etnaviv_buffer.c | 271 +++++ > > drivers/staging/etnaviv/etnaviv_cmd_parser.c | 119 +++ > > drivers/staging/etnaviv/etnaviv_drv.c | 705 +++++++++++++ > > drivers/staging/etnaviv/etnaviv_drv.h | 138 +++ > > drivers/staging/etnaviv/etnaviv_gem.c | 887 ++++++++++++++++ > > drivers/staging/etnaviv/etnaviv_gem.h | 141 +++ > > drivers/staging/etnaviv/etnaviv_gem_prime.c | 121 +++ > > drivers/staging/etnaviv/etnaviv_gem_submit.c | 421 ++++++++ > > drivers/staging/etnaviv/etnaviv_gpu.c | 1468 ++++++++++++++++++++++++++ > > drivers/staging/etnaviv/etnaviv_gpu.h | 198 ++++ > > drivers/staging/etnaviv/etnaviv_iommu.c | 221 ++++ > > drivers/staging/etnaviv/etnaviv_iommu.h | 28 + > > drivers/staging/etnaviv/etnaviv_iommu_v2.c | 33 + > > drivers/staging/etnaviv/etnaviv_iommu_v2.h | 25 + > > drivers/staging/etnaviv/etnaviv_mmu.c | 282 +++++ > > drivers/staging/etnaviv/etnaviv_mmu.h | 58 + > > drivers/staging/etnaviv/state.xml.h | 351 ++++++ > > drivers/staging/etnaviv/state_hi.xml.h | 407 +++++++ > > include/uapi/drm/etnaviv_drm.h | 215 ++++ > > 25 files changed, 6597 insertions(+) > > create mode 100644 drivers/staging/etnaviv/Kconfig > > create mode 100644 drivers/staging/etnaviv/Makefile > > create mode 100644 drivers/staging/etnaviv/cmdstream.xml.h > > create mode 100644 drivers/staging/etnaviv/common.xml.h > > create mode 100644 drivers/staging/etnaviv/etnaviv_buffer.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_cmd_parser.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_drv.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_drv.h > > create mode 100644 drivers/staging/etnaviv/etnaviv_gem.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_gem.h > > create mode 100644 drivers/staging/etnaviv/etnaviv_gem_prime.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_gem_submit.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_gpu.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_gpu.h > > create mode 100644 drivers/staging/etnaviv/etnaviv_iommu.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_iommu.h > > create mode 100644 drivers/staging/etnaviv/etnaviv_iommu_v2.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_iommu_v2.h > > create mode 100644 drivers/staging/etnaviv/etnaviv_mmu.c > > create mode 100644 drivers/staging/etnaviv/etnaviv_mmu.h > > create mode 100644 drivers/staging/etnaviv/state.xml.h > > create mode 100644 drivers/staging/etnaviv/state_hi.xml.h > > create mode 100644 include/uapi/drm/etnaviv_drm.h > > > > diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig > > index 7f6cae5beb90..5446fe4859ce 100644 > > --- a/drivers/staging/Kconfig > > +++ b/drivers/staging/Kconfig > > @@ -112,4 +112,6 @@ source "drivers/staging/fsl-mc/Kconfig" > > > > source "drivers/staging/wilc1000/Kconfig" > > > > +source "drivers/staging/etnaviv/Kconfig" > > + > > endif # STAGING > > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile > > index 347f6477aa3e..9fd3c06b6bfd 100644 > > --- a/drivers/staging/Makefile > > +++ b/drivers/staging/Makefile > > @@ -48,3 +48,4 @@ obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ > > obj-$(CONFIG_FB_TFT) += fbtft/ > > obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/ > > obj-$(CONFIG_WILC1000) += wilc1000/ > > +obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/ > > diff --git a/drivers/staging/etnaviv/Kconfig b/drivers/staging/etnaviv/Kconfig > > new file mode 100644 > > index 000000000000..6f034eda914c > > --- /dev/null > > +++ b/drivers/staging/etnaviv/Kconfig > > @@ -0,0 +1,20 @@ > > + > > +config DRM_ETNAVIV > > + tristate "etnaviv DRM" > > + depends on DRM > > + select SHMEM > > + select TMPFS > > + select IOMMU_API > > + select IOMMU_SUPPORT > > + default y > > + help > > + DRM driver for Vivante GPUs. > > + > > +config DRM_ETNAVIV_REGISTER_LOGGING > > + bool "etnaviv DRM register logging" > > + depends on DRM_ETNAVIV > > + default n > > + help > > + Compile in support for logging register reads/writes in a format > > + that can be parsed by envytools demsm tool. If enabled, register > > + logging can be switched on via etnaviv.reglog=y module param. > > heh, ok, didn't realize anyone else was using demsm.. I guess that is > one of the things that I should clean up and get into upstream > envytools tree. (And maybe come up with a better name.. if anyone has > any suggestions..) Do you think you can learn to trim your replies. You are being completely unreasonable here - leaving thousands of lines which are not relevant to your reply still attached. Not only is it a waste of bandwidth, but it bloats people's mailboxes needlessly. -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
