diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-09-20 17:36:06 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-09-25 04:44:06 -0400 |
commit | e2f12b070d715315f0ed549fe8d722b681518c1b (patch) | |
tree | 280f3ea62807bf4cb9a76d1fc1bb3cce5060a62f /drivers/gpu/drm/i915/intel_display.c | |
parent | de13a2e3f88a4da8e85063b6de37096795079e41 (diff) |
drm/i915: remove unused variables from ironlake_crtc_mode_set
The last patches moved a lot of code from ironlake_crtc_mode_set to
sub-functions, so these variables became useless. You could get
warnings by enabling -Wunused-but-set-variable.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c7fa2a82c84a..08c3f69bfc75 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -4900,39 +4900,24 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, | |||
4900 | int num_connectors = 0; | 4900 | int num_connectors = 0; |
4901 | intel_clock_t clock, reduced_clock; | 4901 | intel_clock_t clock, reduced_clock; |
4902 | u32 dpll, fp = 0, fp2 = 0; | 4902 | u32 dpll, fp = 0, fp2 = 0; |
4903 | bool ok, has_reduced_clock = false, is_sdvo = false; | 4903 | bool ok, has_reduced_clock = false; |
4904 | bool is_crt = false, is_lvds = false, is_tv = false, is_dp = false; | 4904 | bool is_lvds = false, is_dp = false, is_cpu_edp = false; |
4905 | struct intel_encoder *encoder; | 4905 | struct intel_encoder *encoder; |
4906 | u32 temp; | 4906 | u32 temp; |
4907 | int ret; | 4907 | int ret; |
4908 | bool dither; | 4908 | bool dither; |
4909 | bool is_cpu_edp = false, is_pch_edp = false; | ||
4910 | 4909 | ||
4911 | for_each_encoder_on_crtc(dev, crtc, encoder) { | 4910 | for_each_encoder_on_crtc(dev, crtc, encoder) { |
4912 | switch (encoder->type) { | 4911 | switch (encoder->type) { |
4913 | case INTEL_OUTPUT_LVDS: | 4912 | case INTEL_OUTPUT_LVDS: |
4914 | is_lvds = true; | 4913 | is_lvds = true; |
4915 | break; | 4914 | break; |
4916 | case INTEL_OUTPUT_SDVO: | ||
4917 | case INTEL_OUTPUT_HDMI: | ||
4918 | is_sdvo = true; | ||
4919 | if (encoder->needs_tv_clock) | ||
4920 | is_tv = true; | ||
4921 | break; | ||
4922 | case INTEL_OUTPUT_TVOUT: | ||
4923 | is_tv = true; | ||
4924 | break; | ||
4925 | case INTEL_OUTPUT_ANALOG: | ||
4926 | is_crt = true; | ||
4927 | break; | ||
4928 | case INTEL_OUTPUT_DISPLAYPORT: | 4915 | case INTEL_OUTPUT_DISPLAYPORT: |
4929 | is_dp = true; | 4916 | is_dp = true; |
4930 | break; | 4917 | break; |
4931 | case INTEL_OUTPUT_EDP: | 4918 | case INTEL_OUTPUT_EDP: |
4932 | is_dp = true; | 4919 | is_dp = true; |
4933 | if (intel_encoder_is_pch_edp(&encoder->base)) | 4920 | if (!intel_encoder_is_pch_edp(&encoder->base)) |
4934 | is_pch_edp = true; | ||
4935 | else | ||
4936 | is_cpu_edp = true; | 4921 | is_cpu_edp = true; |
4937 | break; | 4922 | break; |
4938 | } | 4923 | } |