From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH] drm/i915: Fix per-pixel alpha with CCS Date: Mon, 3 Jun 2019 17:10:18 +0200 Message-ID: <4ee3ffa8-4048-d92d-4493-ea5ed1dfb23e@linux.intel.com> References: <20190603142500.25680-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190603142500.25680-1-ville.syrjala@linux.intel.com> Content-Language: en-US Sender: stable-owner@vger.kernel.org To: Ville Syrjala , intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org, Matt Roper , Heinrich Fink List-Id: intel-gfx@lists.freedesktop.org Op 03-06-2019 om 16:25 schreef Ville Syrjala: > From: Ville Syrjälä > > We forgot to set .has_alpha=true for the A+CCS formats when the code > started to consult .has_alpha. This manifests as A+CCS being treated > as X+CCS which means no per-pixel alpha blending. Fix the format > list appropriately. > > Cc: stable@vger.kernel.org > Cc: Maarten Lankhorst > Cc: Matt Roper > Cc: Heinrich Fink > Reported-by: Heinrich Fink > Fixes: b20815255693 ("drm/i915: Add plane alpha blending support, v2.") > Signed-off-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/intel_display.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index c3e2b1178d55..67d796f4747e 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2463,10 +2463,14 @@ static unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier) > * main surface. > */ > static const struct drm_format_info ccs_formats[] = { > - { .format = DRM_FORMAT_XRGB8888, .depth = 24, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, > - { .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, > - { .format = DRM_FORMAT_ARGB8888, .depth = 32, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, > - { .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, > + { .format = DRM_FORMAT_XRGB8888, .depth = 24, .num_planes = 2, > + .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, > + { .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 2, > + .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, > + { .format = DRM_FORMAT_ARGB8888, .depth = 32, .num_planes = 2, > + .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, .has_alpha = true, }, > + { .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 2, > + .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, .has_alpha = true, }, > }; > > static const struct drm_format_info * Makes sense.. Reviewed-by: Maarten Lankhorst