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

Commit f75fb42a authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/skl: handle all pixel formats in skylake_update_primary_plane() 

skylake_update_primary_plane() did not handle all pixel formats returned
by skl_format_to_fourcc(). Handle alpha similar to skl_update_plane().

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89052


Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 0dc6f20b

drivers/gpu/drm/i915/intel_display.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -2725,10 +2725,19 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, 
	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_XRGB8888:

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;

		break;

		break;

	case DRM_FORMAT_ARGB8888:

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;

		plane_ctl |= PLANE_CTL_ALPHA_SW_PREMULTIPLY;

		break;

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_XBGR8888:

		plane_ctl |= PLANE_CTL_ORDER_RGBX;

		plane_ctl |= PLANE_CTL_ORDER_RGBX;

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;

		break;

		break;

	case DRM_FORMAT_ABGR8888:

		plane_ctl |= PLANE_CTL_ORDER_RGBX;

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888;

		plane_ctl |= PLANE_CTL_ALPHA_SW_PREMULTIPLY;

		break;

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_XRGB2101010:

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_2101010;

		plane_ctl |= PLANE_CTL_FORMAT_XRGB_2101010;

		break;

		break;