Skip to content

Commit 15bb799

Browse files
airliedairlied
committed
Merge tag 'drm-misc-next-2021-12-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.17: UAPI Changes: Cross-subsystem Changes: * dma-buf: Make fences mandatory in dma_resv_add_excl_fence Core Changes: * Move hashtable to legacy code * Return error pointers from struct drm_driver.gem_create_object * cma-helper: Improve public interfaces; Remove CONFIG_DRM_KMS_CMA_HELPER option * mipi-dbi: Don't depend on CMA helpers * ttm: Don't include DRM hashtable; Stop prunning fences after wait; Documentation Driver Changes: * aspeed: Select CONFIG_DRM_GEM_CMA_HELPER * bridge/lontium-lt9611: Fix HDMI sensing * bridge/parade-ps8640: Fixes * bridge/sn65dsi86: Defer probe is no dsi host found * fsl-dcu: Select CONFIG_DRM_GEM_CMA_HELPER * i915: Remove dma_resv_prune * omapdrm: Fix scatterlist export; Support virtual planes; Fixes * panel: Boe-tv110c9m,Inx-hj110iz: Update init code * qxl: Use dma-resv iterator * rockchip: Use generic fbdev emulation * tidss: Fixes * vmwgfx: Fix leak on probe errors; Fail probing on broken hosts; New placement for MOB page tables; Hide internal BOs from userspace; Cleanups Signed-off-by: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 15f09a9 + 0384833 commit 15bb799

File tree

100 files changed

+1810
-833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1810
-833
lines changed

‎Documentation/gpu/todo.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,17 @@ See drivers/gpu/drm/amd/display/TODO for tasks.
646646

647647
Contact: Harry Wentland, Alex Deucher
648648

649+
vmwgfx: Replace hashtable with Linux' implementation
650+
----------------------------------------------------
651+
652+
The vmwgfx driver uses its own hashtable implementation. Replace the
653+
code with Linux' implementation and update the callers. It's mostly a
654+
refactoring task, but the interfaces are different.
655+
656+
Contact: Zack Rusin, Thomas Zimmermann <[email protected]>
657+
658+
Level: Intermediate
659+
649660
Bootsplash
650661
==========
651662

‎drivers/dma-buf/dma-resv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence)
305305
if (old)
306306
i = old->shared_count;
307307

308-
if (fence)
309-
dma_fence_get(fence);
308+
dma_fence_get(fence);
310309

311310
write_seqcount_begin(&obj->seq);
312311
/* write_seqcount_begin provides the necessary memory barrier */

‎drivers/gpu/drm/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,6 @@ config DRM_GEM_CMA_HELPER
217217
help
218218
Choose this if you need the GEM CMA helper functions
219219

220-
config DRM_KMS_CMA_HELPER
221-
bool
222-
depends on DRM
223-
select DRM_GEM_CMA_HELPER
224-
help
225-
Choose this if you need the KMS CMA helper functions
226-
227220
config DRM_GEM_SHMEM_HELPER
228221
tristate
229222
depends on DRM && MMU

‎drivers/gpu/drm/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
drm-y := drm_aperture.o drm_auth.o drm_cache.o \
77
drm_file.o drm_gem.o drm_ioctl.o \
88
drm_drv.o \
9-
drm_sysfs.o drm_hashtab.o drm_mm.o \
9+
drm_sysfs.o drm_mm.o \
1010
drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o drm_displayid.o \
1111
drm_trace_points.o drm_prime.o \
1212
drm_vma_manager.o \
@@ -20,8 +20,8 @@ drm-y := drm_aperture.o drm_auth.o drm_cache.o \
2020
drm_managed.o drm_vblank_work.o
2121

2222
drm-$(CONFIG_DRM_LEGACY) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \
23-
drm_irq.o drm_legacy_misc.o drm_lock.o drm_memory.o \
24-
drm_scatter.o drm_vm.o
23+
drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \
24+
drm_memory.o drm_scatter.o drm_vm.o
2525
drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o
2626
drm-$(CONFIG_COMPAT) += drm_ioc32.o
2727
drm-$(CONFIG_DRM_PANEL) += drm_panel.o
@@ -36,6 +36,7 @@ obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o
3636
obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o
3737

3838
drm_cma_helper-y := drm_gem_cma_helper.o
39+
drm_cma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_cma_helper.o
3940
obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o
4041

4142
drm_shmem_helper-y := drm_gem_shmem_helper.o
@@ -60,7 +61,6 @@ drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o drm_dp_helper.o \
6061

6162
drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
6263
drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
63-
drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
6464
drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
6565
drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
6666

‎drivers/gpu/drm/arm/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config DRM_HDLCD
66
depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)
77
depends on COMMON_CLK
88
select DRM_KMS_HELPER
9-
select DRM_KMS_CMA_HELPER
109
help
1110
Choose this option if you have an ARM High Definition Colour LCD
1211
controller.
@@ -27,7 +26,6 @@ config DRM_MALI_DISPLAY
2726
depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)
2827
depends on COMMON_CLK
2928
select DRM_KMS_HELPER
30-
select DRM_KMS_CMA_HELPER
3129
select DRM_GEM_CMA_HELPER
3230
select VIDEOMODE_HELPERS
3331
help

‎drivers/gpu/drm/arm/display/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ config DRM_KOMEDA
44
depends on DRM && OF
55
depends on COMMON_CLK
66
select DRM_KMS_HELPER
7-
select DRM_KMS_CMA_HELPER
87
select DRM_GEM_CMA_HELPER
98
select VIDEOMODE_HELPERS
109
help

‎drivers/gpu/drm/aspeed/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config DRM_ASPEED_GFX
55
depends on (COMPILE_TEST || ARCH_ASPEED)
66
depends on MMU
77
select DRM_KMS_HELPER
8-
select DRM_KMS_CMA_HELPER
8+
select DRM_GEM_CMA_HELPER
99
select DMA_CMA if HAVE_DMA_CONTIGUOUS
1010
select CMA if HAVE_DMA_CONTIGUOUS
1111
select MFD_SYSCON

‎drivers/gpu/drm/atmel-hlcdc/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ config DRM_ATMEL_HLCDC
44
depends on DRM && OF && COMMON_CLK && MFD_ATMEL_HLCDC && ARM
55
select DRM_GEM_CMA_HELPER
66
select DRM_KMS_HELPER
7-
select DRM_KMS_CMA_HELPER
87
select DRM_PANEL
98
help
109
Choose this option if you have an ATMEL SoC with an HLCDC display

‎drivers/gpu/drm/bridge/lontium-lt9611.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ lt9611_connector_detect(struct drm_connector *connector, bool force)
586586
int connected = 0;
587587

588588
regmap_read(lt9611->regmap, 0x825e, &reg_val);
589-
connected = (reg_val & BIT(2));
589+
connected = (reg_val & BIT(0));
590590

591591
lt9611->status = connected ? connector_status_connected :
592592
connector_status_disconnected;
@@ -892,7 +892,7 @@ static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)
892892
int connected;
893893

894894
regmap_read(lt9611->regmap, 0x825e, &reg_val);
895-
connected = reg_val & BIT(2);
895+
connected = reg_val & BIT(0);
896896

897897
lt9611->status = connected ? connector_status_connected :
898898
connector_status_disconnected;

‎drivers/gpu/drm/bridge/parade-ps8640.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@ static int ps8640_bridge_attach(struct drm_bridge *bridge,
449449
if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
450450
return -EINVAL;
451451

452+
ps_bridge->aux.drm_dev = bridge->dev;
452453
ret = drm_dp_aux_register(&ps_bridge->aux);
453454
if (ret) {
454455
dev_err(dev, "failed to register DP AUX channel: %d\n", ret);

0 commit comments

Comments
 (0)