drm/msm: Fix return type of mdp4_lvds_connector_mode_valid
PATCH 1/1 drm/msm: Fix return type of mdp4_lvds_connector_mode_valid
The mode_valid field in drm_connector_helper_funcs is expected to be of type:
enum drm_mode_status (* mode_valid) (struct drm_connector *connector,
struct drm_display_mode *mode);
The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
The return type of mdp4_lvds_connector_mode_valid should be changed from int to enum drm_mode_status.
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +3 -2
@@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)return ret; } -static int mdp4_lvds_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +mdp4_lvds_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector);
Signature · 1 line
2.37.2.789.g6183377224-goog
Quoted 8 lines · Nathan Huckleberry
The
mode_validfield indrm_connector_helper_funcsis expected to be of type:
enumdrm_mode_status(*mode_valid) (structdrm_connector*connector,struct drm_display_mode *mode);The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
Quoted 7 lines
The return type of
mdp4_lvds_connector_mode_validshould be changed from int to enumdrm_mode_status.
Quoted 23 lines
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +3
-2@@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)return ret; } -static int mdp4_lvds_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +mdp4_lvds_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector);Signature · 1 line
2.37.2.789.g6183377224-goog
Hi Nathan
Thanks for the patch.
Quoted 8 lines · Nathan Huckleberry
The
mode_validfield indrm_connector_helper_funcsis expected to be of type:
enumdrm_mode_status(*mode_valid) (structdrm_connector*connector,struct drm_display_mode *mode);The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
Quoted 7 lines
The return type of
mdp4_lvds_connector_mode_validshould be changed from int to enumdrm_mode_status.
From what I can see this one has been this way since lvds support was added. Hence this should have
Quoted 20 lines
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +3
-2@@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)return ret; } -static int mdp4_lvds_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +mdp4_lvds_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector);
Hi all,
Quoted 39 lines · Nathan Huckleberry
The
mode_validfield indrm_connector_helper_funcsis expected to be of type:
enumdrm_mode_status(*mode_valid) (structdrm_connector*connector,struct drm_display_mode *mode);The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
The return type of
mdp4_lvds_connector_mode_validshould be changed from int to enumdrm_mode_status.Reported-by Dan Carpenter <[email protected]>Signed-off-by Nathan Huckleberry <[email protected]>--- drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +3
-2@@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)return ret; } -static int mdp4_lvds_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +mdp4_lvds_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector);Signature · 1 line
2.37.2.789.g6183377224-goog
Did this patch get lost somewhere? I do not see it picked up. It is needed to avoid a new WIP warning from clang for catching these CFI failures:
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c:89:16: error: incompatible function pointer types initializing 'enum drm_mode_status (*)(struct drm_connector *, struct drm_display_mode *)' with an expression of type 'int (struct drm_connector *, struct drm_display_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid = mdp4_lvds_connector_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Cheers,
Nathan
Dmitry Baryshkov
Reviewed-byQuoted 45 lines · Nathan Chancellor
Quoted 39 lines · Nathan Huckleberry
The
mode_validfield indrm_connector_helper_funcsis expected to be of type:
enumdrm_mode_status(*mode_valid) (structdrm_connector*connector,struct drm_display_mode *mode);The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
The return type of
mdp4_lvds_connector_mode_validshould be changed from int to enumdrm_mode_status.Reported-by Dan Carpenter <[email protected]>Signed-off-by Nathan Huckleberry <[email protected]>--- drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +3
-2@@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)return ret; } -static int mdp4_lvds_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +mdp4_lvds_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {struct mdp4_lvds_connector *mdp4_lvds_connector =to_mdp4_lvds_connector (connector);Signature · 1 line
2.37.2.789.g6183377224-googDid this patch get lost somewhere? I do not see it picked up. It is needed to avoid a new WIP warning from clang for catching these CFI failures:
Quoted 4 lines
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c:89:16: error: incompatible function pointer types initializing 'enumdrm_mode_status(*)(structdrm_connector*, structdrm_display_mode*)' with an expression of type 'int (structdrm_connector*, structdrm_display_mode*)' [-Werror,-Wincompatible-function-pointer-types-strict]
.mode_valid =mdp4_lvds_connector_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
It will be picked into 6.1-rc and then propagate through the stable kernel updates.
Anyway:
Signature · 2 lines
With best wishes Dmitry
Quoted 52 lines · Dmitry Baryshkov
Quoted 46 lines · Nathan Chancellor
Quoted 34 lines · Nathan Huckleberry
The
mode_validfield indrm_connector_helper_funcsis expected to be of type:
enumdrm_mode_status(*mode_valid) (structdrm_connector*connector, structdrm_display_mode*mode);The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
The return type of
mdp4_lvds_connector_mode_validshould be changed from int to enumdrm_mode_status.Reported-by Dan Carpenter <[email protected]>Signed-off-by Nathan Huckleberry <[email protected]>---
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c| 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +3
-2@@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector) return ret; } -static int mdp4_lvds_connector_mode_valid (struct drm_connector *connector, - struct drm_display_mode *mode) +static enum drm_mode_status +mdp4_lvds_connector_mode_valid (struct drm_connector *connector, + struct drm_display_mode *mode) {Quoted 6 lines
struct
mdp4_lvds_connector*mdp4_lvds_connector=to_mdp4_lvds_connector(connector);Signature · 1 line
2.37.2.789.g6183377224-googDid this patch get lost somewhere? I do not see it picked up. It is needed to avoid a new WIP warning from clang for catching these CFI failures:
Quoted 4 lines
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c:89:16: error: incompatible function pointer types initializing 'enumdrm_mode_status(*)(structdrm_connector*, structdrm_display_mode*)' with an expression of type 'int (structdrm_connector*, structdrm_display_mode*)' [-Werror,-Wincompatible-function-pointer-types-strict] .mode_valid =mdp4_lvds_connector_mode_valid,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Quoted 6 lines
It will be picked into 6.1-rc and then propagate through the stable kernel updates.
Anyway:
Fixes 3e87599b68e7 ("drm/msm/mdp4: add LVDS panel support")Reviewed-by Dmitry Baryshkov <[email protected]>
Yes, it was already merged to the -fixes tree and a PR with it was sent out for 6.1-rc
https://gitlab.freedesktop.org/drm/msm/-/commit/0b33a33bd15d5bab73b87152b220a8d0153a4587