diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2012-03-08 11:15:20 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-10 08:06:38 -0500 |
commit | 2e33d6b92ff3298c06e87661040c5401e1099ea5 (patch) | |
tree | cc57ee35d694decbf935f4347c4c7f7746ecc162 /drivers/gpu/drm/gma500 | |
parent | 3c1d08d7af81b4dbd77530cb4f21f28cd4035f40 (diff) |
gma500: psb_intel_display: 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/psb_intel_display.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c index 65a5583b598b..2616558457c8 100644 --- a/drivers/gpu/drm/gma500/psb_intel_display.c +++ b/drivers/gpu/drm/gma500/psb_intel_display.c | |||
@@ -433,7 +433,6 @@ static void psb_intel_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
433 | int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE; | 433 | int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE; |
434 | int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF; | 434 | int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF; |
435 | u32 temp; | 435 | u32 temp; |
436 | bool enabled; | ||
437 | 436 | ||
438 | /* XXX: When our outputs are all unaware of DPMS modes other than off | 437 | /* XXX: When our outputs are all unaware of DPMS modes other than off |
439 | * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC. | 438 | * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC. |
@@ -518,8 +517,6 @@ static void psb_intel_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
518 | break; | 517 | break; |
519 | } | 518 | } |
520 | 519 | ||
521 | enabled = crtc->enabled && mode != DRM_MODE_DPMS_OFF; | ||
522 | |||
523 | /*Set FIFO Watermarks*/ | 520 | /*Set FIFO Watermarks*/ |
524 | REG_WRITE(DSPARB, 0x3F3E); | 521 | REG_WRITE(DSPARB, 0x3F3E); |
525 | } | 522 | } |
@@ -611,8 +608,8 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, | |||
611 | int refclk; | 608 | int refclk; |
612 | struct psb_intel_clock_t clock; | 609 | struct psb_intel_clock_t clock; |
613 | u32 dpll = 0, fp = 0, dspcntr, pipeconf; | 610 | u32 dpll = 0, fp = 0, dspcntr, pipeconf; |
614 | bool ok, is_sdvo = false, is_dvo = false; | 611 | bool ok, is_sdvo = false; |
615 | bool is_crt = false, is_lvds = false, is_tv = false; | 612 | bool is_lvds = false, is_tv = false; |
616 | struct drm_mode_config *mode_config = &dev->mode_config; | 613 | struct drm_mode_config *mode_config = &dev->mode_config; |
617 | struct drm_connector *connector; | 614 | struct drm_connector *connector; |
618 | 615 | ||
@@ -637,15 +634,9 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, | |||
637 | case INTEL_OUTPUT_SDVO: | 634 | case INTEL_OUTPUT_SDVO: |
638 | is_sdvo = true; | 635 | is_sdvo = true; |
639 | break; | 636 | break; |
640 | case INTEL_OUTPUT_DVO: | ||
641 | is_dvo = true; | ||
642 | break; | ||
643 | case INTEL_OUTPUT_TVOUT: | 637 | case INTEL_OUTPUT_TVOUT: |
644 | is_tv = true; | 638 | is_tv = true; |
645 | break; | 639 | break; |
646 | case INTEL_OUTPUT_ANALOG: | ||
647 | is_crt = true; | ||
648 | break; | ||
649 | } | 640 | } |
650 | } | 641 | } |
651 | 642 | ||