From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH 2/3] drm/vc4: Add missing formats to vc4_format_mod_supported(). Date: Fri, 16 Mar 2018 15:04:34 -0700 Message-ID: <20180316220435.31416-2-eric@anholt.net> References: <20180316220435.31416-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 34B916EBFA for ; Fri, 16 Mar 2018 22:04:38 +0000 (UTC) In-Reply-To: <20180316220435.31416-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Dave Stevenson , Daniel Stone List-Id: dri-devel@lists.freedesktop.org RGFuaWVsJ3MgZm9ybWF0X21vZF9zdXBwb3J0ZWQoKSBwYXRjaCBwcmVkYXRlZCBEYXZlJ3MgZm9y IE5WMjEvNjEsIGFuZApJIGRpZG4ndCBjYXRjaCB0aGF0IHdoZW4gcmViYXNpbmcuICBUaGlzIGlz IGEgcHJvYmxlbSBzaW5jZSB0aGUKZm9ybWF0cyBhcmUgbm93IGdldHRpbmcgdmFsaWRhdGVkIGJl Zm9yZSBiZWluZyBwYXNzZWQgdG8gdGhlIGRyaXZlcidzCmF0b21pYyBob29rcy4KClNpZ25lZC1v ZmYtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+CkNjOiBEYW5pZWwgU3RvbmUgPGRh bmllbHNAY29sbGFib3JhLmNvbT4KQ2M6IERhdmUgU3RldmVuc29uIDxkYXZlLnN0ZXZlbnNvbkBy YXNwYmVycnlwaS5vcmc+CkZpeGVzOiA0MjNhZDdiM2NiZDEgKCJkcm0vdmM0OiBBZHZlcnRpc2Ug c3VwcG9ydGVkIG1vZGlmaWVycyBmb3IgcGxhbmVzIikKLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmM0 L3ZjNF9wbGFuZS5jIHwgMiArKwogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9k cm0vdmM0L3ZjNF9wbGFuZS5jCmluZGV4IGNlMzkzOTBiZTM4OS4uYmEwMGMxNGY5ODlhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS92YzQvdmM0X3BsYW5lLmMKQEAgLTg4NCw3ICs4ODQsOSBAQCBzdGF0aWMgYm9vbCB2YzRf Zm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJY2FzZSBEUk1f Rk9STUFUX1lVVjQyMDoKIAljYXNlIERSTV9GT1JNQVRfWVZVNDIwOgogCWNhc2UgRFJNX0ZPUk1B VF9OVjEyOgorCWNhc2UgRFJNX0ZPUk1BVF9OVjIxOgogCWNhc2UgRFJNX0ZPUk1BVF9OVjE2Ogor CWNhc2UgRFJNX0ZPUk1BVF9OVjYxOgogCWRlZmF1bHQ6CiAJCXJldHVybiAobW9kaWZpZXIgPT0g RFJNX0ZPUk1BVF9NT0RfTElORUFSKTsKIAl9Ci0tIAoyLjE2LjIKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751586AbeCPWEj (ORCPT ); Fri, 16 Mar 2018 18:04:39 -0400 Received: from anholt.net ([50.246.234.109]:48990 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbeCPWEi (ORCPT ); Fri, 16 Mar 2018 18:04:38 -0400 From: Eric Anholt To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Eric Anholt , Daniel Stone , Dave Stevenson Subject: [PATCH 2/3] drm/vc4: Add missing formats to vc4_format_mod_supported(). Date: Fri, 16 Mar 2018 15:04:34 -0700 Message-Id: <20180316220435.31416-2-eric@anholt.net> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316220435.31416-1-eric@anholt.net> References: <20180316220435.31416-1-eric@anholt.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Daniel's format_mod_supported() patch predated Dave's for NV21/61, and I didn't catch that when rebasing. This is a problem since the formats are now getting validated before being passed to the driver's atomic hooks. Signed-off-by: Eric Anholt Cc: Daniel Stone Cc: Dave Stevenson Fixes: 423ad7b3cbd1 ("drm/vc4: Advertise supported modifiers for planes") --- drivers/gpu/drm/vc4/vc4_plane.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index ce39390be389..ba00c14f989a 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -884,7 +884,9 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, case DRM_FORMAT_YUV420: case DRM_FORMAT_YVU420: case DRM_FORMAT_NV12: + case DRM_FORMAT_NV21: case DRM_FORMAT_NV16: + case DRM_FORMAT_NV61: default: return (modifier == DRM_FORMAT_MOD_LINEAR); } -- 2.16.2