Skip to content

Commit ddcc2bb

Browse files
committed
Merge tag 'drm-misc-next-2025-08-28' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.18: UAPI Changes: atomic: - Reallow no-op async page flips Cross-subsystem Changes: hid: - i2c-hid: Make elan touch controllers power on after panel is enabled video: - Improve pixel-format handling for struct screen_info Core Changes: display: - dp: Fix command length Driver Changes: amdxdna: - Fixes bridge: - Add support for Radxa Ra620 plus DT bindings msm: - Fix VMA allocation panel: - ilitek-ili9881c: Refactor mode setting; Add support for Bestar BSD1218-A101KL68 LCD plus DT bindings - lvds: Add support for Ampire AMP19201200B5TZQW-T03 to DT bindings rockchip: - dsi2: Add support for RK3576 plus DT bindings stm: - Clean up logging vesadrm: - Support 8-bit palette mode Signed-off-by: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
2 parents 1cd0c7a + 5c76c79 commit ddcc2bb

31 files changed

+818
-222
lines changed

Documentation/accel/amdxdna/amdnpu.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@ Userspace components
223223
Compiler
224224
--------
225225

226-
Peano is an LLVM based open-source compiler for AMD XDNA Array compute tile
227-
available at:
226+
Peano is an LLVM based open-source single core compiler for AMD XDNA Array
227+
compute tile. Peano is available at:
228228
https://github.com/Xilinx/llvm-aie
229229

230-
The open-source IREE compiler supports graph compilation of ML models for AMD
231-
NPU and uses Peano underneath. It is available at:
232-
https://github.com/nod-ai/iree-amd-aie
230+
IRON is an open-source array compiler for AMD XDNA Array based NPU which uses
231+
Peano underneath. IRON is available at:
232+
https://github.com/Xilinx/mlir-aie
233233

234234
Usermode Driver (UMD)
235235
---------------------

Documentation/devicetree/bindings/display/bridge/simple-bridge.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ properties:
2828
- enum:
2929
- adi,adv7123
3030
- dumb-vga-dac
31+
- radxa,ra620
3132
- ti,opa362
3233
- ti,ths8134
3334
- ti,ths8135

Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- enum:
1919
- ampire,am8001280g
2020
- bananapi,lhr050h41
21+
- bestar,bsd1218-a101kl68
2122
- feixin,k101-im2byl02
2223
- raspberrypi,dsi-7inch
2324
- startek,kd050hdfia020

Documentation/devicetree/bindings/display/panel/panel-lvds.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ properties:
4141
- enum:
4242
# Admatec 9904379 10.1" 1024x600 LVDS panel
4343
- admatec,9904379
44+
# Ampire AMP19201200B5TZQW-T03 10.1" WUXGA (1920x1200) color TFT LCD panel
45+
- ampire,amp19201200b5tzqw-t03
4446
- auo,b101ew05
4547
# AUO G084SN05 V9 8.4" 800x600 LVDS panel
4648
- auo,g084sn05

Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ maintainers:
1212
properties:
1313
compatible:
1414
enum:
15+
- rockchip,rk3576-mipi-dsi2
1516
- rockchip,rk3588-mipi-dsi2
1617

1718
reg:

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ patternProperties:
221221
description: BeagleBoard.org Foundation
222222
"^belling,.*":
223223
description: Shanghai Belling Co., Ltd.
224+
"^bestar,.*":
225+
description: Shenzhen Bestar Electronic Technology Co., Ltd.
224226
"^bhf,.*":
225227
description: Beckhoff Automation GmbH & Co. KG
226228
"^bigtreetech,.*":

drivers/accel/amdxdna/aie2_pci.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,9 @@ static int aie2_get_clock_metadata(struct amdxdna_client *client,
785785

786786
static int aie2_hwctx_status_cb(struct amdxdna_hwctx *hwctx, void *arg)
787787
{
788-
struct amdxdna_drm_query_hwctx __user *buf, *tmp __free(kfree) = NULL;
788+
struct amdxdna_drm_query_hwctx *tmp __free(kfree) = NULL;
789789
struct amdxdna_drm_get_info *get_info_args = arg;
790+
struct amdxdna_drm_query_hwctx __user *buf;
790791

791792
if (get_info_args->buffer_size < sizeof(*tmp))
792793
return -EINVAL;

drivers/gpu/drm/bridge/simple-bridge.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,11 @@ static const struct of_device_id simple_bridge_match[] = {
261261
.timings = &default_bridge_timings,
262262
.connector_type = DRM_MODE_CONNECTOR_VGA,
263263
},
264+
}, {
265+
.compatible = "radxa,ra620",
266+
.data = &(const struct simple_bridge_info) {
267+
.connector_type = DRM_MODE_CONNECTOR_HDMIA,
268+
},
264269
}, {
265270
.compatible = "ti,opa362",
266271
.data = &(const struct simple_bridge_info) {

drivers/gpu/drm/display/drm_dp_helper.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3962,6 +3962,7 @@ int drm_edp_backlight_set_level(struct drm_dp_aux *aux, const struct drm_edp_bac
39623962
int ret;
39633963
unsigned int offset = DP_EDP_BACKLIGHT_BRIGHTNESS_MSB;
39643964
u8 buf[3] = { 0 };
3965+
size_t len = 2;
39653966

39663967
/* The panel uses the PWM for controlling brightness levels */
39673968
if (!(bl->aux_set || bl->luminance_set))
@@ -3974,14 +3975,15 @@ int drm_edp_backlight_set_level(struct drm_dp_aux *aux, const struct drm_edp_bac
39743975
buf[1] = (level & 0x00ff00) >> 8;
39753976
buf[2] = (level & 0xff0000) >> 16;
39763977
offset = DP_EDP_PANEL_TARGET_LUMINANCE_VALUE;
3978+
len = 3;
39773979
} else if (bl->lsb_reg_used) {
39783980
buf[0] = (level & 0xff00) >> 8;
39793981
buf[1] = (level & 0x00ff);
39803982
} else {
39813983
buf[0] = level;
39823984
}
39833985

3984-
ret = drm_dp_dpcd_write_data(aux, offset, buf, sizeof(buf));
3986+
ret = drm_dp_dpcd_write_data(aux, offset, buf, len);
39853987
if (ret < 0) {
39863988
drm_err(aux->drm_dev,
39873989
"%s: Failed to write aux backlight level: %d\n",

drivers/gpu/drm/drm_atomic_uapi.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,19 +1078,20 @@ int drm_atomic_set_property(struct drm_atomic_state *state,
10781078
}
10791079

10801080
if (async_flip) {
1081-
/* check if the prop does a nop change */
1082-
if ((prop != config->prop_fb_id &&
1083-
prop != config->prop_in_fence_fd &&
1084-
prop != config->prop_fb_damage_clips)) {
1085-
ret = drm_atomic_plane_get_property(plane, plane_state,
1086-
prop, &old_val);
1087-
ret = drm_atomic_check_prop_changes(ret, old_val, prop_value, prop);
1088-
}
1081+
/* no-op changes are always allowed */
1082+
ret = drm_atomic_plane_get_property(plane, plane_state,
1083+
prop, &old_val);
1084+
ret = drm_atomic_check_prop_changes(ret, old_val, prop_value, prop);
10891085

1090-
/* ask the driver if this non-primary plane is supported */
1091-
if (plane->type != DRM_PLANE_TYPE_PRIMARY) {
1092-
ret = -EINVAL;
1086+
/* fail everything that isn't no-op or a pure flip */
1087+
if (ret && prop != config->prop_fb_id &&
1088+
prop != config->prop_in_fence_fd &&
1089+
prop != config->prop_fb_damage_clips) {
1090+
break;
1091+
}
10931092

1093+
if (ret && plane->type != DRM_PLANE_TYPE_PRIMARY) {
1094+
/* ask the driver if this non-primary plane is supported */
10941095
if (plane_funcs && plane_funcs->atomic_async_check)
10951096
ret = plane_funcs->atomic_async_check(plane, state, true);
10961097

0 commit comments

Comments
 (0)