Commit 77cac774 authored Oct 26, 2018 by Dhinakaran Pandiyan

drm/i915: Do not program aux plane offsets on gen11+

The PLANE_AUX_OFFSET mmio does not exist on ICL, do not program it. We'll
still calculate the aux offset as it is required for adjusing x-y offsets.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181026193805.11077-2-dhinakaran.pandiyan@intel.com

parent 2a11b1b4

drivers/gpu/drm/i915/intel_sprite.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -414,6 +414,8 @@ skl_program_plane(struct intel_plane *plane,
		I915_WRITE_FW(PLANE_SIZE(pipe, plane_id), (src_h << 16) \| src_w);
		I915_WRITE_FW(PLANE_AUX_DIST(pipe, plane_id),
		(plane_state->color_plane[1].offset - surf_addr) \| aux_stride);

		if (INTEL_GEN(dev_priv) < 11)
		I915_WRITE_FW(PLANE_AUX_OFFSET(pipe, plane_id),
		(plane_state->color_plane[1].y << 16) \|
		plane_state->color_plane[1].x);