diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-04-12 00:15:47 +0200 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2008-04-12 00:15:47 +0200 |
| commit | 6cc2d7e7ae92bbac630d0053fc214521ce610dc6 (patch) | |
| tree | d222f8edd276d7dea539111118b7c703153ae7a1 /linux-core/intel_lvds.c | |
| parent | 5891b0bd2ae441d738e78737a4c4826bd2e60b43 (diff) | |
| parent | 3b32ee36ae58f733f281a2fa569ea8a8a926bb6d (diff) | |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'linux-core/intel_lvds.c')
| -rw-r--r-- | linux-core/intel_lvds.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/linux-core/intel_lvds.c b/linux-core/intel_lvds.c index 80f77af6..92a1d600 100644 --- a/linux-core/intel_lvds.c +++ b/linux-core/intel_lvds.c @@ -298,24 +298,15 @@ static int intel_lvds_get_modes(struct drm_output *output) if (ret) return ret; - /* Didn't get an EDID */ - if (!output->monitor_info) { - struct drm_display_info *dspinfo; - dspinfo = kzalloc(sizeof(*output->monitor_info), GFP_KERNEL); - if (!dspinfo) - goto out; - - /* Set wide sync ranges so we get all modes - * handed to valid_mode for checking - */ - dspinfo->min_vfreq = 0; - dspinfo->max_vfreq = 200; - dspinfo->min_hfreq = 0; - dspinfo->max_hfreq = 200; - output->monitor_info = dspinfo; - } + /* Didn't get an EDID, so + * Set wide sync ranges so we get all modes + * handed to valid_mode for checking + */ + output->display_info.min_vfreq = 0; + output->display_info.max_vfreq = 200; + output->display_info.min_hfreq = 0; + output->display_info.max_hfreq = 200; -out: if (dev_priv->panel_fixed_mode != NULL) { struct drm_display_mode *mode = drm_mode_duplicate(dev, dev_priv->panel_fixed_mode); @@ -385,7 +376,7 @@ void intel_lvds_init(struct drm_device *dev) intel_output->type = INTEL_OUTPUT_LVDS; output->driver_private = intel_output; - output->subpixel_order = SubPixelHorizontalRGB; + output->display_info.subpixel_order = SubPixelHorizontalRGB; output->interlace_allowed = FALSE; output->doublescan_allowed = FALSE; @@ -500,6 +491,7 @@ void intel_lvds_init(struct drm_device *dev) #endif out: + drm_sysfs_output_add(output); drm_output_attach_property(output, dev->mode_config.connector_type_property, ConnectorLVDS); return; |