Skip to content

Commit 2020608

Browse files
iavclaude
andcommitted
rockchip64: panel-simple-dsi: fix clang -Wincompatible-pointer-types-discards-qualifiers
of_get_drm_display_mode() takes u32 *bus_format, but the patch passed &p->desc->bus_format where desc is const struct panel_desc *. GCC tolerates this; clang rejects it under -Werror since the removal of the blanket -Wno-error=unknown-warning-option from KCFLAGS. The pointed-to memory is actually writable (desc is allocated via devm_kmemdup in this driver), so cast the constness away at the call site. Applied to rockchip64-6.6/6.12/6.18/7.1; the 7.2 copy of the patch is .disabled and left untouched. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent d18ee3a commit 2020608

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

patch/kernel/archive/rockchip64-6.12/general-add-panel-simple-dsi.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ index 000000000000..111111111111
388388
+ if (!mode)
389389
+ return 0;
390390
+
391-
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, &p->desc->bus_format,
391+
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, (u32 *)&p->desc->bus_format,
392392
+ OF_USE_NATIVE_MODE);
393393
+ if (ret) {
394394
+ dev_dbg(panel->dev, "failed to find dts display timings\n");

patch/kernel/archive/rockchip64-6.18/general-add-panel-simple-dsi.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ index 000000000000..111111111111
388388
+ if (!mode)
389389
+ return 0;
390390
+
391-
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, &p->desc->bus_format,
391+
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, (u32 *)&p->desc->bus_format,
392392
+ OF_USE_NATIVE_MODE);
393393
+ if (ret) {
394394
+ dev_dbg(panel->dev, "failed to find dts display timings\n");

patch/kernel/archive/rockchip64-6.6/general-add-panel-simple-dsi.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ index 000000000000..e3c8dcf8cb5e
388388
+ if (!mode)
389389
+ return 0;
390390
+
391-
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, &p->desc->bus_format,
391+
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, (u32 *)&p->desc->bus_format,
392392
+ OF_USE_NATIVE_MODE);
393393
+ if (ret) {
394394
+ dev_dbg(panel->dev, "failed to find dts display timings\n");

patch/kernel/archive/rockchip64-7.1/general-add-panel-simple-dsi.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ index 000000000000..111111111111
389389
+ if (!mode)
390390
+ return 0;
391391
+
392-
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, &p->desc->bus_format,
392+
+ ret = of_get_drm_display_mode(panel->dev->of_node, mode, (u32 *)&p->desc->bus_format,
393393
+ OF_USE_NATIVE_MODE);
394394
+ if (ret) {
395395
+ dev_dbg(panel->dev, "failed to find dts display timings\n");

0 commit comments

Comments
 (0)