diff mbox series

[v5,2/2] drm/i915: Adding YUV444 packed format(DRM_FORMAT_XYUV) support.

Message ID 20180810132027.5293-1-stanislav.lisovskiy@intel.com (mailing list archive)
State New, archived
Headers show
Series Add XYUV format support | expand

Commit Message

Stanislav Lisovskiy Aug. 10, 2018, 1:20 p.m. UTC 
From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>

PLANE_CTL_FORMAT_AYUV is already supported, according to hardware
specification.

v2: Edited commit message, removed redundant whitespaces.

v3: Fixed fallthrough logic for the format switch cases.

v4: Yet again fixed fallthrough logic, to reuse code from other case
    labels.

v5: Started to use XYUV instead of AYUV, as we don't use alpha.

Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 7 +++++++
 drivers/gpu/drm/i915/intel_sprite.c  | 1 +
 2 files changed, 8 insertions(+)

Comments

Swati Sharma Aug. 13, 2018, 2:26 p.m. UTC | #1 
On 13-Aug-18 7:46 PM, Sharma, Swati2 wrote:

> Hi Stanlis,
>
> Won't we defining XYUV PF in skl_update_scaler_plane? Else scaler 
> won't be updated for XYUV PF.
>
>
> On 10-Aug-18 6:50 PM, StanLis wrote:
>> From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
>>
>> PLANE_CTL_FORMAT_AYUV is already supported, according to hardware
>> specification.
>>
>> v2: Edited commit message, removed redundant whitespaces.
>>
>> v3: Fixed fallthrough logic for the format switch cases.
>>
>> v4: Yet again fixed fallthrough logic, to reuse code from other case
>>      labels.
>>
>> v5: Started to use XYUV instead of AYUV, as we don't use alpha.
>>
>> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
>> ---
>>   drivers/gpu/drm/i915/intel_display.c | 7 +++++++
>>   drivers/gpu/drm/i915/intel_sprite.c  | 1 +
>>   2 files changed, 8 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c 
>> b/drivers/gpu/drm/i915/intel_display.c
>> index 56818a45181c..8a4f763c7ca3 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -86,6 +86,7 @@ static const uint32_t skl_primary_formats[] = {
>>       DRM_FORMAT_YVYU,
>>       DRM_FORMAT_UYVY,
>>       DRM_FORMAT_VYUY,
>> +    DRM_FORMAT_XYUV,
>>   };
>>     static const uint32_t skl_pri_planar_formats[] = {
>> @@ -102,6 +103,7 @@ static const uint32_t skl_pri_planar_formats[] = {
>>       DRM_FORMAT_UYVY,
>>       DRM_FORMAT_VYUY,
>>       DRM_FORMAT_NV12,
>> +    DRM_FORMAT_XYUV,
>>   };
>>     static const uint64_t skl_format_modifiers_noccs[] = {
>> @@ -3497,6 +3499,8 @@ static u32 skl_plane_ctl_format(uint32_t 
>> pixel_format)
>>           return PLANE_CTL_FORMAT_XRGB_2101010;
>>       case DRM_FORMAT_XBGR2101010:
>>           return PLANE_CTL_ORDER_RGBX | PLANE_CTL_FORMAT_XRGB_2101010;
>> +    case DRM_FORMAT_XYUV:
>> +        return PLANE_CTL_FORMAT_AYUV;
>>       case DRM_FORMAT_YUYV:
>>           return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YUYV;
>>       case DRM_FORMAT_YVYU:
>> @@ -13371,6 +13375,7 @@ static bool 
>> skl_plane_format_mod_supported(struct drm_plane *_plane,
>>       }
>>         switch (format) {
>> +
>>       case DRM_FORMAT_XRGB8888:
>>       case DRM_FORMAT_XBGR8888:
>>       case DRM_FORMAT_ARGB8888:
>> @@ -13387,6 +13392,7 @@ static bool 
>> skl_plane_format_mod_supported(struct drm_plane *_plane,
>>       case DRM_FORMAT_UYVY:
>>       case DRM_FORMAT_VYUY:
>>       case DRM_FORMAT_NV12:
>> +    case DRM_FORMAT_XYUV:
>>           if (modifier == I915_FORMAT_MOD_Yf_TILED)
>>               return true;
>>           /* fall through */
>> @@ -14510,6 +14516,7 @@ static int intel_framebuffer_init(struct 
>> intel_framebuffer *intel_fb,
>>               goto err;
>>           }
>>           break;
>> +    case DRM_FORMAT_XYUV:
>>       case DRM_FORMAT_YUYV:
>>       case DRM_FORMAT_UYVY:
>>       case DRM_FORMAT_YVYU:
>> diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
>> b/drivers/gpu/drm/i915/intel_sprite.c
>> index 344c0e709b19..812e4e8afe2b 100644
>> --- a/drivers/gpu/drm/i915/intel_sprite.c
>> +++ b/drivers/gpu/drm/i915/intel_sprite.c
>> @@ -1421,6 +1421,7 @@ static bool 
>> skl_plane_format_mod_supported(struct drm_plane *_plane,
>>       case DRM_FORMAT_UYVY:
>>       case DRM_FORMAT_VYUY:
>>       case DRM_FORMAT_NV12:
>> +    case DRM_FORMAT_XYUV:
>>           if (modifier == I915_FORMAT_MOD_Yf_TILED)
>>               return true;
>>           /* fall through */
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 56818a45181c..8a4f763c7ca3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -86,6 +86,7 @@  static const uint32_t skl_primary_formats[] = {
 	DRM_FORMAT_YVYU,
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
+	DRM_FORMAT_XYUV,
 };
 
 static const uint32_t skl_pri_planar_formats[] = {
@@ -102,6 +103,7 @@  static const uint32_t skl_pri_planar_formats[] = {
 	DRM_FORMAT_UYVY,
 	DRM_FORMAT_VYUY,
 	DRM_FORMAT_NV12,
+	DRM_FORMAT_XYUV,
 };
 
 static const uint64_t skl_format_modifiers_noccs[] = {
@@ -3497,6 +3499,8 @@  static u32 skl_plane_ctl_format(uint32_t pixel_format)
 		return PLANE_CTL_FORMAT_XRGB_2101010;
 	case DRM_FORMAT_XBGR2101010:
 		return PLANE_CTL_ORDER_RGBX | PLANE_CTL_FORMAT_XRGB_2101010;
+	case DRM_FORMAT_XYUV:
+		return PLANE_CTL_FORMAT_AYUV;
 	case DRM_FORMAT_YUYV:
 		return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_YUYV;
 	case DRM_FORMAT_YVYU:
@@ -13371,6 +13375,7 @@  static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 	}
 
 	switch (format) {
+
 	case DRM_FORMAT_XRGB8888:
 	case DRM_FORMAT_XBGR8888:
 	case DRM_FORMAT_ARGB8888:
@@ -13387,6 +13392,7 @@  static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 	case DRM_FORMAT_UYVY:
 	case DRM_FORMAT_VYUY:
 	case DRM_FORMAT_NV12:
+	case DRM_FORMAT_XYUV:
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */
@@ -14510,6 +14516,7 @@  static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 			goto err;
 		}
 		break;
+	case DRM_FORMAT_XYUV:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 	case DRM_FORMAT_YVYU:
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 344c0e709b19..812e4e8afe2b 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1421,6 +1421,7 @@  static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 	case DRM_FORMAT_UYVY:
 	case DRM_FORMAT_VYUY:
 	case DRM_FORMAT_NV12:
+	case DRM_FORMAT_XYUV:
 		if (modifier == I915_FORMAT_MOD_Yf_TILED)
 			return true;
 		/* fall through */