diff options
author | Dave Airlie <airlied@redhat.com> | 2019-01-17 18:20:10 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-01-17 18:31:28 -0500 |
commit | f164a94c2c87752caeb1a3cbe068c440e7f7921f (patch) | |
tree | e914296ef0ce1df83e506a12bf4306d5aa468b24 /drivers/gpu/drm/tinydrm | |
parent | b122153c7198e35fcb981ca9efd63b0df8ef3eab (diff) | |
parent | 94520db52fc0e931327bb77fe79a952a0e9dd2b0 (diff) |
Merge tag 'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.1:
UAPI Changes:
- New fourcc identifier for ARM Framebuffer Compression v1.3
Cross-subsystem Changes:
Core Changes:
- Reorganisation of drm_device and drm_framebuffer headers
- Cleanup of the drmP inclusion
- Fix leaks in the fb-helpers
- Allow for depth different from bpp in fb-helper fbdev emulation
- Remove drm_mode_object from drm_display_mode
Driver Changes:
- Add reflection properties to rockchip
- a bunch of fixes for virtio
- a bunch of fixes for dp_mst and drivers using it, and introduction of a
new refcounting scheme
- Convertion of bochs to atomic and generic fbdev emulation
- Allow meson to remove the firmware framebuffers
[airlied: patch rcar-du to add drm_modes.h]
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190116200428.u2n4jbk4mzza7n6e@flea
Diffstat (limited to 'drivers/gpu/drm/tinydrm')
-rw-r--r-- | drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/hx8357d.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/ili9225.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/ili9341.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/mi0283qt.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/mipi-dbi.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/repaper.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/st7586.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/tinydrm/st7735r.c | 1 |
10 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c index 01a6f2d42440..aeb93eadb047 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c | |||
@@ -10,11 +10,14 @@ | |||
10 | #include <drm/drm_atomic.h> | 10 | #include <drm/drm_atomic.h> |
11 | #include <drm/drm_atomic_helper.h> | 11 | #include <drm/drm_atomic_helper.h> |
12 | #include <drm/drm_crtc_helper.h> | 12 | #include <drm/drm_crtc_helper.h> |
13 | #include <drm/drm_drv.h> | ||
13 | #include <drm/drm_fb_helper.h> | 14 | #include <drm/drm_fb_helper.h> |
14 | #include <drm/drm_gem_framebuffer_helper.h> | 15 | #include <drm/drm_gem_framebuffer_helper.h> |
16 | #include <drm/drm_print.h> | ||
15 | #include <drm/tinydrm/tinydrm.h> | 17 | #include <drm/tinydrm/tinydrm.h> |
16 | #include <linux/device.h> | 18 | #include <linux/device.h> |
17 | #include <linux/dma-buf.h> | 19 | #include <linux/dma-buf.h> |
20 | #include <linux/module.h> | ||
18 | 21 | ||
19 | /** | 22 | /** |
20 | * DOC: overview | 23 | * DOC: overview |
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c index eacfc0ec8ff1..d4576d6e8ce4 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | |||
@@ -9,8 +9,11 @@ | |||
9 | 9 | ||
10 | #include <drm/drm_atomic_helper.h> | 10 | #include <drm/drm_atomic_helper.h> |
11 | #include <drm/drm_crtc_helper.h> | 11 | #include <drm/drm_crtc_helper.h> |
12 | #include <drm/drm_drv.h> | ||
12 | #include <drm/drm_gem_framebuffer_helper.h> | 13 | #include <drm/drm_gem_framebuffer_helper.h> |
13 | #include <drm/drm_modes.h> | 14 | #include <drm/drm_modes.h> |
15 | #include <drm/drm_print.h> | ||
16 | #include <drm/drm_vblank.h> | ||
14 | #include <drm/tinydrm/tinydrm.h> | 17 | #include <drm/tinydrm/tinydrm.h> |
15 | 18 | ||
16 | struct tinydrm_connector { | 19 | struct tinydrm_connector { |
diff --git a/drivers/gpu/drm/tinydrm/hx8357d.c b/drivers/gpu/drm/tinydrm/hx8357d.c index 81a2bbeb25d4..3ae11aa4b73b 100644 --- a/drivers/gpu/drm/tinydrm/hx8357d.c +++ b/drivers/gpu/drm/tinydrm/hx8357d.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/property.h> | 16 | #include <linux/property.h> |
17 | #include <linux/spi/spi.h> | 17 | #include <linux/spi/spi.h> |
18 | 18 | ||
19 | #include <drm/drm_drv.h> | ||
19 | #include <drm/drm_gem_cma_helper.h> | 20 | #include <drm/drm_gem_cma_helper.h> |
20 | #include <drm/drm_gem_framebuffer_helper.h> | 21 | #include <drm/drm_gem_framebuffer_helper.h> |
21 | #include <drm/drm_modeset_helper.h> | 22 | #include <drm/drm_modeset_helper.h> |
diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c index 78f7c2d1b449..b0ad58b97227 100644 --- a/drivers/gpu/drm/tinydrm/ili9225.c +++ b/drivers/gpu/drm/tinydrm/ili9225.c | |||
@@ -20,7 +20,9 @@ | |||
20 | #include <linux/spi/spi.h> | 20 | #include <linux/spi/spi.h> |
21 | #include <video/mipi_display.h> | 21 | #include <video/mipi_display.h> |
22 | 22 | ||
23 | #include <drm/drm_drv.h> | ||
23 | #include <drm/drm_fb_cma_helper.h> | 24 | #include <drm/drm_fb_cma_helper.h> |
25 | #include <drm/drm_fourcc.h> | ||
24 | #include <drm/drm_gem_cma_helper.h> | 26 | #include <drm/drm_gem_cma_helper.h> |
25 | #include <drm/drm_gem_framebuffer_helper.h> | 27 | #include <drm/drm_gem_framebuffer_helper.h> |
26 | #include <drm/tinydrm/mipi-dbi.h> | 28 | #include <drm/tinydrm/mipi-dbi.h> |
diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c index 51395bdc6ca2..bcdf10906ade 100644 --- a/drivers/gpu/drm/tinydrm/ili9341.c +++ b/drivers/gpu/drm/tinydrm/ili9341.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/property.h> | 15 | #include <linux/property.h> |
16 | #include <linux/spi/spi.h> | 16 | #include <linux/spi/spi.h> |
17 | 17 | ||
18 | #include <drm/drm_drv.h> | ||
18 | #include <drm/drm_gem_cma_helper.h> | 19 | #include <drm/drm_gem_cma_helper.h> |
19 | #include <drm/drm_gem_framebuffer_helper.h> | 20 | #include <drm/drm_gem_framebuffer_helper.h> |
20 | #include <drm/drm_modeset_helper.h> | 21 | #include <drm/drm_modeset_helper.h> |
diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c index 3fa62e77c30b..97805ca37a04 100644 --- a/drivers/gpu/drm/tinydrm/mi0283qt.c +++ b/drivers/gpu/drm/tinydrm/mi0283qt.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/regulator/consumer.h> | 17 | #include <linux/regulator/consumer.h> |
18 | #include <linux/spi/spi.h> | 18 | #include <linux/spi/spi.h> |
19 | 19 | ||
20 | #include <drm/drm_drv.h> | ||
20 | #include <drm/drm_gem_cma_helper.h> | 21 | #include <drm/drm_gem_cma_helper.h> |
21 | #include <drm/drm_gem_framebuffer_helper.h> | 22 | #include <drm/drm_gem_framebuffer_helper.h> |
22 | #include <drm/drm_modeset_helper.h> | 23 | #include <drm/drm_modeset_helper.h> |
diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c index 3a05e56f9b0d..10294e1283dd 100644 --- a/drivers/gpu/drm/tinydrm/mipi-dbi.c +++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c | |||
@@ -10,14 +10,17 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/debugfs.h> | 12 | #include <linux/debugfs.h> |
13 | #include <linux/delay.h> | ||
13 | #include <linux/dma-buf.h> | 14 | #include <linux/dma-buf.h> |
14 | #include <linux/gpio/consumer.h> | 15 | #include <linux/gpio/consumer.h> |
15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
16 | #include <linux/regulator/consumer.h> | 17 | #include <linux/regulator/consumer.h> |
17 | #include <linux/spi/spi.h> | 18 | #include <linux/spi/spi.h> |
18 | 19 | ||
20 | #include <drm/drm_drv.h> | ||
19 | #include <drm/drm_fb_cma_helper.h> | 21 | #include <drm/drm_fb_cma_helper.h> |
20 | #include <drm/drm_gem_cma_helper.h> | 22 | #include <drm/drm_gem_cma_helper.h> |
23 | #include <drm/drm_fourcc.h> | ||
21 | #include <drm/drm_gem_framebuffer_helper.h> | 24 | #include <drm/drm_gem_framebuffer_helper.h> |
22 | #include <drm/tinydrm/mipi-dbi.h> | 25 | #include <drm/tinydrm/mipi-dbi.h> |
23 | #include <drm/tinydrm/tinydrm-helpers.h> | 26 | #include <drm/tinydrm/tinydrm-helpers.h> |
diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c index 54d6fe0f37ce..b2a8f894946a 100644 --- a/drivers/gpu/drm/tinydrm/repaper.c +++ b/drivers/gpu/drm/tinydrm/repaper.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
27 | #include <linux/thermal.h> | 27 | #include <linux/thermal.h> |
28 | 28 | ||
29 | #include <drm/drm_drv.h> | ||
29 | #include <drm/drm_fb_cma_helper.h> | 30 | #include <drm/drm_fb_cma_helper.h> |
30 | #include <drm/drm_gem_cma_helper.h> | 31 | #include <drm/drm_gem_cma_helper.h> |
31 | #include <drm/drm_gem_framebuffer_helper.h> | 32 | #include <drm/drm_gem_framebuffer_helper.h> |
diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c index a6a8a1081b73..bf518167760a 100644 --- a/drivers/gpu/drm/tinydrm/st7586.c +++ b/drivers/gpu/drm/tinydrm/st7586.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/spi/spi.h> | 17 | #include <linux/spi/spi.h> |
18 | #include <video/mipi_display.h> | 18 | #include <video/mipi_display.h> |
19 | 19 | ||
20 | #include <drm/drm_drv.h> | ||
20 | #include <drm/drm_fb_cma_helper.h> | 21 | #include <drm/drm_fb_cma_helper.h> |
21 | #include <drm/drm_gem_cma_helper.h> | 22 | #include <drm/drm_gem_cma_helper.h> |
22 | #include <drm/drm_gem_framebuffer_helper.h> | 23 | #include <drm/drm_gem_framebuffer_helper.h> |
diff --git a/drivers/gpu/drm/tinydrm/st7735r.c b/drivers/gpu/drm/tinydrm/st7735r.c index b39779e0dcd8..9bc93d5a0401 100644 --- a/drivers/gpu/drm/tinydrm/st7735r.c +++ b/drivers/gpu/drm/tinydrm/st7735r.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/spi/spi.h> | 14 | #include <linux/spi/spi.h> |
15 | #include <video/mipi_display.h> | 15 | #include <video/mipi_display.h> |
16 | 16 | ||
17 | #include <drm/drm_drv.h> | ||
17 | #include <drm/drm_gem_cma_helper.h> | 18 | #include <drm/drm_gem_cma_helper.h> |
18 | #include <drm/drm_gem_framebuffer_helper.h> | 19 | #include <drm/drm_gem_framebuffer_helper.h> |
19 | #include <drm/tinydrm/mipi-dbi.h> | 20 | #include <drm/tinydrm/mipi-dbi.h> |