← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to drivers/video/omap2/dss/overlay.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/video/omap2/dss/overlay.c
679
679
                        lcd2_mgr->set_device(lcd2_mgr, dssdev);
680
680
                        mgr = lcd2_mgr;
681
681
                }
682
 
        } else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) {
 
682
        } else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC
 
683
                        && dssdev->type != OMAP_DISPLAY_TYPE_HDMI) {
683
684
                if (!lcd_mgr->device || force) {
684
685
                        if (lcd_mgr->device)
685
686
                                lcd_mgr->unset_device(lcd_mgr);
688
689
                }
689
690
        }
690
691
 
691
 
        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
 
692
        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
 
693
                        || dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
692
694
                if (!tv_mgr->device || force) {
693
695
                        if (tv_mgr->device)
694
696
                                tv_mgr->unset_device(tv_mgr);