Skip to contentSkip to conversation

backports: add DRM drivers

PATCH Applied Luis R. Rodriguez 2 participants 7 messages Apr 5, 2013 Arm STM32

lore
Share & tools
lore
#0 lore raw

cover backports: add DRM drivers

From: "Luis R. Rodriguez" <[email protected]>

DRM was disabled on the new backports project. This adds a few missing components, removes some patches which are no longer required and enables it the DRM drivers.

This doesn't yet address blacklist but I'll add that next. Just want to get this out of my queue to try to speed integration.

Luis R. Rodriguez (5):
compat: backport dma-buf
compat: add HDMI library support
backports: remove dma-buf patches
backports: remove DRM nouveau kconfig patches
backports: add DRM drivers

 backport/Kconfig                                   |    2 +
 backport/compat/Kconfig                            |   23 +
 backport/compat/Makefile                           |    2 +
 backport/compat/dma-buf.c                          |  575 ++++++++++++++++++++
 backport/compat/hdmi.c                             |  308 +++++++++++
 backport/include/linux/dma-buf.h                   |  211 +++++++
 backport/include/linux/hdmi.h                      |  240 ++++++++
 copy-list                                          |   22 +
 .../drm/01-dma_buf_ops-addition/INFO               |   10 -
 .../drivers_gpu_drm_drm_prime.patch                |   14 -
 .../drivers_gpu_drm_i915_i915_gem_dmabuf.patch     |   17 -
 .../drm/04-revert-prime-support/INFO               |    8 -
 .../drivers_gpu_drm_drm_drv.patch                  |   13 -
 .../drivers_gpu_drm_drm_fops.patch                 |   24 -
 .../drivers_gpu_drm_drm_gem.patch                  |   28 -
 .../drivers_gpu_drm_drm_prime.patch                |   16 -
 .../drivers_gpu_drm_i915_i915_drv.patch            |   27 -
 .../drivers_gpu_drm_i915_i915_gem.patch            |   23 -
 .../drivers_gpu_drm_i915_i915_gem_dmabuf.patch     |   15 -
 .../drivers_gpu_drm_nouveau_nouveau_bo.patch       |   38 --
 .../drivers_gpu_drm_nouveau_nouveau_drm.patch      |   30 -
 .../drivers_gpu_drm_nouveau_nouveau_gem.patch      |   13 -
 .../drivers_gpu_drm_nouveau_nouveau_prime.patch    |   16 -
 .../drivers_gpu_drm_radeon_radeon_drv.patch        |   31 --
 .../drivers_gpu_drm_radeon_radeon_gem.patch        |   13 -
 .../drivers_gpu_drm_radeon_radeon_prime.patch      |   15 -
 .../drivers_gpu_drm_radeon_radeon_ttm.patch        |   37 --
 .../drm/09-nouveau-compatify-kconfig-vars/INFO     |    3 -
 .../drivers_gpu_drm_nouveau_core_core_option.patch |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_client.h |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_device.h |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_engctx.h |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_engine.h |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_gpuobj.h |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_namedb.h |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_object.h |   20 -
 ...vers_gpu_drm_nouveau_core_include_core_parent.h |   11 -
 ...vers_gpu_drm_nouveau_core_include_core_printk.h |   20 -
 ...vers_gpu_drm_nouveau_core_include_core_subdev.h |   11 -
 ...s_gpu_drm_nouveau_core_include_subdev_instmem.h |   11 -
 40 files changed, 1383 insertions(+), 541 deletions(-)
 create mode 100644 backport/compat/dma-buf.c
 create mode 100644 backport/compat/hdmi.c
 create mode 100644 backport/include/linux/dma-buf.h
 create mode 100644 backport/include/linux/hdmi.h
 delete mode 100644 patches/collateral-evolutions/drm/01-dma_buf_ops-addition/INFO
 delete mode 100644 patches/collateral-evolutions/drm/01-dma_buf_ops-addition/drivers_gpu_drm_drm_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/01-dma_buf_ops-addition/drivers_gpu_drm_i915_i915_gem_dmabuf.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/INFO
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_drv.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_fops.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_drv.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_gem_dmabuf.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_bo.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_drm.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_drv.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_ttm.patch
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/INFO
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_core_option.patch
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_client.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_device.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_engctx.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_engine.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_gpuobj.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_namedb.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_object.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_parent.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_printk.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_subdev.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_subdev_instmem.h
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/5 compat: backport dma-buf

From: "Luis R. Rodriguez" <[email protected]>

dma-buf was added via commit d15bd7ee on v3.3 but completed in a more sound fassion in later kernels, you should preferably be at v3.5 a least, so we take the latest dma-buf implementation and port it for usage on kernels [3.0-3.4]. We take the implementation as of next-20130328.

This is implemented as a non modular solution upstream but we can carry the implementation into our compat module.

Note that although commit f23513e8d was added on v2.6.23 that allowed the kernel to call get_unused_fd_flags(flags) for O_CLOEXEC setting, this routine was not exported until v3.7. dma-buf makes use of it, and since our backported dma-buf implementation is modular it means we have to work around the lack of get_unused_fd_flags() exported symbol on older kernels. Due to the security concerns noted by Ulrich on f23513e8 we need to ensure the operatin is atomic so we fix this on our port of dma-buf for older kernels by adding our own dma_buf_fd_set_flag() to be called when dma_buf_fd() is used. This implementation is available for usage on kernels >= 3.0. We disable it for v3.5 as we're happy with that implementation.

mcgrof@frijol ~/linux-next (git::master)$ git describe --contains \
	d15bd7ee445d0702ad801fdaece348fdb79e6581

v3.3-rc1~161^2~2

mcgrof@frijol ~/linux-next (git::master)$ git describe --contains \
	f23513e8d96cf5e6cf8d2ff0cb5dd6bbc33995e4

v2.6.23-rc1~894

mcgrof@frijol ~/linux-stable (git::linux-3.2.y)$ git describe --contains \
	1a7bd226

v3.7-rc1~134^2~69

Carried over the implementation from linux-next next-20130328

commit d15bd7ee445d0702ad801fdaece348fdb79e6581

Author: Sumit Semwal <[email protected]>
Date:   Mon Dec 26 14:53:15 2011 +0530

dma-buf: Introduce dma buffer sharing mechanism

This is the first step in defining a dma buffer sharing mechanism.

A new buffer object dma_buf is added, with operations and API to allow easy sharing of this buffer object across devices.

The framework allows:
- creation of a buffer object, its association with a file pointer, and associated allocator-defined operations on that buffer. This operation is called the 'export' operation.
- different devices to 'attach' themselves to this exported buffer object, to facilitate backing storage negotiation, using dma_buf_attach() API.
- the exported buffer object to be shared with the other entity by asking for its 'file-descriptor (fd)', and sharing the fd across.
- a received fd to get the buffer object back, where it can be accessed using the associated exporter-defined operations.
- the exporter and user to share the scatterlist associated with this buffer object using map_dma_buf and unmap_dma_buf operations.

Atleast one 'attach()' call is required to be made prior to calling the map_dma_buf() operation.

Couple of building blocks in map_dma_buf() are added to ease introduction of sync'ing across exporter and users, and late allocation by the exporter.

For this first version, this framework will work with certain conditions:
- *ONLY* exporter will be allowed to mmap to userspace (outside of this framework - mmap is not a buffer object operation),
- currently, *ONLY* users that do not need CPU access to the buffer are allowed.

More details are there in the documentation patch.

This is based on design suggestions from many people at the mini-summits[1], most notably from Arnd Bergmann <[email protected]>, Rob Clark <[email protected]> and Daniel Vetter <[email protected]>.

The implementation is inspired from proof-of-concept patch-set from Tomasz Stanislawski <[email protected]>, who demonstrated buffer sharing between two v4l2 devices. [2]

[1]: https://wiki.linaro.org/OfficeofCTO/MemoryManagement
[2]: http://lwn.net/Articles/454389

---
 backport/compat/Kconfig          |    9 +
 backport/compat/Makefile         |    1 +
 backport/compat/dma-buf.c        |  575 ++++++++++++++++++++++++++++++++++++++
 backport/include/linux/dma-buf.h |  211 ++++++++++++++
 4 files changed, 796 insertions(+)
 create mode 100644 backport/compat/dma-buf.c
 create mode 100644 backport/include/linux/dma-buf.h
backport/compat/Kconfig +9 -0
index 0edd2fb..14f401c 100644
@@ -127,7 +127,16 @@ config BACKPORT_OPTION_USB_URB_THREAD_FIX
 config BACKPORT_MII
 	bool
 
+config BACKPORT_BUILD_DMA_SHARED_BUFFER
+	bool
+	depends on ANON_INODES
+	depends on !BACKPORT_KERNEL_3_0
+	depends on !DMA_SHARED_BUFFER || BACKPORT_KERNEL_3_5
+	default y if BACKPORT_DMA_SHARED_BUFFER
+	default y if BACKPORT_USERSEL_BUILD_ALL
 
+config BACKPORT_DMA_SHARED_BUFFER
+	bool
 
 config BACKPORT_USERSEL_BUILD_ALL
 	bool "Build all compat code"
backport/compat/Makefile +1 -0
index 62dd531..e738e2f 100644
@@ -4,6 +4,7 @@ ccflags-y += -DBACKPORTED_KERNEL_VERSION=\"$(BACKPORTED_KERNEL_VERSION)\"
 ccflags-y += -DBACKPORTED_KERNEL_NAME=\"$(BACKPORTED_KERNEL_NAME)\"
 obj-m += compat.o
 compat-y += main.o
+compat-$(CPTCFG_BACKPORT_BUILD_DMA_SHARED_BUFFER) += dma-buf.o
 
 obj-$(CPTCFG_BACKPORT_BUILD_FW_LOADER) += compat_firmware_class.o
 
backport/compat/dma-buf.c new file +575 -0

575 lines not on this page · raw message

backport/include/linux/dma-buf.h new file +211 -0

211 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/5 compat: add HDMI library support

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

HDMI was being carried over through compat but that was a mistake as all its doing is providing helper routines. It was also defining it as a module which was tainting the kernel! This fixes that.

mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains \
	f142d3bd556c5e82e9bb3d33d07d6708702ea4ce

v3.9-rc1~83^2~1^2~4

commit f142d3bd556c5e82e9bb3d33d07d6708702ea4ce

Author: Thierry Reding <[email protected]>
Date:   Wed Nov 21 15:29:29 2012 +0100

video: Add generic HDMI infoframe helpers

Add generic helpers to pack HDMI infoframes into binary buffers.

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.65              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.38              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.32              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.11              [  OK  ]
24  3.7.9               [  OK  ]
25  3.8.0               [  OK  ]
26  3.9-rc1             [  OK  ]
---
 backport/compat/Kconfig       |   14 ++
 backport/compat/Makefile      |    1 +
 backport/compat/hdmi.c        |  308 +++++++++++++++++++++++++++++++++++++++++
 backport/include/linux/hdmi.h |  240 ++++++++++++++++++++++++++++++++
 4 files changed, 563 insertions(+)
 create mode 100644 backport/compat/hdmi.c
 create mode 100644 backport/include/linux/hdmi.h
backport/compat/Kconfig +14 -0
index 14f401c..03320f7 100644
@@ -138,6 +138,20 @@ config BACKPORT_BUILD_DMA_SHARED_BUFFER
 config BACKPORT_DMA_SHARED_BUFFER
 	bool
 
+config BACKPORT_BUILD_HDMI
+	bool
+	# not possible on kernel < 3.0
+	depends on !BACKPORT_KERNEL_3_0
+	# don't build if base kernel has it, except on kernel < 3.9
+	depends on !HDMI || BACKPORT_KERNEL_3_9
+	# build for testing
+	default y if BACKPORT_USERSEL_BUILD_ALL
+	# build if a driver needs it
+	default y if BACKPORT_HDMI
+
+config BACKPORT_HDMI
+	bool
+
 config BACKPORT_USERSEL_BUILD_ALL
 	bool "Build all compat code"
 	help
backport/compat/Makefile +1 -0
index e738e2f..a4c789b 100644
@@ -5,6 +5,7 @@ ccflags-y += -DBACKPORTED_KERNEL_NAME=\"$(BACKPORTED_KERNEL_NAME)\"
 obj-m += compat.o
 compat-y += main.o
 compat-$(CPTCFG_BACKPORT_BUILD_DMA_SHARED_BUFFER) += dma-buf.o
+compat-$(CPTCFG_BACKPORT_BUILD_HDMI) += hdmi.o
 
 obj-$(CPTCFG_BACKPORT_BUILD_FW_LOADER) += compat_firmware_class.o
 
backport/compat/hdmi.c new file +308 -0

308 lines not on this page · raw message

backport/include/linux/hdmi.h new file +240 -0

240 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/5 backports: remove dma-buf patches

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

These are no longer needed given that dma-buf is
now backported.

---
 .../drm/01-dma_buf_ops-addition/INFO               |   10 ------
 .../drivers_gpu_drm_drm_prime.patch                |   14 --------
 .../drivers_gpu_drm_i915_i915_gem_dmabuf.patch     |   17 ---------
 .../drm/04-revert-prime-support/INFO               |    8 -----
 .../drivers_gpu_drm_drm_drv.patch                  |   13 -------
 .../drivers_gpu_drm_drm_fops.patch                 |   24 -------------
 .../drivers_gpu_drm_drm_gem.patch                  |   28 ---------------
 .../drivers_gpu_drm_drm_prime.patch                |   16 ---------
 .../drivers_gpu_drm_i915_i915_drv.patch            |   27 --------------
 .../drivers_gpu_drm_i915_i915_gem.patch            |   23 ------------
 .../drivers_gpu_drm_i915_i915_gem_dmabuf.patch     |   15 --------
 .../drivers_gpu_drm_nouveau_nouveau_bo.patch       |   38 --------------------
 .../drivers_gpu_drm_nouveau_nouveau_drm.patch      |   30 ----------------
 .../drivers_gpu_drm_nouveau_nouveau_gem.patch      |   13 -------
 .../drivers_gpu_drm_nouveau_nouveau_prime.patch    |   16 ---------
 .../drivers_gpu_drm_radeon_radeon_drv.patch        |   31 ----------------
 .../drivers_gpu_drm_radeon_radeon_gem.patch        |   13 -------
 .../drivers_gpu_drm_radeon_radeon_prime.patch      |   15 --------
 .../drivers_gpu_drm_radeon_radeon_ttm.patch        |   37 -------------------
 19 files changed, 388 deletions(-)
 delete mode 100644 patches/collateral-evolutions/drm/01-dma_buf_ops-addition/INFO
 delete mode 100644 patches/collateral-evolutions/drm/01-dma_buf_ops-addition/drivers_gpu_drm_drm_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/01-dma_buf_ops-addition/drivers_gpu_drm_i915_i915_gem_dmabuf.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/INFO
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_drv.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_fops.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_drv.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_gem_dmabuf.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_bo.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_drm.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_drv.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_gem.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_prime.patch
 delete mode 100644 patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_ttm.patch
patches/collateral-evolutions/drm/01-dma_buf_ops-addition/INFO deleted +0 -10
deleted file mode 100644
index d46c6b1..0000000
@@ -1,10 +0,0 @@
-Assign vmap, vunmap and mmap fields in dma_buf_ops structs only
-if kernel version >= 3.5.0 as they are added in 3.5. The begin_cpu_access
-was added as of the original dma-buf code via 3.4.
-
-mcgrof@frijol ~/linux-next (git::master)$ git describe --contains fc13020e086bfedf2afb95c91c026d5af1f80107
-v3.4-rc1~57^2~3
-
-Note that the dma-buf itself was added with 3.4. It is not available
-on kernels < 3.4. 
-
patches/collateral-evolutions/drm/01-dma_buf_ops-addition/drivers_gpu_drm_drm_prime.patch deleted +0 -14
deleted file mode 100644
index cb332ca..0000000
@@ -1,14 +0,0 @@
---- a/drivers/gpu/drm/drm_prime.c
-+++ b/drivers/gpu/drm/drm_prime.c
-@@ -152,9 +152,11 @@
- 	.kmap_atomic = drm_gem_dmabuf_kmap_atomic,
- 	.kunmap = drm_gem_dmabuf_kunmap,
- 	.kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
- 	.mmap = drm_gem_dmabuf_mmap,
- 	.vmap = drm_gem_dmabuf_vmap,
- 	.vunmap = drm_gem_dmabuf_vunmap,
-+#endif
- };
- 
- /**
patches/collateral-evolutions/drm/01-dma_buf_ops-addition/drivers_gpu_drm_i915_i915_gem_dmabuf.patch deleted +0 -17
deleted file mode 100644
index 48a2537..0000000
@@ -1,17 +0,0 @@
---- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
-+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
-@@ -216,10 +216,14 @@
- 	.kmap_atomic = i915_gem_dmabuf_kmap_atomic,
- 	.kunmap = i915_gem_dmabuf_kunmap,
- 	.kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
- 	.mmap = i915_gem_dmabuf_mmap,
- 	.vmap = i915_gem_dmabuf_vmap,
- 	.vunmap = i915_gem_dmabuf_vunmap,
-+#endif
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	.begin_cpu_access = i915_gem_begin_cpu_access,
-+#endif
- };
- 
- struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
patches/collateral-evolutions/drm/04-revert-prime-support/INFO deleted +0 -8
deleted file mode 100644
index 94cafb7..0000000
@@ -1,8 +0,0 @@
-Disable PRIME support in core drm, radeon, nouveau and i915 for
-kernels < 3.4.0.
-
-PRIME depends on dma-buf which is added to the kernel with 3.3 but
-the one in 3.3 is mostly stub, e.g. it is a skeleton API which
-is highly modified in 3.4. So disable PRIME for kernels < 3.4.0,
-not < 3.3.0.
-
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_drv.patch deleted +0 -13
deleted file mode 100644
index 36b1730..0000000
@@ -1,13 +0,0 @@
---- a/drivers/gpu/drm/drm_drv.c
-+++ b/drivers/gpu/drm/drm_drv.c
-@@ -137,8 +137,10 @@
- 
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD, drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED),
- 	DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED),
-+#endif
- 
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_fops.patch deleted +0 -24
deleted file mode 100644
index b847d9e..0000000
@@ -1,24 +0,0 @@
---- a/drivers/gpu/drm/drm_fops.c
-+++ b/drivers/gpu/drm/drm_fops.c
-@@ -284,8 +284,10 @@
- 	if (dev->driver->driver_features & DRIVER_GEM)
- 		drm_gem_open(dev, priv);
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	if (drm_core_check_feature(dev, DRIVER_PRIME))
- 		drm_prime_init_file_private(&priv->prime);
-+#endif
- 
- 	if (dev->driver->open) {
- 		ret = dev->driver->open(dev, priv);
-@@ -538,8 +540,10 @@
- 	if (dev->driver->postclose)
- 		dev->driver->postclose(dev, file_priv);
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	if (drm_core_check_feature(dev, DRIVER_PRIME))
- 		drm_prime_destroy_file_private(&file_priv->prime);
-+#endif
- 
- 	put_pid(file_priv->pid);
- 	kfree(file_priv);
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_gem.patch deleted +0 -28
deleted file mode 100644
index 322739c..0000000
@@ -1,28 +0,0 @@
---- a/drivers/gpu/drm/drm_gem.c
-+++ b/drivers/gpu/drm/drm_gem.c
-@@ -35,7 +35,9 @@
- #include <linux/mman.h>
- #include <linux/pagemap.h>
- #include <linux/shmem_fs.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- #include <linux/dma-buf.h>
-+#endif
- #include <drm/drmP.h>
- 
- /** @file drm_gem.c
-@@ -204,6 +206,7 @@
- static void
- drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)
- {
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	if (obj->import_attach) {
- 		drm_prime_remove_imported_buf_handle(&filp->prime,
- 				obj->import_attach->dmabuf);
-@@ -212,6 +215,7 @@
- 		drm_prime_remove_imported_buf_handle(&filp->prime,
- 				obj->export_dma_buf);
- 	}
-+#endif
- }
- 
- /**
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_drm_prime.patch deleted +0 -16
deleted file mode 100644
index f440d6d..0000000
@@ -1,16 +0,0 @@
---- a/drivers/gpu/drm/drm_prime.c
-+++ b/drivers/gpu/drm/drm_prime.c
-@@ -26,6 +26,8 @@
-  *
-  */
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-+
- #include <linux/export.h>
- #include <linux/dma-buf.h>
- #include <drm/drmP.h>
-@@ -532,3 +534,4 @@
- 	mutex_unlock(&prime_fpriv->lock);
- }
- EXPORT_SYMBOL(drm_prime_remove_imported_buf_handle);
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_drv.patch deleted +0 -27
deleted file mode 100644
index 6b9ae9d..0000000
@@ -1,27 +0,0 @@
---- a/drivers/gpu/drm/i915/i915_drv.c
-+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -1058,7 +1058,11 @@
- 	 */
- 	.driver_features =
- 	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME,
-+#else
-+	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM,
-+#endif
- 	.load = i915_driver_load,
- 	.unload = i915_driver_unload,
- 	.open = i915_driver_open,
-@@ -1081,10 +1085,12 @@
- 	.gem_free_object = i915_gem_free_object,
- 	.gem_vm_ops = &i915_gem_vm_ops,
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
- 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
- 	.gem_prime_export = i915_gem_prime_export,
- 	.gem_prime_import = i915_gem_prime_import,
-+#endif
- 
- 	.dumb_create = i915_gem_dumb_create,
- 	.dumb_map_offset = i915_gem_mmap_gtt,
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_gem.patch deleted +0 -23
deleted file mode 100644
index 4182342..0000000
@@ -1,23 +0,0 @@
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -34,7 +34,9 @@
- #include <linux/slab.h>
- #include <linux/swap.h>
- #include <linux/pci.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- #include <linux/dma-buf.h>
-+#endif
- 
- static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj);
- static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj);
-@@ -3825,8 +3827,10 @@
- 
- 	BUG_ON(obj->pages);
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	if (obj->base.import_attach)
- 		drm_prime_gem_destroy(&obj->base, NULL);
-+#endif
- 
- 	drm_gem_object_release(&obj->base);
- 	i915_gem_info_remove_obj(dev_priv, obj->base.size);
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_i915_i915_gem_dmabuf.patch deleted +0 -15
deleted file mode 100644
index 8cc6e02..0000000
@@ -1,15 +0,0 @@
---- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
-+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
-@@ -23,6 +23,7 @@
-  * Authors:
-  *	Dave Airlie <[email protected]>
-  */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- #include <drm/drmP.h>
- #include "i915_drv.h"
- #include <linux/dma-buf.h>
-@@ -307,3 +308,4 @@
- 	dma_buf_detach(dma_buf, attach);
- 	return ERR_PTR(ret);
- }
-+#endif
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_bo.patch deleted +0 -38
deleted file mode 100644
index d4c4fee..0000000
@@ -1,38 +0,0 @@
---- a/drivers/gpu/drm/nouveau/nouveau_bo.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -1352,11 +1352,14 @@
- 	struct drm_device *dev;
- 	unsigned i;
- 	int r;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
-+#endif
- 
- 	if (ttm->state != tt_unpopulated)
- 		return 0;
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	if (slave && ttm->sg) {
- 		/* make userspace faulting work */
- 		drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
-@@ -1364,6 +1367,7 @@
- 		ttm->state = tt_unbound;
- 		return 0;
- 	}
-+#endif
- 
- 	drm = nouveau_bdev(ttm->bdev);
- 	dev = drm->dev;
-@@ -1411,10 +1415,12 @@
- 	struct nouveau_drm *drm;
- 	struct drm_device *dev;
- 	unsigned i;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
- 
- 	if (slave)
- 		return;
-+#endif
- 
- 	drm = nouveau_bdev(ttm->bdev);
- 	dev = drm->dev;
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_drm.patch deleted +0 -30
deleted file mode 100644
index c2dcb6c..0000000
@@ -1,30 +0,0 @@
---- a/drivers/gpu/drm/nouveau/nouveau_drm.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -662,7 +662,10 @@
- 	.driver_features =
- 		DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
- 		DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
--		DRIVER_MODESET | DRIVER_PRIME,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-+		DRIVER_PRIME |
-+#endif
-+		DRIVER_MODESET,
- 
- 	.load = nouveau_drm_load,
- 	.unload = nouveau_drm_unload,
-@@ -688,6 +691,7 @@
- 	.ioctls = nouveau_ioctls,
- 	.fops = &nouveau_driver_fops,
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
- 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
- 	.gem_prime_export = drm_gem_prime_export,
-@@ -697,6 +701,7 @@
- 	.gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table,
- 	.gem_prime_vmap = nouveau_gem_prime_vmap,
- 	.gem_prime_vunmap = nouveau_gem_prime_vunmap,
-+#endif
- 
- 	.gem_init_object = nouveau_gem_object_new,
- 	.gem_free_object = nouveau_gem_object_del,
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_gem.patch deleted +0 -13
deleted file mode 100644
index 7795a12..0000000
@@ -1,13 +0,0 @@
---- a/drivers/gpu/drm/nouveau/nouveau_gem.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -55,8 +55,10 @@
- 		nouveau_bo_unpin(nvbo);
- 	}
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	if (gem->import_attach)
- 		drm_prime_gem_destroy(gem, nvbo->bo.sg);
-+#endif
- 
- 	ttm_bo_unref(&bo);
- 
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_nouveau_nouveau_prime.patch deleted +0 -16
deleted file mode 100644
index e4765b3..0000000
@@ -1,16 +0,0 @@
---- a/drivers/gpu/drm/nouveau/nouveau_prime.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
-@@ -22,6 +22,8 @@
-  * Authors: Dave Airlie
-  */
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-+
- #include <drm/drmP.h>
- 
- #include "nouveau_drm.h"
-@@ -93,3 +95,4 @@
- 
- 	return 0;
- }
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_drv.patch deleted +0 -31
deleted file mode 100644
index 0ad62d6..0000000
@@ -1,31 +0,0 @@
---- a/drivers/gpu/drm/radeon/radeon_drv.c
-+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -374,8 +374,10 @@
- static struct drm_driver kms_driver = {
- 	.driver_features =
- 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
--	    DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_GEM |
--	    DRIVER_PRIME,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-+	    DRIVER_PRIME |
-+#endif
-+	    DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_GEM,
- 	.dev_priv_size = 0,
- 	.load = radeon_driver_load_kms,
- 	.firstopen = radeon_driver_firstopen_kms,
-@@ -410,6 +412,7 @@
- 	.dumb_destroy = radeon_mode_dumb_destroy,
- 	.fops = &radeon_driver_kms_fops,
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
- 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
- 	.gem_prime_export = drm_gem_prime_export,
-@@ -419,6 +422,7 @@
- 	.gem_prime_import_sg_table = radeon_gem_prime_import_sg_table,
- 	.gem_prime_vmap = radeon_gem_prime_vmap,
- 	.gem_prime_vunmap = radeon_gem_prime_vunmap,
-+#endif
- 
- 	.name = DRIVER_NAME,
- 	.desc = DRIVER_DESC,
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_gem.patch deleted +0 -13
deleted file mode 100644
index 457d8d2..0000000
@@ -1,13 +0,0 @@
---- a/drivers/gpu/drm/radeon/radeon_gem.c
-+++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -41,8 +41,10 @@
- 	struct radeon_bo *robj = gem_to_radeon_bo(gobj);
- 
- 	if (robj) {
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 		if (robj->gem_base.import_attach)
- 			drm_prime_gem_destroy(&robj->gem_base, robj->tbo.sg);
-+#endif
- 		radeon_bo_unref(&robj);
- 	}
- }
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_prime.patch deleted +0 -15
deleted file mode 100644
index 291eea6..0000000
@@ -1,15 +0,0 @@
---- a/drivers/gpu/drm/radeon/radeon_prime.c
-+++ b/drivers/gpu/drm/radeon/radeon_prime.c
-@@ -23,6 +23,7 @@
-  *
-  * Authors: Alex Deucher
-  */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- #include <drm/drmP.h>
- 
- #include "radeon.h"
-@@ -96,3 +97,4 @@
- 
- 	return 0;
- }
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
patches/collateral-evolutions/drm/04-revert-prime-support/drivers_gpu_drm_radeon_radeon_ttm.patch deleted +0 -37
deleted file mode 100644
index 4bbabe3..0000000
@@ -1,37 +0,0 @@
---- a/drivers/gpu/drm/radeon/radeon_ttm.c
-+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -584,17 +584,21 @@
- 	struct radeon_ttm_tt *gtt = (void *)ttm;
- 	unsigned i;
- 	int r;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
-+#endif
- 
- 	if (ttm->state != tt_unpopulated)
- 		return 0;
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	if (slave && ttm->sg) {
- 		drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
- 						 gtt->ttm.dma_address, ttm->num_pages);
- 		ttm->state = tt_unbound;
- 		return 0;
- 	}
-+#endif
- 
- 	rdev = radeon_get_rdev(ttm->bdev);
- #if __OS_HAS_AGP
-@@ -638,10 +642,12 @@
- 	struct radeon_device *rdev;
- 	struct radeon_ttm_tt *gtt = (void *)ttm;
- 	unsigned i;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
- 	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
- 
- 	if (slave)
- 		return;
-+#endif
- 
- 	rdev = radeon_get_rdev(ttm->bdev);
- #if __OS_HAS_AGP
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 4/5 backports: remove DRM nouveau kconfig patches

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

These are no longer needed.

---
 .../drm/09-nouveau-compatify-kconfig-vars/INFO     |    3 ---
 .../drivers_gpu_drm_nouveau_core_core_option.patch |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_client.h |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_device.h |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_engctx.h |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_engine.h |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_gpuobj.h |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_namedb.h |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_object.h |   20 --------------------
 ...vers_gpu_drm_nouveau_core_include_core_parent.h |   11 -----------
 ...vers_gpu_drm_nouveau_core_include_core_printk.h |   20 --------------------
 ...vers_gpu_drm_nouveau_core_include_core_subdev.h |   11 -----------
 ...s_gpu_drm_nouveau_core_include_subdev_instmem.h |   11 -----------
 13 files changed, 153 deletions(-)
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/INFO
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_core_option.patch
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_client.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_device.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_engctx.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_engine.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_gpuobj.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_namedb.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_object.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_parent.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_printk.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_subdev.h
 delete mode 100644 patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_subdev_instmem.h
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/INFO deleted +0 -3
deleted file mode 100644
index d533c9c..0000000
@@ -1,3 +0,0 @@
-Rename CONFIG_NOUVEAU_DEBUG and CONFIG_NOUVEAU_DEBUG_DEFAULT to
-CONFIG_COMPAT_*.
-
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_core_option.patch deleted +0 -11
deleted file mode 100644
index f47d37e..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/core/option.c
-+++ b/drivers/gpu/drm/nouveau/core/core/option.c
-@@ -86,7 +86,7 @@
- int
- nouveau_dbgopt(const char *optstr, const char *sub)
- {
--	int mode = 1, level = CONFIG_NOUVEAU_DEBUG_DEFAULT;
-+	int mode = 1, level = CONFIG_COMPAT_NOUVEAU_DEBUG_DEFAULT;
- 
- 	while (optstr) {
- 		int len = strcspn(optstr, ",=");
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_client.h deleted +0 -11
deleted file mode 100644
index 243fc8a..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/client.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/client.h
-@@ -15,7 +15,7 @@
- static inline struct nouveau_client *
- nv_client(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(obj, NV_CLIENT_CLASS)))
- 		nv_assert("BAD CAST -> NvClient, %08x", nv_hclass(obj));
- #endif
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_device.h deleted +0 -11
deleted file mode 100644
index 111f8bd..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/device.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/device.h
-@@ -97,7 +97,7 @@
- 	if (device->parent)
- 		device = device->parent;
- 
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(device, NV_SUBDEV_CLASS) ||
- 		     (nv_hclass(device) & 0xff) != NVDEV_SUBDEV_DEVICE)) {
- 		nv_assert("BAD CAST -> NvDevice, 0x%08x 0x%08x",
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_engctx.h deleted +0 -11
deleted file mode 100644
index ff60557..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/engctx.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/engctx.h
-@@ -20,7 +20,7 @@
- static inline struct nouveau_engctx *
- nv_engctx(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(obj, NV_ENGCTX_CLASS)))
- 		nv_assert("BAD CAST -> NvEngCtx, %08x", nv_hclass(obj));
- #endif
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_engine.h deleted +0 -11
deleted file mode 100644
index 86f1247..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/engine.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/engine.h
-@@ -22,7 +22,7 @@
- static inline struct nouveau_engine *
- nv_engine(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(obj, NV_ENGINE_CLASS)))
- 		nv_assert("BAD CAST -> NvEngine, %08x", nv_hclass(obj));
- #endif
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_gpuobj.h deleted +0 -11
deleted file mode 100644
index e664d52..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
-@@ -27,7 +27,7 @@
- static inline struct nouveau_gpuobj *
- nv_gpuobj(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(obj, NV_GPUOBJ_CLASS)))
- 		nv_assert("BAD CAST -> NvGpuObj, %08x", nv_hclass(obj));
- #endif
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_namedb.h deleted +0 -11
deleted file mode 100644
index 91faab0..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/namedb.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/namedb.h
-@@ -14,7 +14,7 @@
- static inline struct nouveau_namedb *
- nv_namedb(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(obj, NV_NAMEDB_CLASS)))
- 		nv_assert("BAD CAST -> NvNameDB, %08x", nv_hclass(obj));
- #endif
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_object.h deleted +0 -20
deleted file mode 100644
index ede1dda..0000000
@@ -1,20 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/object.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/object.h
-@@ -20,7 +20,7 @@
- 	struct nouveau_object *engine;
- 	atomic_t refcount;
- 	atomic_t usecount;
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- #define NOUVEAU_OBJECT_MAGIC 0x75ef0bad
- 	struct list_head list;
- 	u32 _magic;
-@@ -30,7 +30,7 @@
- static inline struct nouveau_object *
- nv_object(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (likely(obj)) {
- 		struct nouveau_object *object = obj;
- 		if (unlikely(object->_magic != NOUVEAU_OBJECT_MAGIC))
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_parent.h deleted +0 -11
deleted file mode 100644
index 087aead..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/parent.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/parent.h
-@@ -29,7 +29,7 @@
- static inline struct nouveau_parent *
- nv_parent(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!(nv_iclass(obj, NV_PARENT_CLASS))))
- 		nv_assert("BAD CAST -> NvParent, %08x", nv_hclass(obj));
- #endif
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_printk.h deleted +0 -20
deleted file mode 100644
index 037b31c..0000000
@@ -1,20 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/printk.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/printk.h
-@@ -19,7 +19,7 @@
- nv_printk_(struct nouveau_object *, const char *, int, const char *, ...);
- 
- #define nv_printk(o,l,f,a...) do {                                             \
--	if (NV_DBG_##l <= CONFIG_NOUVEAU_DEBUG)                                \
-+	if (NV_DBG_##l <= CONFIG_COMPAT_NOUVEAU_DEBUG)                                \
- 		nv_printk_(nv_object(o), NV_PRINTK_##l, NV_DBG_##l, f, ##a);   \
- } while(0)
- 
-@@ -32,7 +32,7 @@
- #define nv_spam(o,f,a...) nv_printk((o), SPAM, f, ##a)
- 
- #define nv_assert(f,a...) do {                                                 \
--	if (NV_DBG_FATAL <= CONFIG_NOUVEAU_DEBUG)                              \
-+	if (NV_DBG_FATAL <= CONFIG_COMPAT_NOUVEAU_DEBUG)                              \
- 		nv_printk_(NULL, NV_PRINTK_FATAL, NV_DBG_FATAL, f "\n", ##a);  \
- 	BUG_ON(1);                                                             \
- } while(0)
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_core_subdev.h deleted +0 -11
deleted file mode 100644
index c773d02..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/core/subdev.h
-+++ b/drivers/gpu/drm/nouveau/core/include/core/subdev.h
-@@ -20,7 +20,7 @@
- static inline struct nouveau_subdev *
- nv_subdev(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(obj, NV_SUBDEV_CLASS)))
- 		nv_assert("BAD CAST -> NvSubDev, %08x", nv_hclass(obj));
- #endif
patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars/drivers_gpu_drm_nouveau_core_include_subdev_instmem.h deleted +0 -11
deleted file mode 100644
index 30b6820..0000000
@@ -1,11 +0,0 @@
---- a/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
-+++ b/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
-@@ -16,7 +16,7 @@
- static inline struct nouveau_instobj *
- nv_memobj(void *obj)
- {
--#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-+#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
- 	if (unlikely(!nv_iclass(obj, NV_MEMOBJ_CLASS)))
- 		nv_assert("BAD CAST -> NvMemObj, %08x", nv_hclass(obj));
- #endif
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH 5/5 backports: add DRM drivers

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

They are building just fine so enable them.

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.65              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.38              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.32              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.11              [  OK  ]
24  3.7.9               [  OK  ]
25  3.8.0               [  OK  ]
26  3.9-rc1             [  OK  ]
---
 backport/Kconfig |    2 ++
 copy-list        |   22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
backport/Kconfig +2 -0
index d0ae17f..8a38d61 100644
@@ -34,3 +34,5 @@ source drivers/net/ethernet/Kconfig
 
 source drivers/ssb/Kconfig
 source drivers/bcma/Kconfig
+
+source drivers/gpu/drm/Kconfig
copy-list +22 -0
index 4243619..4c606a5 100644
@@ -114,3 +114,25 @@ drivers/net/ethernet/broadcom/Kconfig
 drivers/net/ethernet/broadcom/Makefile
 drivers/net/ethernet/broadcom/b44.c
 drivers/net/ethernet/broadcom/b44.h
+
+# DRM
+include/drm/
+include/uapi/drm/
+drivers/platform/x86/intel_ips.h
+
+drivers/gpu/drm/Makefile
+drivers/gpu/drm/Kconfig
+drivers/gpu/drm/ast/
+drivers/gpu/drm/cirrus/
+drivers/gpu/drm/gma500/
+drivers/gpu/drm/i2c/
+drivers/gpu/drm/i810/
+drivers/gpu/drm/i915/
+drivers/gpu/drm/mgag200/
+drivers/gpu/drm/nouveau/core/
+drivers/gpu/drm/nouveau/
+drivers/gpu/drm/radeon/reg_srcs/
+drivers/gpu/drm/radeon/
+drivers/gpu/drm/ttm/
+drivers/gpu/drm/via/
+drivers/gpu/drm/vmwgfx/
Signature · 1 line
1.7.10.4
#6 lore raw
In reply to Luis R. Rodriguez
Quoted 2 lines · Luis R. Rodriguez

compat: backport dma-buf
compat: add HDMI library support

I replaced these two with the new automatic system I created, so all they need to do is add the Kconfig parts (and a patch for dma-buf). It works pretty well -- what I haven't done yet though is make it depend on the drivers you actually have so that hdmi/dma-buf wouldn't be included if you modify the copy-list to only have wireless drivers -- not a big deal right now.

Quoted 2 lines

backports: remove dma-buf patches
backports: remove DRM nouveau kconfig patches

Applied.

Quoted 1 line

backports: add DRM drivers

I changed the copy-list patch here to remove two redundant subdirectories under nouveau/ and radeon that you had listed:

+drivers/gpu/drm/nouveau/core/
+drivers/gpu/drm/nouveau/
+drivers/gpu/drm/radeon/reg_srcs/
+drivers/gpu/drm/radeon/

Since copying is recursive, just the core/ and reg_srcs/ lines are redundant.

Otherwise it's building a ckmake --allyesconfig right now, and if it doesn't break I'll push it out.

Thanks!

johannes