aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2012-03-08 11:12:16 -0500
committerDave Airlie <airlied@redhat.com>2012-03-10 08:06:30 -0500
commit4398e58c5fc2bcd1b64a38fd28c3ffba8c36eefa (patch)
treefd5fa6faa3f0899b693a34ee9a191fcc60670976 /drivers/gpu/drm/gma500
parent44332ddfeb07960e57fd6db9be0a3f7c6a01d4e9 (diff)
gma500: oaktrail_crtc: 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/oaktrail_crtc.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 40d10ae67158..a39b0d0d680f 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -169,7 +169,6 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
169 int dspbase_reg = (pipe == 0) ? MRST_DSPABASE : DSPBBASE; 169 int dspbase_reg = (pipe == 0) ? MRST_DSPABASE : DSPBBASE;
170 int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF; 170 int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
171 u32 temp; 171 u32 temp;
172 bool enabled;
173 172
174 if (!gma_power_begin(dev, true)) 173 if (!gma_power_begin(dev, true))
175 return; 174 return;
@@ -253,8 +252,6 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
253 break; 252 break;
254 } 253 }
255 254
256 enabled = crtc->enabled && mode != DRM_MODE_DPMS_OFF;
257
258 /*Set FIFO Watermarks*/ 255 /*Set FIFO Watermarks*/
259 REG_WRITE(DSPARB, 0x3FFF); 256 REG_WRITE(DSPARB, 0x3FFF);
260 REG_WRITE(DSPFW1, 0x3F88080A); 257 REG_WRITE(DSPFW1, 0x3F88080A);
@@ -310,7 +307,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
310 struct oaktrail_clock_t clock; 307 struct oaktrail_clock_t clock;
311 u32 dpll = 0, fp = 0, dspcntr, pipeconf; 308 u32 dpll = 0, fp = 0, dspcntr, pipeconf;
312 bool ok, is_sdvo = false; 309 bool ok, is_sdvo = false;
313 bool is_crt = false, is_lvds = false, is_tv = false; 310 bool is_lvds = false;
314 bool is_mipi = false; 311 bool is_mipi = false;
315 struct drm_mode_config *mode_config = &dev->mode_config; 312 struct drm_mode_config *mode_config = &dev->mode_config;
316 struct psb_intel_encoder *psb_intel_encoder = NULL; 313 struct psb_intel_encoder *psb_intel_encoder = NULL;
@@ -340,12 +337,6 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
340 case INTEL_OUTPUT_SDVO: 337 case INTEL_OUTPUT_SDVO:
341 is_sdvo = true; 338 is_sdvo = true;
342 break; 339 break;
343 case INTEL_OUTPUT_TVOUT:
344 is_tv = true;
345 break;
346 case INTEL_OUTPUT_ANALOG:
347 is_crt = true;
348 break;
349 case INTEL_OUTPUT_MIPI: 340 case INTEL_OUTPUT_MIPI:
350 is_mipi = true; 341 is_mipi = true;
351 break; 342 break;