diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2013-06-24 14:36:07 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2013-06-24 14:36:07 +0200 |
| commit | 61a50f833622ce901054b32c332c4e168ced4c98 (patch) | |
| tree | e989adad6fd3580301c6e60980549cb15505e403 | |
| parent | f2af41568dfd412e16a2f1258363872a07e25a96 (diff) | |
| parent | 620823e2f6a11e2e8eb417b54fb4599cbc0e4707 (diff) | |
Merge branch 'colibri' of git.toradex.com:linux-toradex into colibriT30_LinuxImageV2.0Beta2_20130626Apalis_T30_LinuxImageV2.0Beta1_20130626
| -rw-r--r-- | drivers/video/tegra/fb.c | 5 | ||||
| -rw-r--r-- | sound/pci/hda/hda_eld.c | 6 | ||||
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index f69048f62cc2..cf836dd59ab5 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -143,6 +143,11 @@ static int tegra_fb_set_par(struct fb_info *info) fb_var_to_videomode(&m, var); +#if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_COLIBRI_T30) + /* Hack: avoid 24 Hz mode in X resulting in no display at all */ + if (m.refresh < 50) m.refresh = 60; +#endif /* CONFIG_MACH_APALIS_T30 | CONFIG_MACH_COLIBRI_T30 */ + /* Load framebuffer info with new mode details*/ old_mode = info->mode; old_len = info->fix.line_length; diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index 862dd35260d0..e46cc984f9de 100644 --- a/sound/pci/hda/hda_eld.c +++ b/sound/pci/hda/hda_eld.c @@ -480,7 +480,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a) else buf2[0] = '\0'; - printk(KERN_INFO "HDMI: supports coding type %s:" + printk(KERN_DEBUG "HDMI: supports coding type %s:" " channels = %d, rates =%s%s\n", cea_audio_coding_type_names[a->format], a->channels, @@ -504,14 +504,14 @@ void snd_hdmi_show_eld(struct hdmi_eld *e) { int i; - printk(KERN_INFO "HDMI: detected monitor %s at connection type %s\n", + printk(KERN_DEBUG "HDMI: detected monitor %s at connection type %s\n", e->monitor_name, eld_connection_type_names[e->conn_type]); if (e->spk_alloc) { char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf)); - printk(KERN_INFO "HDMI: available speakers:%s\n", buf); + printk(KERN_DEBUG "HDMI: available speakers:%s\n", buf); } for (i = 0; i < e->sad_count; i++) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 5942395099ad..ac509cd68f6f 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -702,7 +702,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) int pin_idx; struct hdmi_eld *eld; - printk(KERN_INFO + printk(KERN_DEBUG "HDMI hot plug event: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n", codec->addr, pin_nid, pd, eldv); @@ -952,7 +952,7 @@ static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid, if (eld->monitor_present) eld_valid = !!(present & AC_PINSENSE_ELDV); - printk(KERN_INFO + printk(KERN_DEBUG "HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n", codec->addr, pin_nid, eld->monitor_present, eld_valid); |