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

Commit cd30fbca authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Stop updating plane->fb/crtc 



We want to get rid of plane->fb/crtc on atomic drivers. Stop setting
them.

v2: Fix up the comment in intel_crtc_active() and
    nuke the rest of the stale comments (Daniel)

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> #v1
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180525185045.29689-9-ville.syrjala@linux.intel.com


Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
parent 9e5c947c

drivers/gpu/drm/i915/intel_atomic_plane.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -120,12 +120,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ 
		&crtc_state->base.adjusted_mode;

		&crtc_state->base.adjusted_mode;

	int ret;

	int ret;





	/*

	 * Both crtc and plane->crtc could be NULL if we're updating a

	 * property while the plane is disabled.  We don't actually have

	 * anything driver-specific we need to test in that case, so

	 * just return success.

	 */

	if (!intel_state->base.crtc && !old_plane_state->base.crtc)

	if (!intel_state->base.crtc && !old_plane_state->base.crtc)

		return 0;

		return 0;
@@ -204,12 +198,6 @@ static int intel_plane_atomic_check(struct drm_plane *plane, 
	const struct drm_crtc_state *old_crtc_state;

	const struct drm_crtc_state *old_crtc_state;

	struct drm_crtc_state *new_crtc_state;

	struct drm_crtc_state *new_crtc_state;





	/*

	 * Both crtc and plane->crtc could be NULL if we're updating a

	 * property while the plane is disabled.  We don't actually have

	 * anything driver-specific we need to test in that case, so

	 * just return success.

	 */

	if (!crtc)

	if (!crtc)

		return 0;

		return 0;

drivers/gpu/drm/i915/intel_display.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -994,7 +994,7 @@ bool intel_crtc_active(struct intel_crtc *crtc) 
	 * We can ditch the adjusted_mode.crtc_clock check as soon

	 * We can ditch the adjusted_mode.crtc_clock check as soon

	 * as Haswell has gained clock readout/fastboot support.

	 * as Haswell has gained clock readout/fastboot support.

	 *

	 *

	 * We can ditch the crtc->primary->fb check as soon as we can

	 * We can ditch the crtc->primary->state->fb check as soon as we can

	 * properly reconstruct framebuffers.

	 * properly reconstruct framebuffers.

	 *

	 *

	 * FIXME: The intel_crtc->active here should be switched to

	 * FIXME: The intel_crtc->active here should be switched to
@@ -2894,9 +2894,8 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, 
	if (i915_gem_object_is_tiled(obj))

	if (i915_gem_object_is_tiled(obj))

		dev_priv->preserve_bios_swizzle = true;

		dev_priv->preserve_bios_swizzle = true;





	drm_framebuffer_get(fb);

	plane_state->fb = fb;

	primary->fb = primary->state->fb = fb;

	plane_state->crtc = &intel_crtc->base;

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





	intel_set_plane_visible(to_intel_crtc_state(crtc_state),

	intel_set_plane_visible(to_intel_crtc_state(crtc_state),

				to_intel_plane_state(plane_state),

				to_intel_plane_state(plane_state),