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

Commit 36750f28 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915: update plane state during init 



Atomic planes updates rely on having a accurate plane_mask.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 85a96e7a

drivers/gpu/drm/i915/intel_display.c

+4 −2
Original line number Diff line number Diff line
@@ -2632,9 +2632,9 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, 
		dev_priv->preserve_bios_swizzle = true;



	primary->fb = fb;

	primary->state->crtc = &intel_crtc->base;

	primary->crtc = &intel_crtc->base;

	primary->crtc = primary->state->crtc = &intel_crtc->base;

	update_state_fb(primary);

	intel_crtc->base.state->plane_mask |= (1 << drm_plane_index(primary));

	obj->frontbuffer_bits |= INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);

}
@@ -15563,7 +15563,9 @@ void intel_modeset_gem_init(struct drm_device *dev) 
				  to_intel_crtc(c)->pipe);

			drm_framebuffer_unreference(c->primary->fb);

			c->primary->fb = NULL;

			c->primary->crtc = c->primary->state->crtc = NULL;

			update_state_fb(c->primary);

			c->state->plane_mask &= ~(1 << drm_plane_index(c->primary));

		}

	}