← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/nouveau/nv04_dfp.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/nouveau/nv04_dfp.c
581
581
        int head = nv_encoder->restore.head;
582
582
 
583
583
        if (nv_encoder->dcb->type == OUTPUT_LVDS) {
584
 
                struct drm_display_mode *native_mode = nouveau_encoder_connector_get(nv_encoder)->native_mode;
585
 
                if (native_mode)
586
 
                        call_lvds_script(dev, nv_encoder->dcb, head, LVDS_PANEL_ON,
587
 
                                         native_mode->clock);
588
 
                else
589
 
                        NV_ERROR(dev, "Not restoring LVDS without native mode\n");
 
584
                struct nouveau_connector *connector =
 
585
                        nouveau_encoder_connector_get(nv_encoder);
 
586
 
 
587
                if (connector && connector->native_mode)
 
588
                        call_lvds_script(dev, nv_encoder->dcb, head,
 
589
                                         LVDS_PANEL_ON,
 
590
                                         connector->native_mode->clock);
590
591
 
591
592
        } else if (nv_encoder->dcb->type == OUTPUT_TMDS) {
592
593
                int clock = nouveau_hw_pllvals_to_clk