diff options
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_cursor.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_dvo.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hda.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hdmi.c | 17 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hqvdp.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_mixer.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_tvout.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_vid.c | 5 |
8 files changed, 17 insertions, 25 deletions
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c index cca75bddb9ad..cd35b9d9de26 100644 --- a/drivers/gpu/drm/sti/sti_cursor.c +++ b/drivers/gpu/drm/sti/sti_cursor.c | |||
| @@ -121,8 +121,7 @@ static int cursor_dbg_show(struct seq_file *s, void *data) | |||
| 121 | cursor_dbg_cml(s, cursor, readl(cursor->regs + CUR_CML)); | 121 | cursor_dbg_cml(s, cursor, readl(cursor->regs + CUR_CML)); |
| 122 | DBGFS_DUMP(CUR_AWS); | 122 | DBGFS_DUMP(CUR_AWS); |
| 123 | DBGFS_DUMP(CUR_AWE); | 123 | DBGFS_DUMP(CUR_AWE); |
| 124 | seq_puts(s, "\n"); | 124 | seq_putc(s, '\n'); |
| 125 | |||
| 126 | return 0; | 125 | return 0; |
| 127 | } | 126 | } |
| 128 | 127 | ||
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c index bb23318a44b7..24ebc6b2f34d 100644 --- a/drivers/gpu/drm/sti/sti_dvo.c +++ b/drivers/gpu/drm/sti/sti_dvo.c | |||
| @@ -186,8 +186,7 @@ static int dvo_dbg_show(struct seq_file *s, void *data) | |||
| 186 | DBGFS_DUMP(DVO_LUT_PROG_MID); | 186 | DBGFS_DUMP(DVO_LUT_PROG_MID); |
| 187 | DBGFS_DUMP(DVO_LUT_PROG_HIGH); | 187 | DBGFS_DUMP(DVO_LUT_PROG_HIGH); |
| 188 | dvo_dbg_awg_microcode(s, dvo->regs + DVO_DIGSYNC_INSTR_I); | 188 | dvo_dbg_awg_microcode(s, dvo->regs + DVO_DIGSYNC_INSTR_I); |
| 189 | seq_puts(s, "\n"); | 189 | seq_putc(s, '\n'); |
| 190 | |||
| 191 | return 0; | 190 | return 0; |
| 192 | } | 191 | } |
| 193 | 192 | ||
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index e3475a17eaeb..d6ed909d9d75 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c | |||
| @@ -354,8 +354,7 @@ static int hda_dbg_show(struct seq_file *s, void *data) | |||
| 354 | hda_dbg_awg_microcode(s, hda->regs + HDA_SYNC_AWGI); | 354 | hda_dbg_awg_microcode(s, hda->regs + HDA_SYNC_AWGI); |
| 355 | if (hda->video_dacs_ctrl) | 355 | if (hda->video_dacs_ctrl) |
| 356 | hda_dbg_video_dacs_ctrl(s, hda->video_dacs_ctrl); | 356 | hda_dbg_video_dacs_ctrl(s, hda->video_dacs_ctrl); |
| 357 | seq_puts(s, "\n"); | 357 | seq_putc(s, '\n'); |
| 358 | |||
| 359 | return 0; | 358 | return 0; |
| 360 | } | 359 | } |
| 361 | 360 | ||
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index f8aa72a432c5..d824497e950e 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c | |||
| @@ -592,7 +592,7 @@ static void hdmi_dbg_cfg(struct seq_file *s, int val) | |||
| 592 | { | 592 | { |
| 593 | int tmp; | 593 | int tmp; |
| 594 | 594 | ||
| 595 | seq_puts(s, "\t"); | 595 | seq_putc(s, '\t'); |
| 596 | tmp = val & HDMI_CFG_HDMI_NOT_DVI; | 596 | tmp = val & HDMI_CFG_HDMI_NOT_DVI; |
| 597 | DBGFS_PRINT_STR("mode:", tmp ? "HDMI" : "DVI"); | 597 | DBGFS_PRINT_STR("mode:", tmp ? "HDMI" : "DVI"); |
| 598 | seq_puts(s, "\t\t\t\t\t"); | 598 | seq_puts(s, "\t\t\t\t\t"); |
| @@ -616,7 +616,7 @@ static void hdmi_dbg_sta(struct seq_file *s, int val) | |||
| 616 | { | 616 | { |
| 617 | int tmp; | 617 | int tmp; |
| 618 | 618 | ||
| 619 | seq_puts(s, "\t"); | 619 | seq_putc(s, '\t'); |
| 620 | tmp = (val & HDMI_STA_DLL_LCK); | 620 | tmp = (val & HDMI_STA_DLL_LCK); |
| 621 | DBGFS_PRINT_STR("pll:", tmp ? "locked" : "not locked"); | 621 | DBGFS_PRINT_STR("pll:", tmp ? "locked" : "not locked"); |
| 622 | seq_puts(s, "\t\t\t\t\t"); | 622 | seq_puts(s, "\t\t\t\t\t"); |
| @@ -632,7 +632,7 @@ static void hdmi_dbg_sw_di_cfg(struct seq_file *s, int val) | |||
| 632 | "once every field", | 632 | "once every field", |
| 633 | "once every frame"}; | 633 | "once every frame"}; |
| 634 | 634 | ||
| 635 | seq_puts(s, "\t"); | 635 | seq_putc(s, '\t'); |
| 636 | tmp = (val & HDMI_IFRAME_CFG_DI_N(HDMI_IFRAME_MASK, 1)); | 636 | tmp = (val & HDMI_IFRAME_CFG_DI_N(HDMI_IFRAME_MASK, 1)); |
| 637 | DBGFS_PRINT_STR("Data island 1:", en_di[tmp]); | 637 | DBGFS_PRINT_STR("Data island 1:", en_di[tmp]); |
| 638 | seq_puts(s, "\t\t\t\t\t"); | 638 | seq_puts(s, "\t\t\t\t\t"); |
| @@ -664,16 +664,16 @@ static int hdmi_dbg_show(struct seq_file *s, void *data) | |||
| 664 | DBGFS_DUMP("\n", HDMI_STA); | 664 | DBGFS_DUMP("\n", HDMI_STA); |
| 665 | hdmi_dbg_sta(s, hdmi_read(hdmi, HDMI_STA)); | 665 | hdmi_dbg_sta(s, hdmi_read(hdmi, HDMI_STA)); |
| 666 | DBGFS_DUMP("", HDMI_ACTIVE_VID_XMIN); | 666 | DBGFS_DUMP("", HDMI_ACTIVE_VID_XMIN); |
| 667 | seq_puts(s, "\t"); | 667 | seq_putc(s, '\t'); |
| 668 | DBGFS_PRINT_INT("Xmin:", hdmi_read(hdmi, HDMI_ACTIVE_VID_XMIN)); | 668 | DBGFS_PRINT_INT("Xmin:", hdmi_read(hdmi, HDMI_ACTIVE_VID_XMIN)); |
| 669 | DBGFS_DUMP("", HDMI_ACTIVE_VID_XMAX); | 669 | DBGFS_DUMP("", HDMI_ACTIVE_VID_XMAX); |
| 670 | seq_puts(s, "\t"); | 670 | seq_putc(s, '\t'); |
| 671 | DBGFS_PRINT_INT("Xmax:", hdmi_read(hdmi, HDMI_ACTIVE_VID_XMAX)); | 671 | DBGFS_PRINT_INT("Xmax:", hdmi_read(hdmi, HDMI_ACTIVE_VID_XMAX)); |
| 672 | DBGFS_DUMP("", HDMI_ACTIVE_VID_YMIN); | 672 | DBGFS_DUMP("", HDMI_ACTIVE_VID_YMIN); |
| 673 | seq_puts(s, "\t"); | 673 | seq_putc(s, '\t'); |
| 674 | DBGFS_PRINT_INT("Ymin:", hdmi_read(hdmi, HDMI_ACTIVE_VID_YMIN)); | 674 | DBGFS_PRINT_INT("Ymin:", hdmi_read(hdmi, HDMI_ACTIVE_VID_YMIN)); |
| 675 | DBGFS_DUMP("", HDMI_ACTIVE_VID_YMAX); | 675 | DBGFS_DUMP("", HDMI_ACTIVE_VID_YMAX); |
| 676 | seq_puts(s, "\t"); | 676 | seq_putc(s, '\t'); |
| 677 | DBGFS_PRINT_INT("Ymax:", hdmi_read(hdmi, HDMI_ACTIVE_VID_YMAX)); | 677 | DBGFS_PRINT_INT("Ymax:", hdmi_read(hdmi, HDMI_ACTIVE_VID_YMAX)); |
| 678 | DBGFS_DUMP("", HDMI_SW_DI_CFG); | 678 | DBGFS_DUMP("", HDMI_SW_DI_CFG); |
| 679 | hdmi_dbg_sw_di_cfg(s, hdmi_read(hdmi, HDMI_SW_DI_CFG)); | 679 | hdmi_dbg_sw_di_cfg(s, hdmi_read(hdmi, HDMI_SW_DI_CFG)); |
| @@ -712,8 +712,7 @@ static int hdmi_dbg_show(struct seq_file *s, void *data) | |||
| 712 | DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD4, HDMI_IFRAME_SLOT_VENDOR); | 712 | DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD4, HDMI_IFRAME_SLOT_VENDOR); |
| 713 | DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD5, HDMI_IFRAME_SLOT_VENDOR); | 713 | DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD5, HDMI_IFRAME_SLOT_VENDOR); |
| 714 | DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD6, HDMI_IFRAME_SLOT_VENDOR); | 714 | DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD6, HDMI_IFRAME_SLOT_VENDOR); |
| 715 | seq_puts(s, "\n"); | 715 | seq_putc(s, '\n'); |
| 716 | |||
| 717 | return 0; | 716 | return 0; |
| 718 | } | 717 | } |
| 719 | 718 | ||
diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c index 66f843148ef7..372ea294da80 100644 --- a/drivers/gpu/drm/sti/sti_hqvdp.c +++ b/drivers/gpu/drm/sti/sti_hqvdp.c | |||
| @@ -625,8 +625,7 @@ static int hqvdp_dbg_show(struct seq_file *s, void *data) | |||
| 625 | hqvdp_dbg_dump_cmd(s, (struct sti_hqvdp_cmd *)virt); | 625 | hqvdp_dbg_dump_cmd(s, (struct sti_hqvdp_cmd *)virt); |
| 626 | } | 626 | } |
| 627 | 627 | ||
| 628 | seq_puts(s, "\n"); | 628 | seq_putc(s, '\n'); |
| 629 | |||
| 630 | return 0; | 629 | return 0; |
| 631 | } | 630 | } |
| 632 | 631 | ||
diff --git a/drivers/gpu/drm/sti/sti_mixer.c b/drivers/gpu/drm/sti/sti_mixer.c index 4ddc58f7fe2e..2bd1d46fe1cd 100644 --- a/drivers/gpu/drm/sti/sti_mixer.c +++ b/drivers/gpu/drm/sti/sti_mixer.c | |||
| @@ -162,8 +162,7 @@ static int mixer_dbg_show(struct seq_file *s, void *arg) | |||
| 162 | DBGFS_DUMP(GAM_MIXER_MBP); | 162 | DBGFS_DUMP(GAM_MIXER_MBP); |
| 163 | DBGFS_DUMP(GAM_MIXER_MX0); | 163 | DBGFS_DUMP(GAM_MIXER_MX0); |
| 164 | mixer_dbg_mxn(s, mixer->regs + GAM_MIXER_MX0); | 164 | mixer_dbg_mxn(s, mixer->regs + GAM_MIXER_MX0); |
| 165 | seq_puts(s, "\n"); | 165 | seq_putc(s, '\n'); |
| 166 | |||
| 167 | return 0; | 166 | return 0; |
| 168 | } | 167 | } |
| 169 | 168 | ||
diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c index 8b8ea717c121..63b982048743 100644 --- a/drivers/gpu/drm/sti/sti_tvout.c +++ b/drivers/gpu/drm/sti/sti_tvout.c | |||
| @@ -459,7 +459,7 @@ static void tvout_dbg_vip(struct seq_file *s, int val) | |||
| 459 | "Aux (color matrix by-passed)", | 459 | "Aux (color matrix by-passed)", |
| 460 | "", "", "", "", "", "Force value"}; | 460 | "", "", "", "", "", "Force value"}; |
| 461 | 461 | ||
| 462 | seq_puts(s, "\t"); | 462 | seq_putc(s, '\t'); |
| 463 | mask = TVO_VIP_REORDER_MASK << TVO_VIP_REORDER_R_SHIFT; | 463 | mask = TVO_VIP_REORDER_MASK << TVO_VIP_REORDER_R_SHIFT; |
| 464 | r = (val & mask) >> TVO_VIP_REORDER_R_SHIFT; | 464 | r = (val & mask) >> TVO_VIP_REORDER_R_SHIFT; |
| 465 | mask = TVO_VIP_REORDER_MASK << TVO_VIP_REORDER_G_SHIFT; | 465 | mask = TVO_VIP_REORDER_MASK << TVO_VIP_REORDER_G_SHIFT; |
| @@ -558,8 +558,7 @@ static int tvout_dbg_show(struct seq_file *s, void *data) | |||
| 558 | DBGFS_DUMP(TVO_CSC_AUX_M6); | 558 | DBGFS_DUMP(TVO_CSC_AUX_M6); |
| 559 | DBGFS_DUMP(TVO_CSC_AUX_M7); | 559 | DBGFS_DUMP(TVO_CSC_AUX_M7); |
| 560 | DBGFS_DUMP(TVO_AUX_IN_VID_FORMAT); | 560 | DBGFS_DUMP(TVO_AUX_IN_VID_FORMAT); |
| 561 | seq_puts(s, "\n"); | 561 | seq_putc(s, '\n'); |
| 562 | |||
| 563 | return 0; | 562 | return 0; |
| 564 | } | 563 | } |
| 565 | 564 | ||
diff --git a/drivers/gpu/drm/sti/sti_vid.c b/drivers/gpu/drm/sti/sti_vid.c index 2ad59892b57e..577a3341d3c1 100644 --- a/drivers/gpu/drm/sti/sti_vid.c +++ b/drivers/gpu/drm/sti/sti_vid.c | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | static void vid_dbg_ctl(struct seq_file *s, int val) | 61 | static void vid_dbg_ctl(struct seq_file *s, int val) |
| 62 | { | 62 | { |
| 63 | val = val >> 30; | 63 | val = val >> 30; |
| 64 | seq_puts(s, "\t"); | 64 | seq_putc(s, '\t'); |
| 65 | 65 | ||
| 66 | if (!(val & 1)) | 66 | if (!(val & 1)) |
| 67 | seq_puts(s, "NOT "); | 67 | seq_puts(s, "NOT "); |
| @@ -114,8 +114,7 @@ static int vid_dbg_show(struct seq_file *s, void *arg) | |||
| 114 | DBGFS_DUMP(VID_BC); | 114 | DBGFS_DUMP(VID_BC); |
| 115 | DBGFS_DUMP(VID_TINT); | 115 | DBGFS_DUMP(VID_TINT); |
| 116 | DBGFS_DUMP(VID_CSAT); | 116 | DBGFS_DUMP(VID_CSAT); |
| 117 | seq_puts(s, "\n"); | 117 | seq_putc(s, '\n'); |
| 118 | |||
| 119 | return 0; | 118 | return 0; |
| 120 | } | 119 | } |
| 121 | 120 | ||
