diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-16 01:33:21 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-16 01:33:21 -0400 |
| commit | c91925db4925ba0d145478f02c093369196936e9 (patch) | |
| tree | 0e5da4211de3c18b65337c3094ec15994cf2534a /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | 977ddd6b2e63716cfefe669bbdb30ec0bcea1fe4 (diff) | |
| parent | 3894335876a6257ac46e14845bd37ae6fb0f7c87 (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index b819c1081147..4fbb0165b26f 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
| @@ -875,8 +875,6 @@ void intel_lvds_init(struct drm_device *dev) | |||
| 875 | 875 | ||
| 876 | intel_encoder->clone_mask = (1 << INTEL_LVDS_CLONE_BIT); | 876 | intel_encoder->clone_mask = (1 << INTEL_LVDS_CLONE_BIT); |
| 877 | intel_encoder->crtc_mask = (1 << 1); | 877 | intel_encoder->crtc_mask = (1 << 1); |
| 878 | if (IS_I965G(dev)) | ||
| 879 | intel_encoder->crtc_mask |= (1 << 0); | ||
| 880 | drm_encoder_helper_add(encoder, &intel_lvds_helper_funcs); | 878 | drm_encoder_helper_add(encoder, &intel_lvds_helper_funcs); |
| 881 | drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs); | 879 | drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs); |
| 882 | connector->display_info.subpixel_order = SubPixelHorizontalRGB; | 880 | connector->display_info.subpixel_order = SubPixelHorizontalRGB; |