On Mon, 16 Feb 2015, Damien Lespiau <damien.lesp...@intel.com> wrote: > On Tue, Feb 10, 2015 at 01:15:49PM +0200, Jani Nikula wrote: >> 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 >> Signed-off-by: Jani Nikula <jani.nik...@intel.com> > > Given the discussion with Ville, it's quite likely we'll default to > alpha blending for pre-multiplied fbs (for plane supporting alpha), even > with the blending properties added. In that context, we can provide a > single, fixed, (but useful) blending mode before we get to implement the > full thing. So: > > Reviewed-by: Damien Lespiau <damien.lesp...@intel.com>
Pushed to drm-intel-fixes, thanks for the review. BR, Jani. > > -- > Damien > >> --- >> >> This is purely cargo culting to avoid the BUG. >> --- >> drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ >> 1 file changed, 9 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c >> b/drivers/gpu/drm/i915/intel_display.c >> index 3fe95982be93..cede05256d56 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -2751,10 +2751,19 @@ static void skylake_update_primary_plane(struct >> drm_crtc *crtc, >> case DRM_FORMAT_XRGB8888: >> plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; >> break; >> + case DRM_FORMAT_ARGB8888: >> + plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; >> + plane_ctl |= PLANE_CTL_ALPHA_SW_PREMULTIPLY; >> + break; >> case DRM_FORMAT_XBGR8888: >> plane_ctl |= PLANE_CTL_ORDER_RGBX; >> plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; >> 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: >> plane_ctl |= PLANE_CTL_FORMAT_XRGB_2101010; >> break; >> -- >> 2.1.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
