Skip to contentSkip to conversation

linux-next: build warning after merge of the drm tree

PATCH In review Stephen Rothwell 4 participants 5 messages May 19, 2017 – May 23, 2017

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

drivers/gpu/drm/gma500/mdfld_tpo_vid.c: In function 'tpo_vid_get_config_mode':
drivers/gpu/drm/gma500/mdfld_tpo_vid.c:34:31: warning: unused variable 'ti' [-Wunused-variable]

  struct oaktrail_timing_info *ti = &dev_priv->gct_data.DTD;
                               ^

Introduced by commit

94d7fb4982d2 ("gpu: drm: gma500: remove dead code")

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw

PATCH v2 1/1 gpu: drm: gma500: remove dead code

Local variable use_gct is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.

Addresses-Coverity-ID: 145690

---
Changes in v2:
Remove variables ti and dev_priv, which was causing a compilation warning.

I have improved my testing to avoid similar issues in the future. This is how I tested it this time:

 $ make allmodconfig
 $ make drivers/gpu/drm/gma500/mdfld_tpo_vid.o
 drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 53 ++++++----------------------------
 1 file changed, 9 insertions(+), 44 deletions(-)
drivers/gpu/drm/gma500/mdfld_tpo_vid.c +9 -44
index d8d4170..a9420bf 100644
@@ -30,55 +30,20 @@
 static struct drm_display_mode *tpo_vid_get_config_mode(struct drm_device *dev)
 {
 	struct drm_display_mode *mode;
-	struct drm_psb_private *dev_priv = dev->dev_private;
-	struct oaktrail_timing_info *ti = &dev_priv->gct_data.DTD;
-	bool use_gct = false;
 
 	mode = kzalloc(sizeof(*mode), GFP_KERNEL);
 	if (!mode)
 		return NULL;
 
-	if (use_gct) {
-		mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-		mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-		mode->hsync_start = mode->hdisplay +
-				((ti->hsync_offset_hi << 8) |
-				ti->hsync_offset_lo);
-		mode->hsync_end = mode->hsync_start +
-				((ti->hsync_pulse_width_hi << 8) |
-				ti->hsync_pulse_width_lo);
-		mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) |
-								ti->hblank_lo);
-		mode->vsync_start =
-			mode->vdisplay + ((ti->vsync_offset_hi << 8) |
-						ti->vsync_offset_lo);
-		mode->vsync_end =
-			mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) |
-						ti->vsync_pulse_width_lo);
-		mode->vtotal = mode->vdisplay +
-				((ti->vblank_hi << 8) | ti->vblank_lo);
-		mode->clock = ti->pixel_clock * 10;
-
-		dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-		dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-		dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-		dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-		dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-		dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-		dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-		dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-		dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-	} else {
-		mode->hdisplay = 864;
-		mode->vdisplay = 480;
-		mode->hsync_start = 873;
-		mode->hsync_end = 876;
-		mode->htotal = 887;
-		mode->vsync_start = 487;
-		mode->vsync_end = 490;
-		mode->vtotal = 499;
-		mode->clock = 33264;
-	}
+	mode->hdisplay = 864;
+	mode->vdisplay = 480;
+	mode->hsync_start = 873;
+	mode->hsync_end = 876;
+	mode->htotal = 887;
+	mode->vsync_start = 487;
+	mode->vsync_end = 490;
+	mode->vtotal = 499;
+	mode->clock = 33264;
 
 	drm_mode_set_name(mode);
 	drm_mode_set_crtcinfo(mode, 0);
Signature · 1 line
2.5.0
maintainer
#2 lore raw

Re: [PATCH v2] gpu: drm: gma500: remove dead code

Quoted 5 lines · Gustavo A. R. Silva

Local variable use_gct is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.

Addresses-Coverity-ID: 145690

I believe the first version is already in drm-misc. Actually this entire file can be removed. It was never hooked up and since nobody every complained I feel confident we can remove it.

Cheers
Patrik

Quoted 86 lines

---
Changes in v2:
Remove variables ti and dev_priv, which was causing a compilation warning.

I have improved my testing to avoid similar issues in the future. This is how I tested it this time:

 $ make allmodconfig
 $ make drivers/gpu/drm/gma500/mdfld_tpo_vid.o
 drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 53 ++++++----------------------------
 1 file changed, 9 insertions(+), 44 deletions(-)
drivers/gpu/drm/gma500/mdfld_tpo_vid.c +9 -45
index d8d4170..a9420bf 100644
@@ -30,55 +30,20 @@
 static struct drm_display_mode *tpo_vid_get_config_mode(struct drm_device *dev)
 {
        struct drm_display_mode *mode;
-       struct drm_psb_private *dev_priv = dev->dev_private;
-       struct oaktrail_timing_info *ti = &dev_priv->gct_data.DTD;
-       bool use_gct = false;
 
        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
        if (!mode)
                return NULL;
 
-       if (use_gct) {
-               mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-               mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-               mode->hsync_start = mode->hdisplay +
-                               ((ti->hsync_offset_hi << 8) |
-                               ti->hsync_offset_lo);
-               mode->hsync_end = mode->hsync_start +
-                               ((ti->hsync_pulse_width_hi << 8) |
-                               ti->hsync_pulse_width_lo);
-               mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) |
-                                                               ti->hblank_lo);
-               mode->vsync_start =
-                       mode->vdisplay + ((ti->vsync_offset_hi << 8) |
-                                               ti->vsync_offset_lo);
-               mode->vsync_end =
-                       mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) |
-                                               ti->vsync_pulse_width_lo);
-               mode->vtotal = mode->vdisplay +
-                               ((ti->vblank_hi << 8) | ti->vblank_lo);
-               mode->clock = ti->pixel_clock * 10;
-
-               dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-               dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-               dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-               dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-               dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-               dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-               dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-               dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-               dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-       } else {
-               mode->hdisplay = 864;
-               mode->vdisplay = 480;
-               mode->hsync_start = 873;
-               mode->hsync_end = 876;
-               mode->htotal = 887;
-               mode->vsync_start = 487;
-               mode->vsync_end = 490;
-               mode->vtotal = 499;
-               mode->clock = 33264;
-       }
+       mode->hdisplay = 864;
+       mode->vdisplay = 480;
+       mode->hsync_start = 873;
+       mode->hsync_end = 876;
+       mode->htotal = 887;
+       mode->vsync_start = 487;
+       mode->vsync_end = 490;
+       mode->vtotal = 499;
+       mode->clock = 33264;
 
        drm_mode_set_name(mode);
        drm_mode_set_crtcinfo(mode, 0);
--

2.5.0

maintainer
#3 lore raw

Re: [PATCH v2] gpu: drm: gma500: remove dead code

Quoted 11 lines · Patrik Jakobsson
Quoted 5 lines · Gustavo A. R. Silva

Local variable use_gct is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.

Addresses-Coverity-ID: 145690

I believe the first version is already in drm-misc. Actually this entire file can be removed. It was never hooked up and since nobody every complained I feel confident we can remove it.

Sorry my bad, it is actually in use since it's hardcoded. I'll pick up Arnd's fix (unless he takes it through some other tree).

Thanks
Patrik

Quoted 84 lines

Cheers
Patrik

Quoted 81 lines

---
Changes in v2:
Remove variables ti and dev_priv, which was causing a compilation warning.

I have improved my testing to avoid similar issues in the future. This is how I tested it this time:

 $ make allmodconfig
 $ make drivers/gpu/drm/gma500/mdfld_tpo_vid.o
 drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 53 ++++++----------------------------
 1 file changed, 9 insertions(+), 44 deletions(-)
drivers/gpu/drm/gma500/mdfld_tpo_vid.c +9 -44
index d8d4170..a9420bf 100644
@@ -30,55 +30,20 @@
 static struct drm_display_mode *tpo_vid_get_config_mode(struct drm_device *dev)
 {
        struct drm_display_mode *mode;
-       struct drm_psb_private *dev_priv = dev->dev_private;
-       struct oaktrail_timing_info *ti = &dev_priv->gct_data.DTD;
-       bool use_gct = false;
 
        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
        if (!mode)
                return NULL;
 
-       if (use_gct) {
-               mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-               mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-               mode->hsync_start = mode->hdisplay +
-                               ((ti->hsync_offset_hi << 8) |
-                               ti->hsync_offset_lo);
-               mode->hsync_end = mode->hsync_start +
-                               ((ti->hsync_pulse_width_hi << 8) |
-                               ti->hsync_pulse_width_lo);
-               mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) |
-                                                               ti->hblank_lo);
-               mode->vsync_start =
-                       mode->vdisplay + ((ti->vsync_offset_hi << 8) |
-                                               ti->vsync_offset_lo);
-               mode->vsync_end =
-                       mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) |
-                                               ti->vsync_pulse_width_lo);
-               mode->vtotal = mode->vdisplay +
-                               ((ti->vblank_hi << 8) | ti->vblank_lo);
-               mode->clock = ti->pixel_clock * 10;
-
-               dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-               dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-               dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-               dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-               dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-               dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-               dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-               dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-               dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-       } else {
-               mode->hdisplay = 864;
-               mode->vdisplay = 480;
-               mode->hsync_start = 873;
-               mode->hsync_end = 876;
-               mode->htotal = 887;
-               mode->vsync_start = 487;
-               mode->vsync_end = 490;
-               mode->vtotal = 499;
-               mode->clock = 33264;
-       }
+       mode->hdisplay = 864;
+       mode->vdisplay = 480;
+       mode->hsync_start = 873;
+       mode->hsync_end = 876;
+       mode->htotal = 887;
+       mode->vsync_start = 487;
+       mode->vsync_end = 490;
+       mode->vtotal = 499;
+       mode->clock = 33264;
 
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/gma500/mdfld_tpo_vid.c +0 -1
        drm_mode_set_name(mode);
        drm_mode_set_crtcinfo(mode, 0);
--

2.5.0

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

#4 lore raw

Re: [PATCH v2] gpu: drm: gma500: remove dead code

Quoted 10 lines · Patrik Jakobsson
Quoted 8 lines · Patrik Jakobsson
Quoted 5 lines · Gustavo A. R. Silva

Local variable use_gct is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.

Addresses-Coverity-ID: 145690

Quoted 6 lines
Quoted 3 lines

I believe the first version is already in drm-misc. Actually this entire file can be removed. It was never hooked up and since nobody every complained I feel confident we can remove it.

Sorry my bad, it is actually in use since it's hardcoded. I'll pick up Arnd's fix (unless he takes it through some other tree).

Arnd generally expects maintainers to pick his compile fixes up. -Daniel

Quoted 93 lines

Thanks
Patrik

Quoted 89 lines

Cheers
Patrik

Quoted 86 lines

---
Changes in v2:
Remove variables ti and dev_priv, which was causing a compilation warning.

I have improved my testing to avoid similar issues in the future. This is how I tested it this time:

 $ make allmodconfig
 $ make drivers/gpu/drm/gma500/mdfld_tpo_vid.o
 drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 53 ++++++----------------------------
 1 file changed, 9 insertions(+), 44 deletions(-)
drivers/gpu/drm/gma500/mdfld_tpo_vid.c +9 -45
index d8d4170..a9420bf 100644
@@ -30,55 +30,20 @@
 static struct drm_display_mode *tpo_vid_get_config_mode(struct drm_device *dev)
 {
        struct drm_display_mode *mode;
-       struct drm_psb_private *dev_priv = dev->dev_private;
-       struct oaktrail_timing_info *ti = &dev_priv->gct_data.DTD;
-       bool use_gct = false;
 
        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
        if (!mode)
                return NULL;
 
-       if (use_gct) {
-               mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-               mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-               mode->hsync_start = mode->hdisplay +
-                               ((ti->hsync_offset_hi << 8) |
-                               ti->hsync_offset_lo);
-               mode->hsync_end = mode->hsync_start +
-                               ((ti->hsync_pulse_width_hi << 8) |
-                               ti->hsync_pulse_width_lo);
-               mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) |
-                                                               ti->hblank_lo);
-               mode->vsync_start =
-                       mode->vdisplay + ((ti->vsync_offset_hi << 8) |
-                                               ti->vsync_offset_lo);
-               mode->vsync_end =
-                       mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) |
-                                               ti->vsync_pulse_width_lo);
-               mode->vtotal = mode->vdisplay +
-                               ((ti->vblank_hi << 8) | ti->vblank_lo);
-               mode->clock = ti->pixel_clock * 10;
-
-               dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-               dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-               dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-               dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-               dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-               dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-               dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-               dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-               dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-       } else {
-               mode->hdisplay = 864;
-               mode->vdisplay = 480;
-               mode->hsync_start = 873;
-               mode->hsync_end = 876;
-               mode->htotal = 887;
-               mode->vsync_start = 487;
-               mode->vsync_end = 490;
-               mode->vtotal = 499;
-               mode->clock = 33264;
-       }
+       mode->hdisplay = 864;
+       mode->vdisplay = 480;
+       mode->hsync_start = 873;
+       mode->hsync_end = 876;
+       mode->htotal = 887;
+       mode->vsync_start = 487;
+       mode->vsync_end = 490;
+       mode->vtotal = 499;
+       mode->clock = 33264;
 
        drm_mode_set_name(mode);
        drm_mode_set_crtcinfo(mode, 0);
--

2.5.0

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel