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

Commit 53867b46 authored by Dhinakaran Pandiyan's avatar Dhinakaran Pandiyan
Browse files

drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE 



Rename PLANE_CTL_DECOMPRESSION_ENABLE to resemble the bpsec name -
PLANE_CTL_RENDER_DECOMPRESSION_ENABLE

Suggested-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180822015053.1420-2-dhinakaran.pandiyan@intel.com
parent 63eaf9ac

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -6515,7 +6515,7 @@ enum { 
#define   PLANE_CTL_YUV422_UYVY			(1 << 16)

#define   PLANE_CTL_YUV422_YVYU			(2 << 16)

#define   PLANE_CTL_YUV422_VYUY			(3 << 16)

#define   PLANE_CTL_DECOMPRESSION_ENABLE	(1 << 15)

#define   PLANE_CTL_RENDER_DECOMPRESSION_ENABLE	(1 << 15)

#define   PLANE_CTL_TRICKLE_FEED_DISABLE	(1 << 14)

#define   PLANE_CTL_PLANE_GAMMA_DISABLE		(1 << 13) /* Pre-GLK */

#define   PLANE_CTL_TILED_MASK			(0x7 << 10)

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -3555,11 +3555,11 @@ static u32 skl_plane_ctl_tiling(uint64_t fb_modifier) 
	case I915_FORMAT_MOD_Y_TILED:

		return PLANE_CTL_TILED_Y;

	case I915_FORMAT_MOD_Y_TILED_CCS:

		return PLANE_CTL_TILED_Y | PLANE_CTL_DECOMPRESSION_ENABLE;

		return PLANE_CTL_TILED_Y | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;

	case I915_FORMAT_MOD_Yf_TILED:

		return PLANE_CTL_TILED_YF;

	case I915_FORMAT_MOD_Yf_TILED_CCS:

		return PLANE_CTL_TILED_YF | PLANE_CTL_DECOMPRESSION_ENABLE;

		return PLANE_CTL_TILED_YF | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;

	default:

		MISSING_CASE(fb_modifier);

	}
@@ -8802,13 +8802,13 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, 
		fb->modifier = I915_FORMAT_MOD_X_TILED;

		break;

	case PLANE_CTL_TILED_Y:

		if (val & PLANE_CTL_DECOMPRESSION_ENABLE)

		if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE)

			fb->modifier = I915_FORMAT_MOD_Y_TILED_CCS;

		else

			fb->modifier = I915_FORMAT_MOD_Y_TILED;

		break;

	case PLANE_CTL_TILED_YF:

		if (val & PLANE_CTL_DECOMPRESSION_ENABLE)

		if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE)

			fb->modifier = I915_FORMAT_MOD_Yf_TILED_CCS;

		else

			fb->modifier = I915_FORMAT_MOD_Yf_TILED;