diff options
author | Jani Nikula <jani.nikula@intel.com> | 2015-02-10 06:15:49 -0500 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2015-02-23 08:07:11 -0500 |
commit | f75fb42a6164a4c7f5bb6cbaae65555db89904a8 (patch) | |
tree | e2545aa70fab14d085e0602303bb325c3a062588 /drivers/gpu/drm/i915/intel_display.c | |
parent | 0dc6f20b9803f09726bbb682649d35cda8ef5b5d (diff) |
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: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3d220a67f865..f392e182184b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -2725,10 +2725,19 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, | |||
2725 | case DRM_FORMAT_XRGB8888: | 2725 | case DRM_FORMAT_XRGB8888: |
2726 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; | 2726 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; |
2727 | break; | 2727 | break; |
2728 | case DRM_FORMAT_ARGB8888: | ||
2729 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; | ||
2730 | plane_ctl |= PLANE_CTL_ALPHA_SW_PREMULTIPLY; | ||
2731 | break; | ||
2728 | case DRM_FORMAT_XBGR8888: | 2732 | case DRM_FORMAT_XBGR8888: |
2729 | plane_ctl |= PLANE_CTL_ORDER_RGBX; | 2733 | plane_ctl |= PLANE_CTL_ORDER_RGBX; |
2730 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; | 2734 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; |
2731 | break; | 2735 | break; |
2736 | case DRM_FORMAT_ABGR8888: | ||
2737 | plane_ctl |= PLANE_CTL_ORDER_RGBX; | ||
2738 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_8888; | ||
2739 | plane_ctl |= PLANE_CTL_ALPHA_SW_PREMULTIPLY; | ||
2740 | break; | ||
2732 | case DRM_FORMAT_XRGB2101010: | 2741 | case DRM_FORMAT_XRGB2101010: |
2733 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_2101010; | 2742 | plane_ctl |= PLANE_CTL_FORMAT_XRGB_2101010; |
2734 | break; | 2743 | break; |