Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ff14559 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>
parent c5c07550

drivers/gpu/drm/i915/intel_display.c

+2 −0
Original line number Diff line number Diff line
@@ -2310,6 +2310,8 @@ static void intel_crtc_destroy(struct drm_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);

	kfree(intel_crtc);

}

drivers/gpu/drm/i915/intel_fb.c

+12 −4
Original line number Diff line number Diff line
@@ -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;



	modeset->num_connectors = conn_count;

	if (modeset->mode != modeset->crtc->desired_mode)

		modeset->mode = modeset->crtc->desired_mode;

	if (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;
@@ -824,8 +828,12 @@ static int intelfb_single_fb_probe(struct drm_device *dev) 
		par->crtc_ids[crtc_count++] = crtc->base.id;



		modeset->num_connectors = conn_count;

		if (modeset->mode != modeset->crtc->desired_mode)

			modeset->mode = modeset->crtc->desired_mode;

		if (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;