diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-10 10:45:55 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-10 10:45:55 -0700 |
| commit | 44a8761302888080f1cb6596d4573d88c1746da4 (patch) | |
| tree | 851220ca0bdcd7677eda5ea796a4eb5a670bf406 /linux-core/intel_lvds.c | |
| parent | e114b981bc291049fa6996d487334a408acc1ce2 (diff) | |
| parent | 50672adb3142abca743535a8e60c360ef47b2a08 (diff) | |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts:
linux-core/drm_crtc.c - trivial merge
linux-core/drm_crtc.h - trivial merge
linux-core/intel_display.c - crtc_config -> mode_config
shared-core/i915_dma.c - accommodate new init code in i915_init.c
Diffstat (limited to 'linux-core/intel_lvds.c')
| -rw-r--r-- | linux-core/intel_lvds.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux-core/intel_lvds.c b/linux-core/intel_lvds.c index 4638fb30..90a26109 100644 --- a/linux-core/intel_lvds.c +++ b/linux-core/intel_lvds.c @@ -164,15 +164,15 @@ static bool intel_lvds_mode_fixup(struct drm_output *output, struct intel_crtc *intel_crtc = output->crtc->driver_private; struct drm_output *tmp_output; - spin_lock(&dev->crtc_config.config_lock); - list_for_each_entry(tmp_output, &dev->crtc_config.output_list, head) { + spin_lock(&dev->mode_config.config_lock); + list_for_each_entry(tmp_output, &dev->mode_config.output_list, head) { if (tmp_output != output && tmp_output->crtc == output->crtc) { printk(KERN_ERR "Can't enable LVDS and another " "output on the same pipe\n"); return false; } } - spin_lock(&dev->crtc_config.config_lock); + spin_lock(&dev->mode_config.config_lock); if (intel_crtc->pipe == 0) { printk(KERN_ERR "Can't support LVDS on pipe A\n"); @@ -380,10 +380,10 @@ void intel_lvds_init(struct drm_device *dev) if (!dev_priv->panel_fixed_mode) { u32 lvds = I915_READ(LVDS); int pipe = (lvds & LVDS_PIPEB_SELECT) ? 1 : 0; - struct drm_crtc_config *crtc_config = &dev->crtc_config; + struct drm_mode_config *mode_config = &dev->mode_config; struct drm_crtc *crtc; /* FIXME: need drm_crtc_from_pipe */ - //crtc = drm_crtc_from_pipe(crtc_config, pipe); + //crtc = drm_crtc_from_pipe(mode_config, pipe); if (lvds & LVDS_PORT_EN && 0) { dev_priv->panel_fixed_mode = |