aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2012-03-08 11:11:26 -0500
committerDave Airlie <airlied@redhat.com>2012-03-10 08:06:27 -0500
commite4b9ff716fd6b49b062884e339882efe305e922f (patch)
tree2a7e613acef92a230f169e2b46eaab77d87aa0af
parent1c6a62680beeeb3bf9cda23177d4b32c2609cf81 (diff)
gma500: mdfld_dsi_dpi: drop unused variables
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/gma500/mdfld_dsi_dpi.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
index fc0df28a668c..d52358b744a0 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
@@ -430,14 +430,13 @@ int mdfld_dsi_dpi_timing_calculation(struct drm_display_mode *mode,
430 int num_lane, int bpp) 430 int num_lane, int bpp)
431{ 431{
432 int pclk_hsync, pclk_hfp, pclk_hbp, pclk_hactive; 432 int pclk_hsync, pclk_hfp, pclk_hbp, pclk_hactive;
433 int pclk_vsync, pclk_vfp, pclk_vbp, pclk_vactive; 433 int pclk_vsync, pclk_vfp, pclk_vbp;
434 434
435 pclk_hactive = mode->hdisplay; 435 pclk_hactive = mode->hdisplay;
436 pclk_hfp = mode->hsync_start - mode->hdisplay; 436 pclk_hfp = mode->hsync_start - mode->hdisplay;
437 pclk_hsync = mode->hsync_end - mode->hsync_start; 437 pclk_hsync = mode->hsync_end - mode->hsync_start;
438 pclk_hbp = mode->htotal - mode->hsync_end; 438 pclk_hbp = mode->htotal - mode->hsync_end;
439 439
440 pclk_vactive = mode->vdisplay;
441 pclk_vfp = mode->vsync_start - mode->vdisplay; 440 pclk_vfp = mode->vsync_start - mode->vdisplay;
442 pclk_vsync = mode->vsync_end - mode->vsync_start; 441 pclk_vsync = mode->vsync_end - mode->vsync_start;
443 pclk_vbp = mode->vtotal - mode->vsync_end; 442 pclk_vbp = mode->vtotal - mode->vsync_end;
@@ -641,10 +640,6 @@ static void mdfld_dsi_dpi_set_power(struct drm_encoder *encoder, bool on)
641 int pipe = mdfld_dsi_encoder_get_pipe(dsi_encoder); 640 int pipe = mdfld_dsi_encoder_get_pipe(dsi_encoder);
642 struct drm_device *dev = dsi_config->dev; 641 struct drm_device *dev = dsi_config->dev;
643 struct drm_psb_private *dev_priv = dev->dev_private; 642 struct drm_psb_private *dev_priv = dev->dev_private;
644 u32 pipeconf_reg = PIPEACONF;
645
646 if (pipe)
647 pipeconf_reg = PIPECCONF;
648 643
649 /*start up display island if it was shutdown*/ 644 /*start up display island if it was shutdown*/
650 if (!gma_power_begin(dev, true)) 645 if (!gma_power_begin(dev, true))
@@ -942,7 +937,6 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
942 struct mdfld_dsi_config *dsi_config; 937 struct mdfld_dsi_config *dsi_config;
943 struct drm_connector *connector = NULL; 938 struct drm_connector *connector = NULL;
944 struct drm_encoder *encoder = NULL; 939 struct drm_encoder *encoder = NULL;
945 struct drm_display_mode *fixed_mode = NULL;
946 int pipe; 940 int pipe;
947 u32 data; 941 u32 data;
948 int ret; 942 int ret;
@@ -994,7 +988,6 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
994 988
995 /*get fixed mode*/ 989 /*get fixed mode*/
996 dsi_config = mdfld_dsi_get_config(dsi_connector); 990 dsi_config = mdfld_dsi_get_config(dsi_connector);
997 fixed_mode = dsi_config->fixed_mode;
998 991
999 /*create drm encoder object*/ 992 /*create drm encoder object*/
1000 connector = &dsi_connector->base.base; 993 connector = &dsi_connector->base.base;