| From 3e93b7c46ec86d97ad3ce277e2c0ec067c9696b7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 28 Jul 2020 15:48:09 +0200 |
| Subject: drm/sun4i: backend: Support alpha property on lowest plane |
| |
| From: Maxime Ripard <maxime@cerno.tech> |
| |
| [ Upstream commit e359c70462d2a82aae80274d027351d38792dde6 ] |
| |
| Unlike what we previously thought, only the per-pixel alpha is broken on |
| the lowest plane and the per-plane alpha isn't. Remove the check on the |
| alpha property being set on the lowest plane to reject a mode. |
| |
| Fixes: dcf496a6a608 ("drm/sun4i: sun4i: Introduce a quirk for lowest plane alpha support") |
| Signed-off-by: Maxime Ripard <maxime@cerno.tech> |
| Reviewed-by: Chen-Yu Tsai <wens@csie.org> |
| Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20200728134810.883457-1-maxime@cerno.tech |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/sun4i/sun4i_backend.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c |
| index 4e29f4fe4a05e..9ac637019f039 100644 |
| --- a/drivers/gpu/drm/sun4i/sun4i_backend.c |
| +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c |
| @@ -589,8 +589,7 @@ static int sun4i_backend_atomic_check(struct sunxi_engine *engine, |
| |
| /* We can't have an alpha plane at the lowest position */ |
| if (!backend->quirks->supports_lowest_plane_alpha && |
| - (plane_states[0]->fb->format->has_alpha || |
| - (plane_states[0]->alpha != DRM_BLEND_ALPHA_OPAQUE))) |
| + (plane_states[0]->alpha != DRM_BLEND_ALPHA_OPAQUE)) |
| return -EINVAL; |
| |
| for (i = 1; i < num_planes; i++) { |
| -- |
| 2.25.1 |
| |
