Commit ab4c37fe authored by Joshua Ashton's avatar Joshua Ashton Committed by Alex Deucher
Browse files

drm/amd/display: Expose more formats for overlay planes on DCN 



DCN planes are universal and therefore overlay planes can use the same
formats as primary planes, unlike DCE.

Gamescope/Steam Deck would like to take advantage of this functionality
for partial composition which in some cases in our pipeline, can contain
negative values in some instances.

Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Simon Ser <contact@emersion.fr>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarJoshua Ashton <joshua@froggi.es>
Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 33e88286

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c

+25 −16
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ void amdgpu_dm_plane_fill_blending_from_plane_state(const struct drm_plane_state 
			DRM_FORMAT_ARGB8888,

			DRM_FORMAT_RGBA8888,

			DRM_FORMAT_ABGR8888,

			DRM_FORMAT_ARGB2101010,

			DRM_FORMAT_ABGR2101010,

			DRM_FORMAT_ARGB16161616,

			DRM_FORMAT_ABGR16161616,

			DRM_FORMAT_ARGB16161616F,

		};

		uint32_t format = plane_state->fb->format->format;

		unsigned int i;
@@ -698,8 +703,8 @@ static int get_plane_formats(const struct drm_plane *plane, 
	 * caps list.

	 */



	switch (plane->type) {

	case DRM_PLANE_TYPE_PRIMARY:

	if (plane->type == DRM_PLANE_TYPE_PRIMARY ||

		(plane_cap && plane_cap->type == DC_PLANE_TYPE_DCN_UNIVERSAL && plane->type != DRM_PLANE_TYPE_CURSOR)) {

		for (i = 0; i < ARRAY_SIZE(rgb_formats); ++i) {

			if (num_formats >= max_formats)

				break;
@@ -717,8 +722,8 @@ static int get_plane_formats(const struct drm_plane *plane, 
			formats[num_formats++] = DRM_FORMAT_XBGR16161616F;

			formats[num_formats++] = DRM_FORMAT_ABGR16161616F;

		}

		break;



	} else {

		switch (plane->type) {

		case DRM_PLANE_TYPE_OVERLAY:

			for (i = 0; i < ARRAY_SIZE(overlay_formats); ++i) {

				if (num_formats >= max_formats)
@@ -736,6 +741,10 @@ static int get_plane_formats(const struct drm_plane *plane, 
				formats[num_formats++] = cursor_formats[i];

			}

			break;



		default:

			break;

		}

	}



	return num_formats;