diff options
author | Akshay Joshi <me@akshayjoshi.com> | 2011-08-16 15:34:10 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-09-19 21:01:47 -0400 |
commit | 0206e353a0416ad63ce07f53c807c2c725633b87 (patch) | |
tree | 4b3233535d2f3b9cf408c823b7a32773a8d971e7 /drivers/gpu/drm/i915/intel_tv.c | |
parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) |
Drivers: i915: Fix all space related issues.
Various issues involved with the space character were generating
warnings in the checkpatch.pl file. This patch removes most of those
warnings.
Signed-off-by: Akshay Joshi <me@akshayjoshi.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_tv.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 210d570fd516..f3c6a9a8b081 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c | |||
@@ -194,10 +194,10 @@ static const u32 filter_table[] = { | |||
194 | * | 194 | * |
195 | * if (f >= 1) { | 195 | * if (f >= 1) { |
196 | * exp = 0x7; | 196 | * exp = 0x7; |
197 | * mant = 1 << 8; | 197 | * mant = 1 << 8; |
198 | * } else { | 198 | * } else { |
199 | * for (exp = 0; exp < 3 && f < 0.5; exp++) | 199 | * for (exp = 0; exp < 3 && f < 0.5; exp++) |
200 | * f *= 2.0; | 200 | * f *= 2.0; |
201 | * mant = (f * (1 << 9) + 0.5); | 201 | * mant = (f * (1 << 9) + 0.5); |
202 | * if (mant >= (1 << 9)) | 202 | * if (mant >= (1 << 9)) |
203 | * mant = (1 << 9) - 1; | 203 | * mant = (1 << 9) - 1; |
@@ -430,7 +430,7 @@ static const struct tv_mode tv_modes[] = { | |||
430 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, | 430 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, |
431 | .vsync_len = 6, | 431 | .vsync_len = 6, |
432 | 432 | ||
433 | .veq_ena = true, .veq_start_f1 = 0, | 433 | .veq_ena = true, .veq_start_f1 = 0, |
434 | .veq_start_f2 = 1, .veq_len = 18, | 434 | .veq_start_f2 = 1, .veq_len = 18, |
435 | 435 | ||
436 | .vi_end_f1 = 20, .vi_end_f2 = 21, | 436 | .vi_end_f1 = 20, .vi_end_f2 = 21, |
@@ -472,7 +472,7 @@ static const struct tv_mode tv_modes[] = { | |||
472 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, | 472 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, |
473 | .vsync_len = 6, | 473 | .vsync_len = 6, |
474 | 474 | ||
475 | .veq_ena = true, .veq_start_f1 = 0, | 475 | .veq_ena = true, .veq_start_f1 = 0, |
476 | .veq_start_f2 = 1, .veq_len = 18, | 476 | .veq_start_f2 = 1, .veq_len = 18, |
477 | 477 | ||
478 | .vi_end_f1 = 20, .vi_end_f2 = 21, | 478 | .vi_end_f1 = 20, .vi_end_f2 = 21, |
@@ -515,7 +515,7 @@ static const struct tv_mode tv_modes[] = { | |||
515 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, | 515 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, |
516 | .vsync_len = 6, | 516 | .vsync_len = 6, |
517 | 517 | ||
518 | .veq_ena = true, .veq_start_f1 = 0, | 518 | .veq_ena = true, .veq_start_f1 = 0, |
519 | .veq_start_f2 = 1, .veq_len = 18, | 519 | .veq_start_f2 = 1, .veq_len = 18, |
520 | 520 | ||
521 | .vi_end_f1 = 20, .vi_end_f2 = 21, | 521 | .vi_end_f1 = 20, .vi_end_f2 = 21, |
@@ -558,7 +558,7 @@ static const struct tv_mode tv_modes[] = { | |||
558 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, | 558 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, |
559 | .vsync_len = 6, | 559 | .vsync_len = 6, |
560 | 560 | ||
561 | .veq_ena = true, .veq_start_f1 = 0, | 561 | .veq_ena = true, .veq_start_f1 = 0, |
562 | .veq_start_f2 = 1, .veq_len = 18, | 562 | .veq_start_f2 = 1, .veq_len = 18, |
563 | 563 | ||
564 | .vi_end_f1 = 20, .vi_end_f2 = 21, | 564 | .vi_end_f1 = 20, .vi_end_f2 = 21, |
@@ -602,14 +602,14 @@ static const struct tv_mode tv_modes[] = { | |||
602 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, | 602 | .vsync_start_f1 = 6, .vsync_start_f2 = 7, |
603 | .vsync_len = 6, | 603 | .vsync_len = 6, |
604 | 604 | ||
605 | .veq_ena = true, .veq_start_f1 = 0, | 605 | .veq_ena = true, .veq_start_f1 = 0, |
606 | .veq_start_f2 = 1, .veq_len = 18, | 606 | .veq_start_f2 = 1, .veq_len = 18, |
607 | 607 | ||
608 | .vi_end_f1 = 24, .vi_end_f2 = 25, | 608 | .vi_end_f1 = 24, .vi_end_f2 = 25, |
609 | .nbr_end = 286, | 609 | .nbr_end = 286, |
610 | 610 | ||
611 | .burst_ena = true, | 611 | .burst_ena = true, |
612 | .hburst_start = 73, .hburst_len = 34, | 612 | .hburst_start = 73, .hburst_len = 34, |
613 | .vburst_start_f1 = 8, .vburst_end_f1 = 285, | 613 | .vburst_start_f1 = 8, .vburst_end_f1 = 285, |
614 | .vburst_start_f2 = 8, .vburst_end_f2 = 286, | 614 | .vburst_start_f2 = 8, .vburst_end_f2 = 286, |
615 | .vburst_start_f3 = 9, .vburst_end_f3 = 286, | 615 | .vburst_start_f3 = 9, .vburst_end_f3 = 286, |
@@ -646,7 +646,7 @@ static const struct tv_mode tv_modes[] = { | |||
646 | .vsync_start_f1 = 5, .vsync_start_f2 = 6, | 646 | .vsync_start_f1 = 5, .vsync_start_f2 = 6, |
647 | .vsync_len = 5, | 647 | .vsync_len = 5, |
648 | 648 | ||
649 | .veq_ena = true, .veq_start_f1 = 0, | 649 | .veq_ena = true, .veq_start_f1 = 0, |
650 | .veq_start_f2 = 1, .veq_len = 15, | 650 | .veq_start_f2 = 1, .veq_len = 15, |
651 | 651 | ||
652 | .vi_end_f1 = 24, .vi_end_f2 = 25, | 652 | .vi_end_f1 = 24, .vi_end_f2 = 25, |
@@ -675,7 +675,7 @@ static const struct tv_mode tv_modes[] = { | |||
675 | }, | 675 | }, |
676 | { | 676 | { |
677 | .name = "480p@59.94Hz", | 677 | .name = "480p@59.94Hz", |
678 | .clock = 107520, | 678 | .clock = 107520, |
679 | .refresh = 59940, | 679 | .refresh = 59940, |
680 | .oversample = TV_OVERSAMPLE_4X, | 680 | .oversample = TV_OVERSAMPLE_4X, |
681 | .component_only = 1, | 681 | .component_only = 1, |
@@ -683,7 +683,7 @@ static const struct tv_mode tv_modes[] = { | |||
683 | .hsync_end = 64, .hblank_end = 122, | 683 | .hsync_end = 64, .hblank_end = 122, |
684 | .hblank_start = 842, .htotal = 857, | 684 | .hblank_start = 842, .htotal = 857, |
685 | 685 | ||
686 | .progressive = true,.trilevel_sync = false, | 686 | .progressive = true, .trilevel_sync = false, |
687 | 687 | ||
688 | .vsync_start_f1 = 12, .vsync_start_f2 = 12, | 688 | .vsync_start_f1 = 12, .vsync_start_f2 = 12, |
689 | .vsync_len = 12, | 689 | .vsync_len = 12, |
@@ -699,7 +699,7 @@ static const struct tv_mode tv_modes[] = { | |||
699 | }, | 699 | }, |
700 | { | 700 | { |
701 | .name = "480p@60Hz", | 701 | .name = "480p@60Hz", |
702 | .clock = 107520, | 702 | .clock = 107520, |
703 | .refresh = 60000, | 703 | .refresh = 60000, |
704 | .oversample = TV_OVERSAMPLE_4X, | 704 | .oversample = TV_OVERSAMPLE_4X, |
705 | .component_only = 1, | 705 | .component_only = 1, |
@@ -707,7 +707,7 @@ static const struct tv_mode tv_modes[] = { | |||
707 | .hsync_end = 64, .hblank_end = 122, | 707 | .hsync_end = 64, .hblank_end = 122, |
708 | .hblank_start = 842, .htotal = 856, | 708 | .hblank_start = 842, .htotal = 856, |
709 | 709 | ||
710 | .progressive = true,.trilevel_sync = false, | 710 | .progressive = true, .trilevel_sync = false, |
711 | 711 | ||
712 | .vsync_start_f1 = 12, .vsync_start_f2 = 12, | 712 | .vsync_start_f1 = 12, .vsync_start_f2 = 12, |
713 | .vsync_len = 12, | 713 | .vsync_len = 12, |
@@ -723,7 +723,7 @@ static const struct tv_mode tv_modes[] = { | |||
723 | }, | 723 | }, |
724 | { | 724 | { |
725 | .name = "576p", | 725 | .name = "576p", |
726 | .clock = 107520, | 726 | .clock = 107520, |
727 | .refresh = 50000, | 727 | .refresh = 50000, |
728 | .oversample = TV_OVERSAMPLE_4X, | 728 | .oversample = TV_OVERSAMPLE_4X, |
729 | .component_only = 1, | 729 | .component_only = 1, |
@@ -755,7 +755,7 @@ static const struct tv_mode tv_modes[] = { | |||
755 | .hsync_end = 80, .hblank_end = 300, | 755 | .hsync_end = 80, .hblank_end = 300, |
756 | .hblank_start = 1580, .htotal = 1649, | 756 | .hblank_start = 1580, .htotal = 1649, |
757 | 757 | ||
758 | .progressive = true, .trilevel_sync = true, | 758 | .progressive = true, .trilevel_sync = true, |
759 | 759 | ||
760 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, | 760 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, |
761 | .vsync_len = 10, | 761 | .vsync_len = 10, |
@@ -779,7 +779,7 @@ static const struct tv_mode tv_modes[] = { | |||
779 | .hsync_end = 80, .hblank_end = 300, | 779 | .hsync_end = 80, .hblank_end = 300, |
780 | .hblank_start = 1580, .htotal = 1651, | 780 | .hblank_start = 1580, .htotal = 1651, |
781 | 781 | ||
782 | .progressive = true, .trilevel_sync = true, | 782 | .progressive = true, .trilevel_sync = true, |
783 | 783 | ||
784 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, | 784 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, |
785 | .vsync_len = 10, | 785 | .vsync_len = 10, |
@@ -803,7 +803,7 @@ static const struct tv_mode tv_modes[] = { | |||
803 | .hsync_end = 80, .hblank_end = 300, | 803 | .hsync_end = 80, .hblank_end = 300, |
804 | .hblank_start = 1580, .htotal = 1979, | 804 | .hblank_start = 1580, .htotal = 1979, |
805 | 805 | ||
806 | .progressive = true, .trilevel_sync = true, | 806 | .progressive = true, .trilevel_sync = true, |
807 | 807 | ||
808 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, | 808 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, |
809 | .vsync_len = 10, | 809 | .vsync_len = 10, |
@@ -828,12 +828,12 @@ static const struct tv_mode tv_modes[] = { | |||
828 | .hsync_end = 88, .hblank_end = 235, | 828 | .hsync_end = 88, .hblank_end = 235, |
829 | .hblank_start = 2155, .htotal = 2639, | 829 | .hblank_start = 2155, .htotal = 2639, |
830 | 830 | ||
831 | .progressive = false, .trilevel_sync = true, | 831 | .progressive = false, .trilevel_sync = true, |
832 | 832 | ||
833 | .vsync_start_f1 = 4, .vsync_start_f2 = 5, | 833 | .vsync_start_f1 = 4, .vsync_start_f2 = 5, |
834 | .vsync_len = 10, | 834 | .vsync_len = 10, |
835 | 835 | ||
836 | .veq_ena = true, .veq_start_f1 = 4, | 836 | .veq_ena = true, .veq_start_f1 = 4, |
837 | .veq_start_f2 = 4, .veq_len = 10, | 837 | .veq_start_f2 = 4, .veq_len = 10, |
838 | 838 | ||
839 | 839 | ||
@@ -854,12 +854,12 @@ static const struct tv_mode tv_modes[] = { | |||
854 | .hsync_end = 88, .hblank_end = 235, | 854 | .hsync_end = 88, .hblank_end = 235, |
855 | .hblank_start = 2155, .htotal = 2199, | 855 | .hblank_start = 2155, .htotal = 2199, |
856 | 856 | ||
857 | .progressive = false, .trilevel_sync = true, | 857 | .progressive = false, .trilevel_sync = true, |
858 | 858 | ||
859 | .vsync_start_f1 = 4, .vsync_start_f2 = 5, | 859 | .vsync_start_f1 = 4, .vsync_start_f2 = 5, |
860 | .vsync_len = 10, | 860 | .vsync_len = 10, |
861 | 861 | ||
862 | .veq_ena = true, .veq_start_f1 = 4, | 862 | .veq_ena = true, .veq_start_f1 = 4, |
863 | .veq_start_f2 = 4, .veq_len = 10, | 863 | .veq_start_f2 = 4, .veq_len = 10, |
864 | 864 | ||
865 | 865 | ||
@@ -880,16 +880,16 @@ static const struct tv_mode tv_modes[] = { | |||
880 | .hsync_end = 88, .hblank_end = 235, | 880 | .hsync_end = 88, .hblank_end = 235, |
881 | .hblank_start = 2155, .htotal = 2201, | 881 | .hblank_start = 2155, .htotal = 2201, |
882 | 882 | ||
883 | .progressive = false, .trilevel_sync = true, | 883 | .progressive = false, .trilevel_sync = true, |
884 | 884 | ||
885 | .vsync_start_f1 = 4, .vsync_start_f2 = 5, | 885 | .vsync_start_f1 = 4, .vsync_start_f2 = 5, |
886 | .vsync_len = 10, | 886 | .vsync_len = 10, |
887 | 887 | ||
888 | .veq_ena = true, .veq_start_f1 = 4, | 888 | .veq_ena = true, .veq_start_f1 = 4, |
889 | .veq_start_f2 = 4, .veq_len = 10, | 889 | .veq_start_f2 = 4, .veq_len = 10, |
890 | 890 | ||
891 | 891 | ||
892 | .vi_end_f1 = 21, .vi_end_f2 = 22, | 892 | .vi_end_f1 = 21, .vi_end_f2 = 22, |
893 | .nbr_end = 539, | 893 | .nbr_end = 539, |
894 | 894 | ||
895 | .burst_ena = false, | 895 | .burst_ena = false, |
@@ -916,7 +916,7 @@ intel_tv_dpms(struct drm_encoder *encoder, int mode) | |||
916 | struct drm_device *dev = encoder->dev; | 916 | struct drm_device *dev = encoder->dev; |
917 | struct drm_i915_private *dev_priv = dev->dev_private; | 917 | struct drm_i915_private *dev_priv = dev->dev_private; |
918 | 918 | ||
919 | switch(mode) { | 919 | switch (mode) { |
920 | case DRM_MODE_DPMS_ON: | 920 | case DRM_MODE_DPMS_ON: |
921 | I915_WRITE(TV_CTL, I915_READ(TV_CTL) | TV_ENC_ENABLE); | 921 | I915_WRITE(TV_CTL, I915_READ(TV_CTL) | TV_ENC_ENABLE); |
922 | break; | 922 | break; |
@@ -933,7 +933,7 @@ intel_tv_mode_lookup(const char *tv_format) | |||
933 | { | 933 | { |
934 | int i; | 934 | int i; |
935 | 935 | ||
936 | for (i = 0; i < sizeof(tv_modes) / sizeof (tv_modes[0]); i++) { | 936 | for (i = 0; i < sizeof(tv_modes) / sizeof(tv_modes[0]); i++) { |
937 | const struct tv_mode *tv_mode = &tv_modes[i]; | 937 | const struct tv_mode *tv_mode = &tv_modes[i]; |
938 | 938 | ||
939 | if (!strcmp(tv_format, tv_mode->name)) | 939 | if (!strcmp(tv_format, tv_mode->name)) |
@@ -1128,7 +1128,7 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, | |||
1128 | if (color_conversion) { | 1128 | if (color_conversion) { |
1129 | I915_WRITE(TV_CSC_Y, (color_conversion->ry << 16) | | 1129 | I915_WRITE(TV_CSC_Y, (color_conversion->ry << 16) | |
1130 | color_conversion->gy); | 1130 | color_conversion->gy); |
1131 | I915_WRITE(TV_CSC_Y2,(color_conversion->by << 16) | | 1131 | I915_WRITE(TV_CSC_Y2, (color_conversion->by << 16) | |
1132 | color_conversion->ay); | 1132 | color_conversion->ay); |
1133 | I915_WRITE(TV_CSC_U, (color_conversion->ru << 16) | | 1133 | I915_WRITE(TV_CSC_U, (color_conversion->ru << 16) | |
1134 | color_conversion->gu); | 1134 | color_conversion->gu); |
@@ -1232,7 +1232,7 @@ static const struct drm_display_mode reported_modes[] = { | |||
1232 | * \return false if TV is disconnected. | 1232 | * \return false if TV is disconnected. |
1233 | */ | 1233 | */ |
1234 | static int | 1234 | static int |
1235 | intel_tv_detect_type (struct intel_tv *intel_tv, | 1235 | intel_tv_detect_type(struct intel_tv *intel_tv, |
1236 | struct drm_connector *connector) | 1236 | struct drm_connector *connector) |
1237 | { | 1237 | { |
1238 | struct drm_encoder *encoder = &intel_tv->base.base; | 1238 | struct drm_encoder *encoder = &intel_tv->base.base; |
@@ -1486,7 +1486,7 @@ intel_tv_get_modes(struct drm_connector *connector) | |||
1486 | } | 1486 | } |
1487 | 1487 | ||
1488 | static void | 1488 | static void |
1489 | intel_tv_destroy (struct drm_connector *connector) | 1489 | intel_tv_destroy(struct drm_connector *connector) |
1490 | { | 1490 | { |
1491 | drm_sysfs_connector_remove(connector); | 1491 | drm_sysfs_connector_remove(connector); |
1492 | drm_connector_cleanup(connector); | 1492 | drm_connector_cleanup(connector); |