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

Commit 714244e2 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Stone
Browse files

drm/i915: Add format modifiers for Intel 



This was based on a patch originally by Kristian. It has been modified
pretty heavily to use the new callbacks from the previous patch.

v2:
  - Add LINEAR and Yf modifiers to list (Ville)
  - Combine i8xx and i965 into one list of formats (Ville)
  - Allow 1010102 formats for Y/Yf tiled (Ville)

v3:
  - Handle cursor formats (Ville)
  - Put handling for LINEAR in the mod_support functions (Ville)

v4:
  - List each modifier explicitly in supported modifiers (Ville)
  - Handle the CURSOR plane (Ville)

v5:
  - Split out cursor and sprite handling (Ville)

v6:
  - Actually use the sprite funcs (Emil)
  - Use unreachable (Emil)

v7:
  - Only allow Intel modifiers and LINEAR (Ben)

v8
  - Fix spite assert introduced in v6 (Daniel)

v9
  - Change vendor check logic to avoid magic 56 (Emil)
  - Reorder skl_mod_support (Ville)
  - make intel_plane_funcs static, could be done as of v5 (Ville)
  - rename local variable intel_format_modifiers to modifiers (Ville)
    - actually use sprite modifiers
  - split out modifier/formats by platform (Ville)

v10:
  - Undo vendor check from v9

v11:
  - Squash CCS advertisement into this patch (daniels)
  - Don't advertise CCS on higher sprite planes (daniels)

v12:
  - Don't advertise Y-tiled or CCS on any sprite planes, since we don't
    allocate enough DDB space for it to work. (daniels)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (v8)
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
parent 2e2adb05

drivers/gpu/drm/i915/intel_display.c

+147 −6
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ static const uint32_t i965_primary_formats[] = { 
	DRM_FORMAT_XBGR2101010,

};



static const uint64_t i9xx_format_modifiers[] = {

	I915_FORMAT_MOD_X_TILED,

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID

};



static const uint32_t skl_primary_formats[] = {

	DRM_FORMAT_C8,

	DRM_FORMAT_RGB565,
@@ -82,11 +88,34 @@ static const uint32_t skl_primary_formats[] = { 
	DRM_FORMAT_VYUY,

};



static const uint64_t skl_format_modifiers_noccs[] = {

	I915_FORMAT_MOD_Yf_TILED,

	I915_FORMAT_MOD_Y_TILED,

	I915_FORMAT_MOD_X_TILED,

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID

};



static const uint64_t skl_format_modifiers_ccs[] = {

	I915_FORMAT_MOD_Yf_TILED_CCS,

	I915_FORMAT_MOD_Y_TILED_CCS,

	I915_FORMAT_MOD_Yf_TILED,

	I915_FORMAT_MOD_Y_TILED,

	I915_FORMAT_MOD_X_TILED,

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID

};



/* Cursor formats */

static const uint32_t intel_cursor_formats[] = {

	DRM_FORMAT_ARGB8888,

};



static const uint64_t cursor_format_modifiers[] = {

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID

};



static void i9xx_crtc_clock_get(struct intel_crtc *crtc,

				struct intel_crtc_state *pipe_config);

static void ironlake_pch_clock_get(struct intel_crtc *crtc,
@@ -12839,7 +12868,102 @@ void intel_plane_destroy(struct drm_plane *plane) 
	kfree(to_intel_plane(plane));

}



const struct drm_plane_funcs intel_plane_funcs = {

static bool i8xx_mod_supported(uint32_t format, uint64_t modifier)

{

	switch (format) {

	case DRM_FORMAT_C8:

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB1555:

	case DRM_FORMAT_XRGB8888:

		return modifier == DRM_FORMAT_MOD_LINEAR ||

			modifier == I915_FORMAT_MOD_X_TILED;

	default:

		return false;

	}

}



static bool i965_mod_supported(uint32_t format, uint64_t modifier)

{

	switch (format) {

	case DRM_FORMAT_C8:

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_XBGR2101010:

		return modifier == DRM_FORMAT_MOD_LINEAR ||

			modifier == I915_FORMAT_MOD_X_TILED;

	default:

		return false;

	}

}



static bool skl_mod_supported(uint32_t format, uint64_t modifier)

{

	switch (format) {

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_ABGR8888:

		if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||

		    modifier == I915_FORMAT_MOD_Y_TILED_CCS)

			return true;

		/* fall through */

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_YUYV:

	case DRM_FORMAT_YVYU:

	case DRM_FORMAT_UYVY:

	case DRM_FORMAT_VYUY:

		if (modifier == I915_FORMAT_MOD_Yf_TILED)

			return true;

		/* fall through */

	case DRM_FORMAT_C8:

		if (modifier == DRM_FORMAT_MOD_LINEAR ||

		    modifier == I915_FORMAT_MOD_X_TILED ||

		    modifier == I915_FORMAT_MOD_Y_TILED)

			return true;

		/* fall through */

	default:

		return false;

	}

}



static bool intel_primary_plane_format_mod_supported(struct drm_plane *plane,

						     uint32_t format,

						     uint64_t modifier)

{

	struct drm_i915_private *dev_priv = to_i915(plane->dev);



	if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID))

		return false;



	if ((modifier >> 56) != DRM_FORMAT_MOD_VENDOR_INTEL &&

	    modifier != DRM_FORMAT_MOD_LINEAR)

		return false;



	if (INTEL_GEN(dev_priv) >= 9)

		return skl_mod_supported(format, modifier);

	else if (INTEL_GEN(dev_priv) >= 4)

		return i965_mod_supported(format, modifier);

	else

		return i8xx_mod_supported(format, modifier);



	unreachable();

}



static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane,

						    uint32_t format,

						    uint64_t modifier)

{

	if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID))

		return false;



	return modifier == DRM_FORMAT_MOD_LINEAR && format == DRM_FORMAT_ARGB8888;

}



static struct drm_plane_funcs intel_plane_funcs = {

	.update_plane = drm_atomic_helper_update_plane,

	.disable_plane = drm_atomic_helper_disable_plane,

	.destroy = intel_plane_destroy,
@@ -12847,6 +12971,7 @@ const struct drm_plane_funcs intel_plane_funcs = { 
	.atomic_set_property = intel_plane_atomic_set_property,

	.atomic_duplicate_state = intel_plane_duplicate_state,

	.atomic_destroy_state = intel_plane_destroy_state,

	.format_mod_supported = intel_primary_plane_format_mod_supported,

};



static int
@@ -12980,6 +13105,7 @@ static const struct drm_plane_funcs intel_cursor_plane_funcs = { 
	.atomic_set_property = intel_plane_atomic_set_property,

	.atomic_duplicate_state = intel_plane_duplicate_state,

	.atomic_destroy_state = intel_plane_destroy_state,

	.format_mod_supported = intel_cursor_plane_format_mod_supported,

};



static struct intel_plane *
@@ -12990,6 +13116,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
	const uint32_t *intel_primary_formats;

	unsigned int supported_rotations;

	unsigned int num_formats;

	const uint64_t *modifiers;

	int ret;



	primary = kzalloc(sizeof(*primary), GFP_KERNEL);
@@ -13025,21 +13152,34 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
	primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe);

	primary->check_plane = intel_check_primary_plane;



	if (INTEL_GEN(dev_priv) >= 9) {

	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {

		intel_primary_formats = skl_primary_formats;

		num_formats = ARRAY_SIZE(skl_primary_formats);

		modifiers = skl_format_modifiers_ccs;



		primary->update_plane = skylake_update_primary_plane;

		primary->disable_plane = skylake_disable_primary_plane;

	} else if (INTEL_GEN(dev_priv) >= 9) {

		intel_primary_formats = skl_primary_formats;

		num_formats = ARRAY_SIZE(skl_primary_formats);

		if (pipe < PIPE_C)

			modifiers = skl_format_modifiers_ccs;

		else

			modifiers = skl_format_modifiers_noccs;



		primary->update_plane = skylake_update_primary_plane;

		primary->disable_plane = skylake_disable_primary_plane;

	} else if (INTEL_GEN(dev_priv) >= 4) {

		intel_primary_formats = i965_primary_formats;

		num_formats = ARRAY_SIZE(i965_primary_formats);

		modifiers = i9xx_format_modifiers;



		primary->update_plane = i9xx_update_primary_plane;

		primary->disable_plane = i9xx_disable_primary_plane;

	} else {

		intel_primary_formats = i8xx_primary_formats;

		num_formats = ARRAY_SIZE(i8xx_primary_formats);

		modifiers = i9xx_format_modifiers;



		primary->update_plane = i9xx_update_primary_plane;

		primary->disable_plane = i9xx_disable_primary_plane;
@@ -13049,21 +13189,21 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
		ret = drm_universal_plane_init(&dev_priv->drm, &primary->base,

					       0, &intel_plane_funcs,

					       intel_primary_formats, num_formats,

					       NULL,

					       modifiers,

					       DRM_PLANE_TYPE_PRIMARY,

					       "plane 1%c", pipe_name(pipe));

	else if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))

		ret = drm_universal_plane_init(&dev_priv->drm, &primary->base,

					       0, &intel_plane_funcs,

					       intel_primary_formats, num_formats,

					       NULL,

					       modifiers,

					       DRM_PLANE_TYPE_PRIMARY,

					       "primary %c", pipe_name(pipe));

	else

		ret = drm_universal_plane_init(&dev_priv->drm, &primary->base,

					       0, &intel_plane_funcs,

					       intel_primary_formats, num_formats,

					       NULL,

					       modifiers,

					       DRM_PLANE_TYPE_PRIMARY,

					       "plane %c", plane_name(primary->plane));

	if (ret)
@@ -13149,7 +13289,8 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, 
				       0, &intel_cursor_plane_funcs,

				       intel_cursor_formats,

				       ARRAY_SIZE(intel_cursor_formats),

				       NULL, DRM_PLANE_TYPE_CURSOR,

				       cursor_format_modifiers,

				       DRM_PLANE_TYPE_CURSOR,

				       "cursor %c", pipe_name(pipe));

	if (ret)

		goto fail;

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,6 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, 
			   const char *name, u32 reg);

void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv);

void lpt_disable_iclkip(struct drm_i915_private *dev_priv);

extern const struct drm_plane_funcs intel_plane_funcs;

void intel_init_display_hooks(struct drm_i915_private *dev_priv);

unsigned int intel_fb_xy_to_linear(int x, int y,

				   const struct intel_plane_state *state,

drivers/gpu/drm/i915/intel_sprite.c

+145 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 * support.

 */

#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_rect.h>
@@ -1037,6 +1038,12 @@ static const uint32_t g4x_plane_formats[] = { 
	DRM_FORMAT_VYUY,

};



static const uint64_t i9xx_plane_format_modifiers[] = {

	I915_FORMAT_MOD_X_TILED,

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID

};



static const uint32_t snb_plane_formats[] = {

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_XRGB8888,
@@ -1072,6 +1079,122 @@ static uint32_t skl_plane_formats[] = { 
	DRM_FORMAT_VYUY,

};



static const uint64_t skl_plane_format_modifiers[] = {

	I915_FORMAT_MOD_X_TILED,

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID

};



static bool g4x_sprite_plane_format_mod_supported(struct drm_plane *plane,

						  uint32_t format,

						  uint64_t modifier)

{

	switch (format) {

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_YUYV:

	case DRM_FORMAT_YVYU:

	case DRM_FORMAT_UYVY:

	case DRM_FORMAT_VYUY:

		if (modifier == DRM_FORMAT_MOD_LINEAR ||

		    modifier == I915_FORMAT_MOD_X_TILED)

			return true;

		/* fall through */

	default:

		return false;

	}

}



static bool vlv_sprite_plane_format_mod_supported(struct drm_plane *plane,

						  uint32_t format,

						  uint64_t modifier)

{

	switch (format) {

	case DRM_FORMAT_YUYV:

	case DRM_FORMAT_YVYU:

	case DRM_FORMAT_UYVY:

	case DRM_FORMAT_VYUY:

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_ABGR2101010:

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_ABGR8888:

		if (modifier == DRM_FORMAT_MOD_LINEAR ||

		    modifier == I915_FORMAT_MOD_X_TILED)

			return true;

		/* fall through */

	default:

		return false;

	}

}



static bool skl_sprite_plane_format_mod_supported(struct drm_plane *plane,

						  uint32_t format,

						  uint64_t modifier)

{

	/* This is the same as primary plane since SKL has universal planes */

	switch (format) {

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_ABGR8888:

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_YUYV:

	case DRM_FORMAT_YVYU:

	case DRM_FORMAT_UYVY:

	case DRM_FORMAT_VYUY:

		if (modifier == I915_FORMAT_MOD_Yf_TILED)

			return true;

		/* fall through */

	case DRM_FORMAT_C8:

		if (modifier == DRM_FORMAT_MOD_LINEAR ||

		    modifier == I915_FORMAT_MOD_X_TILED ||

		    modifier == I915_FORMAT_MOD_Y_TILED)

			return true;

		/* fall through */

	default:

		return false;

	}

}



static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane,

                                                    uint32_t format,

                                                    uint64_t modifier)

{

	struct drm_i915_private *dev_priv = to_i915(plane->dev);



	if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID))

		return false;



	if ((modifier >> 56) != DRM_FORMAT_MOD_VENDOR_INTEL &&

	    modifier != DRM_FORMAT_MOD_LINEAR)

		return false;



	if (INTEL_GEN(dev_priv) >= 9)

		return skl_sprite_plane_format_mod_supported(plane, format, modifier);

	else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		return vlv_sprite_plane_format_mod_supported(plane, format, modifier);

	else

		return g4x_sprite_plane_format_mod_supported(plane, format, modifier);



	unreachable();

}



const struct drm_plane_funcs intel_sprite_plane_funcs = {

        .update_plane = drm_atomic_helper_update_plane,

        .disable_plane = drm_atomic_helper_disable_plane,

        .destroy = intel_plane_destroy,

        .atomic_get_property = intel_plane_atomic_get_property,

        .atomic_set_property = intel_plane_atomic_set_property,

        .atomic_duplicate_state = intel_plane_duplicate_state,

        .atomic_destroy_state = intel_plane_destroy_state,

        .format_mod_supported = intel_sprite_plane_format_mod_supported,

};



struct intel_plane *

intel_sprite_plane_create(struct drm_i915_private *dev_priv,

			  enum pipe pipe, int plane)
@@ -1080,6 +1203,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
	struct intel_plane_state *state = NULL;

	unsigned long possible_crtcs;

	const uint32_t *plane_formats;

	const uint64_t *modifiers;

	unsigned int supported_rotations;

	int num_plane_formats;

	int ret;
@@ -1097,7 +1221,17 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
	}

	intel_plane->base.state = &state->base;



	if (INTEL_GEN(dev_priv) >= 9) {

	if (INTEL_GEN(dev_priv) >= 10) {

		intel_plane->can_scale = true;

		state->scaler_id = -1;



		intel_plane->update_plane = skl_update_plane;

		intel_plane->disable_plane = skl_disable_plane;



		plane_formats = skl_plane_formats;

		num_plane_formats = ARRAY_SIZE(skl_plane_formats);

		modifiers = skl_plane_format_modifiers;

	} else if (INTEL_GEN(dev_priv) >= 9) {

		intel_plane->can_scale = true;

		state->scaler_id = -1;
@@ -1106,6 +1240,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 


		plane_formats = skl_plane_formats;

		num_plane_formats = ARRAY_SIZE(skl_plane_formats);

		modifiers = skl_plane_format_modifiers;

	} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

		intel_plane->can_scale = false;

		intel_plane->max_downscale = 1;
@@ -1115,6 +1250,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 


		plane_formats = vlv_plane_formats;

		num_plane_formats = ARRAY_SIZE(vlv_plane_formats);

		modifiers = i9xx_plane_format_modifiers;

	} else if (INTEL_GEN(dev_priv) >= 7) {

		if (IS_IVYBRIDGE(dev_priv)) {

			intel_plane->can_scale = true;
@@ -1129,6 +1265,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 


		plane_formats = snb_plane_formats;

		num_plane_formats = ARRAY_SIZE(snb_plane_formats);

		modifiers = i9xx_plane_format_modifiers;

	} else {

		intel_plane->can_scale = true;

		intel_plane->max_downscale = 16;
@@ -1136,6 +1273,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
		intel_plane->update_plane = g4x_update_plane;

		intel_plane->disable_plane = g4x_disable_plane;



		modifiers = i9xx_plane_format_modifiers;

		if (IS_GEN6(dev_priv)) {

			plane_formats = snb_plane_formats;

			num_plane_formats = ARRAY_SIZE(snb_plane_formats);
@@ -1168,15 +1306,17 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 


	if (INTEL_GEN(dev_priv) >= 9)

		ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,

					       possible_crtcs, &intel_plane_funcs,

					       possible_crtcs, &intel_sprite_plane_funcs,

					       plane_formats, num_plane_formats,

					       NULL, DRM_PLANE_TYPE_OVERLAY,

					       modifiers,

					       DRM_PLANE_TYPE_OVERLAY,

					       "plane %d%c", plane + 2, pipe_name(pipe));

	else

		ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,

					       possible_crtcs, &intel_plane_funcs,

					       possible_crtcs, &intel_sprite_plane_funcs,

					       plane_formats, num_plane_formats,

					       NULL, DRM_PLANE_TYPE_OVERLAY,

					       modifiers,

					       DRM_PLANE_TYPE_OVERLAY,

					       "sprite %c", sprite_name(pipe, plane));

	if (ret)

		goto fail;