openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: duplicate desired mode for use by fbcon. 

duplicate the mode into fbcon storage, so when we free modes later
we don't just lose this.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2009-04-22 18:52:14 +10:00 committed by Dave Airlie
parent c5c07550d4
commit 7ff145593d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_display.c
View File

@ -2310,6 +2310,8 @@ static void intel_crtc_destroy(struct drm_crtc *crtc)
{ {
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
if (intel_crtc->mode_set.mode)
drm_mode_destroy(crtc->dev, intel_crtc->mode_set.mode);
drm_crtc_cleanup(crtc); drm_crtc_cleanup(crtc);
kfree(intel_crtc); kfree(intel_crtc);
} }

16
drivers/gpu/drm/i915/intel_fb.c
View File

@ -674,8 +674,12 @@ static int intelfb_multi_fb_probe_crtc(struct drm_device *dev, struct drm_crtc *
par->crtc_ids[0] = crtc->base.id; par->crtc_ids[0] = crtc->base.id;
modeset->num_connectors = conn_count; modeset->num_connectors = conn_count;
if (modeset->mode != modeset->crtc->desired_mode) if (modeset->crtc->desired_mode) {
modeset->mode = modeset->crtc->desired_mode; if (modeset->mode)
drm_mode_destroy(dev, modeset->mode);
modeset->mode = drm_mode_duplicate(dev,
modeset->crtc->desired_mode);
}
par->crtc_count = 1; par->crtc_count = 1;
@ -824,8 +828,12 @@ static int intelfb_single_fb_probe(struct drm_device *dev)
par->crtc_ids[crtc_count++] = crtc->base.id; par->crtc_ids[crtc_count++] = crtc->base.id;
modeset->num_connectors = conn_count; modeset->num_connectors = conn_count;
if (modeset->mode != modeset->crtc->desired_mode) if (modeset->crtc->desired_mode) {
modeset->mode = modeset->crtc->desired_mode; if (modeset->mode)
drm_mode_destroy(dev, modeset->mode);
modeset->mode = drm_mode_duplicate(dev,
modeset->crtc->desired_mode);
}
} }
par->crtc_count = crtc_count; par->crtc_count = crtc_count;