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

Commit 296e9b19 authored by Swati Sharma's avatar Swati Sharma Committed by Maarten Lankhorst
Browse files

drm/i915/icl: Enabling Y2xx and Y4xx (xx:10/12/16) formats for universal planes 



Signed-off-by: default avatarSwati Sharma <swati2.sharma@intel.com>
Signed-off-by: default avatarVidya Srinivas <vidya.srinivas@intel.com>
Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1551700595-21481-7-git-send-email-swati2.sharma@intel.com
parent 696fa001

drivers/gpu/drm/i915/intel_display.c

+30 −0
Original line number Diff line number Diff line
@@ -2683,6 +2683,18 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha) 
		return DRM_FORMAT_P012;

	case PLANE_CTL_FORMAT_P016:

		return DRM_FORMAT_P016;

	case PLANE_CTL_FORMAT_Y210:

		return DRM_FORMAT_Y210;

	case PLANE_CTL_FORMAT_Y212:

		return DRM_FORMAT_Y212;

	case PLANE_CTL_FORMAT_Y216:

		return DRM_FORMAT_Y216;

	case PLANE_CTL_FORMAT_Y410:

		return DRM_FORMAT_Y410;

	case PLANE_CTL_FORMAT_Y412:

		return DRM_FORMAT_Y412;

	case PLANE_CTL_FORMAT_Y416:

		return DRM_FORMAT_Y416;

	default:

	case PLANE_CTL_FORMAT_XRGB_8888:

		if (rgb_order) {
@@ -3612,6 +3624,18 @@ static u32 skl_plane_ctl_format(u32 pixel_format) 
		return PLANE_CTL_FORMAT_P012;

	case DRM_FORMAT_P016:

		return PLANE_CTL_FORMAT_P016;

	case DRM_FORMAT_Y210:

		return PLANE_CTL_FORMAT_Y210;

	case DRM_FORMAT_Y212:

		return PLANE_CTL_FORMAT_Y212;

	case DRM_FORMAT_Y216:

		return PLANE_CTL_FORMAT_Y216;

	case DRM_FORMAT_Y410:

		return PLANE_CTL_FORMAT_Y410;

	case DRM_FORMAT_Y412:

		return PLANE_CTL_FORMAT_Y412;

	case DRM_FORMAT_Y416:

		return PLANE_CTL_FORMAT_Y416;

	default:

		MISSING_CASE(pixel_format);

	}
@@ -5164,6 +5188,12 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, 
	case DRM_FORMAT_P010:

	case DRM_FORMAT_P012:

	case DRM_FORMAT_P016:

	case DRM_FORMAT_Y210:

	case DRM_FORMAT_Y212:

	case DRM_FORMAT_Y216:

	case DRM_FORMAT_Y410:

	case DRM_FORMAT_Y412:

	case DRM_FORMAT_Y416:

		break;

	default:

		DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",

drivers/gpu/drm/i915/intel_sprite.c

+59 −1
Original line number Diff line number Diff line
@@ -1803,6 +1803,27 @@ static const u32 skl_plane_formats[] = { 
	DRM_FORMAT_VYUY,

};



static const uint32_t icl_plane_formats[] = {

	DRM_FORMAT_C8,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB2101010,

	DRM_FORMAT_XBGR2101010,

	DRM_FORMAT_YUYV,

	DRM_FORMAT_YVYU,

	DRM_FORMAT_UYVY,

	DRM_FORMAT_VYUY,

	DRM_FORMAT_Y210,

	DRM_FORMAT_Y212,

	DRM_FORMAT_Y216,

	DRM_FORMAT_Y410,

	DRM_FORMAT_Y412,

	DRM_FORMAT_Y416,

};



static const u32 skl_planar_formats[] = {

	DRM_FORMAT_C8,

	DRM_FORMAT_RGB565,
@@ -1838,6 +1859,31 @@ static const uint32_t glk_planar_formats[] = { 
	DRM_FORMAT_P016,

};



static const uint32_t icl_planar_formats[] = {

	DRM_FORMAT_C8,

	DRM_FORMAT_RGB565,

	DRM_FORMAT_XRGB8888,

	DRM_FORMAT_XBGR8888,

	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB2101010,

	DRM_FORMAT_XBGR2101010,

	DRM_FORMAT_YUYV,

	DRM_FORMAT_YVYU,

	DRM_FORMAT_UYVY,

	DRM_FORMAT_VYUY,

	DRM_FORMAT_NV12,

	DRM_FORMAT_P010,

	DRM_FORMAT_P012,

	DRM_FORMAT_P016,

	DRM_FORMAT_Y210,

	DRM_FORMAT_Y212,

	DRM_FORMAT_Y216,

	DRM_FORMAT_Y410,

	DRM_FORMAT_Y412,

	DRM_FORMAT_Y416,

};



static const u64 skl_plane_format_modifiers_noccs[] = {

	I915_FORMAT_MOD_Yf_TILED,

	I915_FORMAT_MOD_Y_TILED,
@@ -1980,6 +2026,12 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane, 
	case DRM_FORMAT_P010:

	case DRM_FORMAT_P012:

	case DRM_FORMAT_P016:

	case DRM_FORMAT_Y210:

	case DRM_FORMAT_Y212:

	case DRM_FORMAT_Y216:

	case DRM_FORMAT_Y410:

	case DRM_FORMAT_Y412:

	case DRM_FORMAT_Y416:

		if (modifier == I915_FORMAT_MOD_Yf_TILED)

			return true;

		/* fall through */
@@ -2120,13 +2172,19 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, 
		plane->update_slave = icl_update_slave;



	if (skl_plane_has_planar(dev_priv, pipe, plane_id)) {

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

		if (INTEL_GEN(dev_priv) >= 11) {

			formats = icl_planar_formats;

			num_formats = ARRAY_SIZE(icl_planar_formats);

		} else if (INTEL_GEN(dev_priv) == 10 || IS_GEMINILAKE(dev_priv)) {

			formats = glk_planar_formats;

			num_formats = ARRAY_SIZE(glk_planar_formats);

		} else {

			formats = skl_planar_formats;

			num_formats = ARRAY_SIZE(skl_planar_formats);

		}

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

		formats = icl_plane_formats;

		num_formats = ARRAY_SIZE(icl_plane_formats);

	} else {

		formats = skl_plane_formats;

		num_formats = ARRAY_SIZE(skl_plane_formats);