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

Commit cd202f69 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Remove some post-commit members from intel_crtc->atomic, v3. 



fb_bits is useful to have in the crtc_state for cs flips when
the code is updated to use intel_frontbuffer_flip_prepare/complete.
So calculate it in advance and move it to crtc_state. The other stuff
can be calculated in post_plane_update, and aren't useful elsewhere.

Changes since v1:
- Changing wording, remove comment about loop.
Changes since v2:
- Rebase.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1457516145-32117-1-git-send-email-maarten.lankhorst@linux.intel.com
parent 31fa6840

drivers/gpu/drm/i915/intel_atomic.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) 
	crtc_state->update_wm_post = false;

	crtc_state->fb_changed = false;

	crtc_state->wm.need_postvbl_update = false;

	crtc_state->fb_bits = 0;



	return &crtc_state->base;

}

drivers/gpu/drm/i915/intel_display.c

+21 −8
Original line number Diff line number Diff line
@@ -4669,14 +4669,20 @@ intel_pre_disable_primary_noatomic(struct drm_crtc *crtc) 
	}

}



static void intel_post_plane_update(struct intel_crtc *crtc)

static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);

	struct drm_atomic_state *old_state = old_crtc_state->base.state;

	struct intel_crtc_atomic_commit *atomic = &crtc->atomic;

	struct intel_crtc_state *pipe_config =

		to_intel_crtc_state(crtc->base.state);

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_plane *primary = crtc->base.primary;

	struct drm_plane_state *old_pri_state =

		drm_atomic_get_existing_plane_state(old_state, primary);



	intel_frontbuffer_flip(dev, atomic->fb_bits);

	intel_frontbuffer_flip(dev, pipe_config->fb_bits);



	crtc->wm.cxsr_allowed = true;
@@ -4686,8 +4692,17 @@ static void intel_post_plane_update(struct intel_crtc *crtc) 
	if (atomic->update_fbc)

		intel_fbc_post_update(crtc);



	if (atomic->post_enable_primary)

	if (old_pri_state) {

		struct intel_plane_state *primary_state =

			to_intel_plane_state(primary->state);

		struct intel_plane_state *old_primary_state =

			to_intel_plane_state(old_pri_state);



		if (primary_state->visible &&

		    (needs_modeset(&pipe_config->base) ||

		     !old_primary_state->visible))

			intel_post_enable_primary(&crtc->base);

	}



	memset(atomic, 0, sizeof(*atomic));

}
@@ -11830,12 +11845,10 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, 
		to_intel_crtc_state(crtc_state)->wm.need_postvbl_update = true;



	if (visible || was_visible)

		intel_crtc->atomic.fb_bits |=

			to_intel_plane(plane)->frontbuffer_bit;

		pipe_config->fb_bits |= to_intel_plane(plane)->frontbuffer_bit;



	switch (plane->type) {

	case DRM_PLANE_TYPE_PRIMARY:

		intel_crtc->atomic.post_enable_primary = turn_on;

		intel_crtc->atomic.update_fbc = true;



		break;
@@ -13625,7 +13638,7 @@ static int intel_atomic_commit(struct drm_device *dev, 
		intel_atomic_wait_for_vblanks(dev, dev_priv, crtc_vblank_mask);



	for_each_crtc_in_state(state, crtc, old_crtc_state, i) {

		intel_post_plane_update(to_intel_crtc(crtc));

		intel_post_plane_update(to_intel_crtc_state(old_crtc_state));



		if (put_domains[i])

			modeset_put_power_domains(dev_priv, put_domains[i]);

drivers/gpu/drm/i915/intel_drv.h

+1 −4
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ struct intel_crtc_state { 
#define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS	(1<<0) /* unreliable sync mode.flags */

	unsigned long quirks;



	unsigned fb_bits; /* framebuffers to flip */

	bool update_pipe; /* can a fast modeset be performed? */

	bool disable_cxsr;

	bool update_wm_pre, update_wm_post; /* watermarks are updated */
@@ -605,10 +606,6 @@ struct intel_crtc_atomic_commit { 
	/* Sleepable operations to perform before commit */



	/* Sleepable operations to perform after commit */

	unsigned fb_bits;

	bool post_enable_primary;



	/* Sleepable operations to perform before and after commit */

	bool update_fbc;

};