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

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

drm/i915: Remove some duplicated plane swapping logic 



On pre-gen4 we connect plane A to pipe B and vice versa to get an FBC
capable plane feeding the LVDS port by default. We have the logic for
the plane swapping duplicated in many places. Let's remove a bit of the
duplication by having the crtc look up the thing from the primary plane.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1478616439-10150-2-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent c99f53f7

drivers/gpu/drm/i915/intel_display.c

+9 −12
Original line number Diff line number Diff line
@@ -15013,11 +15013,16 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
		state->scaler_id = -1;

	}

	primary->pipe = pipe;

	primary->plane = pipe;

	/*

	 * On gen2/3 only plane A can do FBC, but the panel fitter and LVDS

	 * port is hooked to pipe B. Hence we want plane A feeding pipe B.

	 */

	if (HAS_FBC(dev_priv) && INTEL_GEN(dev_priv) < 4)

		primary->plane = (enum plane) !pipe;

	else

		primary->plane = (enum plane) pipe;

	primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe);

	primary->check_plane = intel_check_primary_plane;

	if (HAS_FBC(dev_priv) && INTEL_GEN(dev_priv) < 4)

		primary->plane = !pipe;



	if (INTEL_GEN(dev_priv) >= 9) {

		intel_primary_formats = skl_primary_formats;
@@ -15327,16 +15332,8 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) 
	if (ret)

		goto fail;



	/*

	 * On gen2/3 only plane A can do fbc, but the panel fitter and lvds port

	 * is hooked to pipe B. Hence we want plane A feeding pipe B.

	 */

	intel_crtc->pipe = pipe;

	intel_crtc->plane = (enum plane) pipe;

	if (HAS_FBC(dev_priv) && INTEL_GEN(dev_priv) < 4) {

		DRM_DEBUG_KMS("swapping pipes & planes for FBC\n");

		intel_crtc->plane = !pipe;

	}

	intel_crtc->plane = primary->plane;



	intel_crtc->cursor_base = ~0;

	intel_crtc->cursor_cntl = ~0;