[Intel-gfx] [PATCH 2/2] drm/i915: Reject Yf tiling for 8cpp formats

[Maarten Lankhorst]

Op 21-03-2019 om 11:27 schreef Ville Syrjälä:
> On Thu, Mar 21, 2019 at 10:15:46AM +0100, Maarten Lankhorst wrote:
>> This was missing in the original addition of those formats, but in
>> PLANE_SIZE description it's mentioned that 8 cpp formats are not
>> valid with Yf tiling. Reject this case properly.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_sprite.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
>> index aca987356194..b4a120b1e29e 100644
>> --- a/drivers/gpu/drm/i915/intel_sprite.c
>> +++ b/drivers/gpu/drm/i915/intel_sprite.c
>> @@ -2111,8 +2111,6 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
>>  	case DRM_FORMAT_Y212:
>>  	case DRM_FORMAT_Y216:
> Those Y2xx formats can't do Yf tiling either.
Ah, found the tables. Looks like we need to be even more strict and forbid more stuff. :)
>>  	case DRM_FORMAT_XVYU2101010:
>> -	case DRM_FORMAT_XVYU12_16161616:
>> -	case DRM_FORMAT_XVYU16161616:
>>  		if (modifier == I915_FORMAT_MOD_Yf_TILED)
>>  			return true;
>>  		/* fall through */
>> @@ -2121,6 +2119,8 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
>>  	case DRM_FORMAT_ABGR16161616F:
>>  	case DRM_FORMAT_XRGB16161616F:
>>  	case DRM_FORMAT_ARGB16161616F:
>> +	case DRM_FORMAT_XVYU12_16161616:
>> +	case DRM_FORMAT_XVYU16161616:
>>  		if (modifier == DRM_FORMAT_MOD_LINEAR ||
>>  		    modifier == I915_FORMAT_MOD_X_TILED ||
>>  		    modifier == I915_FORMAT_MOD_Y_TILED)
>> -- 
>> 2.20.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx