Skip to contentSkip to conversation

drm/atmel-hlcdc: remove unnecessary if statement

PATCH In review Stefan Agner 2 participants 3 messages Aug 7, 2017 – Jun 17, 2018

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

PATCH 1/1 drm/atmel-hlcdc: remove unnecessary if statement

The statement always evaluates to true since the struct fields are arrays. This has shown up as a warning when compiling with clang:
warning: address of array 'desc->layout.xstride' will always
evaluate to 'true' [-Wpointer-bool-conversion]

---
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +9 -12
index 1124200bb280..9bd8c4888035 100644
@@ -854,24 +854,21 @@ static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane,
 				struct atmel_hlcdc_plane_properties *props)
 {
 	const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc;
+	int ret;
 
 	if (desc->type == ATMEL_HLCDC_OVERLAY_LAYER ||
 	    desc->type == ATMEL_HLCDC_CURSOR_LAYER)
 		drm_object_attach_property(&plane->base.base,
 					   props->alpha, 255);
 
-	if (desc->layout.xstride && desc->layout.pstride) {
-		int ret;
-
-		ret = drm_plane_create_rotation_property(&plane->base,
-							 DRM_MODE_ROTATE_0,
-							 DRM_MODE_ROTATE_0 |
-							 DRM_MODE_ROTATE_90 |
-							 DRM_MODE_ROTATE_180 |
-							 DRM_MODE_ROTATE_270);
-		if (ret)
-			return ret;
-	}
+	ret = drm_plane_create_rotation_property(&plane->base,
+						 DRM_MODE_ROTATE_0,
+						 DRM_MODE_ROTATE_0 |
+						 DRM_MODE_ROTATE_90 |
+						 DRM_MODE_ROTATE_180 |
+						 DRM_MODE_ROTATE_270);
+	if (ret)
+		return ret;
 
 	if (desc->layout.csc) {
 		/*
Signature · 1 line
2.13.3
#1 lore raw

Boris, Maxime,

Quoted 5 lines · Stefan Agner

The statement always evaluates to true since the struct fields are arrays. This has shown up as a warning when compiling with clang:
warning: address of array 'desc->layout.xstride' will always
evaluate to 'true' [-Wpointer-bool-conversion]

It seems that this patch never made it upstream. It still produces a warning when building with clang. Maybe you could have a look and queue?

--
Stefan

Quoted 45 lines
---
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +9 -12
index 1124200bb280..9bd8c4888035 100644
@@ -854,24 +854,21 @@ static int
 atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane,
 				struct atmel_hlcdc_plane_properties *props)
 {
 	const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc;
+	int ret;
 
 	if (desc->type == ATMEL_HLCDC_OVERLAY_LAYER ||
 	    desc->type == ATMEL_HLCDC_CURSOR_LAYER)
 		drm_object_attach_property(&plane->base.base,
 					   props->alpha, 255);
 
-	if (desc->layout.xstride && desc->layout.pstride) {
-		int ret;
-
-		ret = drm_plane_create_rotation_property(&plane->base,
-							 DRM_MODE_ROTATE_0,
-							 DRM_MODE_ROTATE_0 |
-							 DRM_MODE_ROTATE_90 |
-							 DRM_MODE_ROTATE_180 |
-							 DRM_MODE_ROTATE_270);
-		if (ret)
-			return ret;
-	}
+	ret = drm_plane_create_rotation_property(&plane->base,
+						 DRM_MODE_ROTATE_0,
+						 DRM_MODE_ROTATE_0 |
+						 DRM_MODE_ROTATE_90 |
+						 DRM_MODE_ROTATE_180 |
+						 DRM_MODE_ROTATE_270);
+	if (ret)
+		return ret;
 
 	if (desc->layout.csc) {
Quoted 1 line

/*

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 11 lines · On Sun, 17 Jun 2018 01:34:34 +0200 Stefan Agner <[email protected]> wrote:

Boris, Maxime,

Quoted 5 lines · Stefan Agner

The statement always evaluates to true since the struct fields are arrays. This has shown up as a warning when compiling with clang:
warning: address of array 'desc->layout.xstride' will always
evaluate to 'true' [-Wpointer-bool-conversion]

It seems that this patch never made it upstream. It still produces a warning when building with clang. Maybe you could have a look and queue?

Oops, sorry, I missed that one.

Quoted 22 lines

--
Stefan

Quoted 18 lines
---
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +1 -0
index 1124200bb280..9bd8c4888035 100644
@@ -854,24 +854,21 @@ static int
 atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane,
 				struct atmel_hlcdc_plane_properties *props)
 {
 	const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc;
+	int ret;
 
Quoted 6 lines

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane, · line 863

Quoted 6 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +0 -1
 	if (desc->type == ATMEL_HLCDC_OVERLAY_LAYER ||
 	    desc->type == ATMEL_HLCDC_CURSOR_LAYER)
 		drm_object_attach_property(&plane->base.base,
 					   props->alpha, 255);
 
-	if (desc->layout.xstride && desc->layout.pstride) {

The test should be

	if (desc->layout.xstride[0] && desc->layout.pstride[0])

Can you send a new version with this change?

Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +8 -11
-		int ret;
-
-		ret = drm_plane_create_rotation_property(&plane->base,
-							 DRM_MODE_ROTATE_0,
-							 DRM_MODE_ROTATE_0 |
-							 DRM_MODE_ROTATE_90 |
-							 DRM_MODE_ROTATE_180 |
-							 DRM_MODE_ROTATE_270);
-		if (ret)
-			return ret;
-	}
+	ret = drm_plane_create_rotation_property(&plane->base,
+						 DRM_MODE_ROTATE_0,
+						 DRM_MODE_ROTATE_0 |
+						 DRM_MODE_ROTATE_90 |
+						 DRM_MODE_ROTATE_180 |
+						 DRM_MODE_ROTATE_270);
+	if (ret)
+		return ret;
 
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +0 -0
 	if (desc->layout.csc) {

/*

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel