aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2012-03-08 11:10:10 -0500
committerDave Airlie <airlied@redhat.com>2012-03-10 08:06:20 -0500
commit0313c0de54ee241b2c139f11c9a285e6c2b8bd52 (patch)
tree5f947b068378cbe9b2c7b4bf260b1da136574078 /drivers/gpu/drm/gma500
parenta8ec6229651b36b03c2003dca6843f7bc4da9d6e (diff)
gma500: cdv_intel_crt: 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>
Diffstat (limited to 'drivers/gpu/drm/gma500')
-rw-r--r--drivers/gpu/drm/gma500/cdv_intel_display.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
index 5803730997f7..79350617f35d 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -569,7 +569,6 @@ static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
569 int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE; 569 int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE;
570 int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF; 570 int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
571 u32 temp; 571 u32 temp;
572 bool enabled;
573 572
574 /* XXX: When our outputs are all unaware of DPMS modes other than off 573 /* XXX: When our outputs are all unaware of DPMS modes other than off
575 * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC. 574 * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
@@ -663,7 +662,6 @@ static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
663 udelay(150); 662 udelay(150);
664 break; 663 break;
665 } 664 }
666 enabled = crtc->enabled && mode != DRM_MODE_DPMS_OFF;
667 /*Set FIFO Watermarks*/ 665 /*Set FIFO Watermarks*/
668 REG_WRITE(DSPARB, 0x3F3E); 666 REG_WRITE(DSPARB, 0x3F3E);
669} 667}
@@ -729,7 +727,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
729 int refclk; 727 int refclk;
730 struct cdv_intel_clock_t clock; 728 struct cdv_intel_clock_t clock;
731 u32 dpll = 0, dspcntr, pipeconf; 729 u32 dpll = 0, dspcntr, pipeconf;
732 bool ok, is_sdvo = false, is_dvo = false; 730 bool ok;
733 bool is_crt = false, is_lvds = false, is_tv = false; 731 bool is_crt = false, is_lvds = false, is_tv = false;
734 bool is_hdmi = false; 732 bool is_hdmi = false;
735 struct drm_mode_config *mode_config = &dev->mode_config; 733 struct drm_mode_config *mode_config = &dev->mode_config;
@@ -747,12 +745,6 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
747 case INTEL_OUTPUT_LVDS: 745 case INTEL_OUTPUT_LVDS:
748 is_lvds = true; 746 is_lvds = true;
749 break; 747 break;
750 case INTEL_OUTPUT_SDVO:
751 is_sdvo = true;
752 break;
753 case INTEL_OUTPUT_DVO:
754 is_dvo = true;
755 break;
756 case INTEL_OUTPUT_TVOUT: 748 case INTEL_OUTPUT_TVOUT:
757 is_tv = true; 749 is_tv = true;
758 break; 750 break;