Skip to contentSkip to conversation

drm/msm: Fix return type of mdp4_lvds_connector_mode_valid

PATCH In review Nathan Huckleberry 4 participants 6 messages Sep 13, 2022 – Nov 1, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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
index 7288041dd86a..7444b75c4215 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Nathan Huckleberry

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.

Quoted 7 lines

The return type of mdp4_lvds_connector_mode_valid should be changed from int to enum drm_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
index 7288041dd86a..7444b75c4215 100644
@@ -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
Reviewed-by on v1 1/1
#2 lore raw
In reply to Nathan Huckleberry

Hi Nathan

Thanks for the patch.

Quoted 8 lines · Nathan Huckleberry

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.

Quoted 7 lines

The return type of mdp4_lvds_connector_mode_valid should be changed from int to enum drm_mode_status.

From what I can see this one has been this way since lvds support was added. Hence this should have

Fixes 3e87599b68e7 ("drm/msm/mdp4: add LVDS panel support")
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
index 7288041dd86a..7444b75c4215 100644
@@ -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);
#3 lore raw
In reply to Nathan Huckleberry

Hi all,

Quoted 39 lines · Nathan Huckleberry

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
index 7288041dd86a..7444b75c4215 100644
@@ -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

Reviewed-by
#4 lore raw
Quoted 45 lines · Nathan Chancellor
Quoted 39 lines · Nathan Huckleberry

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
index 7288041dd86a..7444b75c4215 100644
@@ -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:

Quoted 4 lines

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.

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")
Signature · 2 lines
With best wishes
Dmitry
#5 lore raw
Quoted 52 lines · Dmitry Baryshkov
Quoted 46 lines · Nathan Chancellor
Quoted 34 lines · Nathan Huckleberry

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
index 7288041dd86a..7444b75c4215 100644
@@ -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-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:

Quoted 4 lines

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.

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")

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

Quoted 2 lines