* [PATCH] gpu: drm: gma500: remove dead code
@ 2017-05-09 15:22 Gustavo A. R. Silva
2017-05-10 7:56 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo A. R. Silva @ 2017-05-09 15:22 UTC (permalink / raw)
To: Patrik Jakobsson, David Airlie
Cc: dri-devel, linux-kernel, 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
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
---
drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 51 ++++++----------------------------
1 file changed, 9 insertions(+), 42 deletions(-)
diff --git a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c b/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
index d8d4170..d40628e 100644
--- a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
+++ b/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
@@ -32,53 +32,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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gpu: drm: gma500: remove dead code
2017-05-09 15:22 [PATCH] gpu: drm: gma500: remove dead code Gustavo A. R. Silva
@ 2017-05-10 7:56 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2017-05-10 7:56 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Patrik Jakobsson, David Airlie, linux-kernel, dri-devel
On Tue, May 09, 2017 at 10:22:21AM -0500, Gustavo A. R. Silva wrote:
> 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
> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Looks reasonable, applied to drm-misc for 4.13.
Thanks, Daniel
> ---
> drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 51 ++++++----------------------------
> 1 file changed, 9 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c b/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
> index d8d4170..d40628e 100644
> --- a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
> +++ b/drivers/gpu/drm/gma500/mdfld_tpo_vid.c
> @@ -32,53 +32,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
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] gpu: drm: gma500: remove dead code
@ 2017-05-09 15:36 Gustavo A. R. Silva
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2017-05-09 15:36 UTC (permalink / raw)
To: Patrik Jakobsson, David Airlie
Cc: dri-devel, linux-kernel, Gustavo A. R. Silva
Local variable pipe is assigned to a constant value and it is never
updated again. Remove this variable and the dead code it guards.
Addresses-Coverity-ID: 201351
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
---
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index 8b2eb32..58a9751 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -265,17 +265,16 @@ int oaktrail_crtc_hdmi_mode_set(struct drm_crtc *crtc,
struct drm_device *dev = crtc->dev;
struct drm_psb_private *dev_priv = dev->dev_private;
struct oaktrail_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
- int pipe = 1;
- int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;
- int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;
- int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;
- int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;
- int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;
- int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;
- int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;
- int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
- int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
- int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
+ int htot_reg = HTOTAL_B;
+ int hblank_reg = HBLANK_B;
+ int hsync_reg = HSYNC_B;
+ int vtot_reg = VTOTAL_B;
+ int vblank_reg = VBLANK_B;
+ int vsync_reg = VSYNC_B;
+ int dspsize_reg = DSPBSIZE;
+ int dsppos_reg = DSPBPOS;
+ int pipesrc_reg = PIPEBSRC;
+ int pipeconf_reg = PIPEBCONF;
int refclk;
struct oaktrail_hdmi_clock clock;
u32 dspcntr, pipeconf, dpll, temp;
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-10 7:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-09 15:22 [PATCH] gpu: drm: gma500: remove dead code Gustavo A. R. Silva
2017-05-10 7:56 ` Daniel Vetter
2017-05-09 15:36 Gustavo A. R. Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).