Skip to content

Commit 5c1b19b

Browse files
danvetdanvet
committed
Merge tag 'drm-misc-next-2023-07-21' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-next
drm-misc-next for 6.6: UAPI Changes: - syncobj: New DRM_IOCTL_SYNCOBJ_EVENTFD ioctl Cross-subsystem Changes: - Converge to use of_device_uevent() Core Changes: - GPU VA Manager - improvements to make it clearer that drm_minor_type is uAPI Driver Changes: - ssd130x: Improve intermediate buffer size computation - bridges: - adv7511: Fix low refresh rate - anx7625: Switch to macros instead of hardcoded values - panel: - ld9040: Backlight support, magic improved Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> From: Maxime Ripard <mripard@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/urs7omo5xnhglztxgwgsslws7duqfj4jhzrtppaenuvdh2lwuz@4htm4iiqhkep
2 parents 6c7f274 + d281eea commit 5c1b19b

172 files changed

Lines changed: 3014 additions & 215 deletions

File tree

Some content is hidden

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

‎Documentation/gpu/drm-mm.rst‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,42 @@ DRM MM Range Allocator Function References
466466
.. kernel-doc:: drivers/gpu/drm/drm_mm.c
467467
:export:
468468

469+
DRM GPU VA Manager
470+
==================
471+
472+
Overview
473+
--------
474+
475+
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
476+
:doc: Overview
477+
478+
Split and Merge
479+
---------------
480+
481+
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
482+
:doc: Split and Merge
483+
484+
Locking
485+
-------
486+
487+
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
488+
:doc: Locking
489+
490+
Examples
491+
--------
492+
493+
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
494+
:doc: Examples
495+
496+
DRM GPU VA Manager Function References
497+
--------------------------------------
498+
499+
.. kernel-doc:: include/drm/drm_gpuva_mgr.h
500+
:internal:
501+
502+
.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c
503+
:export:
504+
469505
DRM Buddy Allocator
470506
===================
471507

‎drivers/gpu/drm/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ drm-y := \
4545
drm_vblank.o \
4646
drm_vblank_work.o \
4747
drm_vma_manager.o \
48+
drm_gpuva_mgr.o \
4849
drm_writeback.o
4950
drm-$(CONFIG_DRM_LEGACY) += \
5051
drm_agpsupport.o \

‎drivers/gpu/drm/arm/display/komeda/komeda_dev.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
#include <linux/io.h>
88
#include <linux/iommu.h>
9-
#include <linux/of_device.h>
9+
#include <linux/of.h>
1010
#include <linux/of_graph.h>
1111
#include <linux/of_reserved_mem.h>
1212
#include <linux/platform_device.h>

‎drivers/gpu/drm/arm/malidp_drv.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/of_device.h>
1313
#include <linux/of_graph.h>
1414
#include <linux/of_reserved_mem.h>
15+
#include <linux/platform_device.h>
1516
#include <linux/pm_runtime.h>
1617
#include <linux/debugfs.h>
1718

‎drivers/gpu/drm/bridge/adv7511/adv7511_cec.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include <linux/device.h>
99
#include <linux/module.h>
10-
#include <linux/of_device.h>
1110
#include <linux/slab.h>
1211
#include <linux/clk.h>
1312

‎drivers/gpu/drm/bridge/adv7511/adv7511_drv.c‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/device.h>
1010
#include <linux/gpio/consumer.h>
1111
#include <linux/module.h>
12-
#include <linux/of_device.h>
12+
#include <linux/of.h>
1313
#include <linux/slab.h>
1414

1515
#include <media/cec.h>
@@ -786,8 +786,13 @@ static void adv7511_mode_set(struct adv7511 *adv7511,
786786
else
787787
low_refresh_rate = ADV7511_LOW_REFRESH_RATE_NONE;
788788

789-
regmap_update_bits(adv7511->regmap, 0xfb,
790-
0x6, low_refresh_rate << 1);
789+
if (adv7511->type == ADV7511)
790+
regmap_update_bits(adv7511->regmap, 0xfb,
791+
0x6, low_refresh_rate << 1);
792+
else
793+
regmap_update_bits(adv7511->regmap, 0x4a,
794+
0xc, low_refresh_rate << 2);
795+
791796
regmap_update_bits(adv7511->regmap, 0x17,
792797
0x60, (vsync_polarity << 6) | (hsync_polarity << 5));
793798

‎drivers/gpu/drm/bridge/analogix/anx7625.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -872,11 +872,11 @@ static int anx7625_hdcp_enable(struct anx7625_data *ctx)
872872
}
873873

874874
/* Read downstream capability */
875-
ret = anx7625_aux_trans(ctx, DP_AUX_NATIVE_READ, 0x68028, 1, &bcap);
875+
ret = anx7625_aux_trans(ctx, DP_AUX_NATIVE_READ, DP_AUX_HDCP_BCAPS, 1, &bcap);
876876
if (ret < 0)
877877
return ret;
878878

879-
if (!(bcap & 0x01)) {
879+
if (!(bcap & DP_BCAPS_HDCP_CAPABLE)) {
880880
pr_warn("downstream not support HDCP 1.4, cap(%x).\n", bcap);
881881
return 0;
882882
}
@@ -931,8 +931,8 @@ static void anx7625_dp_start(struct anx7625_data *ctx)
931931

932932
dev_dbg(dev, "set downstream sink into normal\n");
933933
/* Downstream sink enter into normal mode */
934-
data = 1;
935-
ret = anx7625_aux_trans(ctx, DP_AUX_NATIVE_WRITE, 0x000600, 1, &data);
934+
data = DP_SET_POWER_D0;
935+
ret = anx7625_aux_trans(ctx, DP_AUX_NATIVE_WRITE, DP_SET_POWER, 1, &data);
936936
if (ret < 0)
937937
dev_err(dev, "IO error : set sink into normal mode fail\n");
938938

@@ -971,8 +971,8 @@ static void anx7625_dp_stop(struct anx7625_data *ctx)
971971

972972
dev_dbg(dev, "notify downstream enter into standby\n");
973973
/* Downstream monitor enter into standby mode */
974-
data = 2;
975-
ret |= anx7625_aux_trans(ctx, DP_AUX_NATIVE_WRITE, 0x000600, 1, &data);
974+
data = DP_SET_POWER_D3;
975+
ret |= anx7625_aux_trans(ctx, DP_AUX_NATIVE_WRITE, DP_SET_POWER, 1, &data);
976976
if (ret < 0)
977977
DRM_DEV_ERROR(dev, "IO error : mute video fail\n");
978978

‎drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#include <linux/interrupt.h>
1515
#include <linux/iopoll.h>
1616
#include <linux/module.h>
17-
#include <linux/of_address.h>
18-
#include <linux/of_device.h>
17+
#include <linux/of.h>
1918
#include <linux/of_graph.h>
2019
#include <linux/platform_device.h>
2120
#include <linux/pm_runtime.h>

‎drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <linux/media-bus-format.h>
3030
#include <linux/module.h>
3131
#include <linux/of.h>
32-
#include <linux/of_device.h>
3332
#include <linux/phy/phy.h>
3433
#include <linux/phy/phy-dp.h>
3534
#include <linux/platform_device.h>

‎drivers/gpu/drm/bridge/chipone-icn6211.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/i2c.h>
1818
#include <linux/media-bus-format.h>
1919
#include <linux/module.h>
20-
#include <linux/of_device.h>
20+
#include <linux/of.h>
2121
#include <linux/regmap.h>
2222
#include <linux/regulator/consumer.h>
2323

0 commit comments

Comments
 (0)