← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/drm_crtc_helper.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-03-30 09:03:19 UTC
  • Revision ID: package-import@ubuntu.com-20120330090319-5445yb1865swhoiv
Tags: 3.2.0-21.29
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-21.34

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-21.34

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/drm_crtc_helper.c
36
36
#include "drm_crtc.h"
37
37
#include "drm_crtc_helper.h"
38
38
#include "drm_fb_helper.h"
 
39
#include "drm_edid.h"
39
40
 
40
41
static bool drm_kms_helper_poll = true;
41
42
module_param_named(poll, drm_kms_helper_poll, bool, 0600);
117
118
                goto prune;
118
119
        }
119
120
 
120
 
        count = (*connector_funcs->get_modes)(connector);
 
121
#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
 
122
        count = drm_load_edid_firmware(connector);
 
123
        if (count == 0)
 
124
#endif
 
125
                count = (*connector_funcs->get_modes)(connector);
 
126
 
121
127
        if (count == 0 && connector->status == connector_status_connected)
122
128
                count = drm_add_modes_noedid(connector, 1024, 768);
123
129
        if (count == 0)