From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932852AbcGEBP3 (ORCPT ); Mon, 4 Jul 2016 21:15:29 -0400 Received: from anholt.net ([50.246.234.109]:43971 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932723AbcGEBOr (ORCPT ); Mon, 4 Jul 2016 21:14:47 -0400 From: Eric Anholt To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Eric Anholt Subject: [PATCH 5/7] drm/vc4: Add a getparam to signal support for branches. Date: Mon, 4 Jul 2016 18:14:38 -0700 Message-Id: <1467681280-20317-6-git-send-email-eric@anholt.net> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1467681280-20317-1-git-send-email-eric@anholt.net> References: <1467681280-20317-1-git-send-email-eric@anholt.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Userspace needs to know if it can create shaders that do branching. Otherwise, for backwards compatibility with old kernels it needs to lower if statements to conditional assignments. Signed-off-by: Eric Anholt --- drivers/gpu/drm/vc4/vc4_drv.c | 3 +++ include/uapi/drm/vc4_drm.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 8a2f2b5a8f32..fd6e34600d50 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -59,6 +59,9 @@ static int vc4_get_param_ioctl(struct drm_device *dev, void *data, case DRM_VC4_PARAM_V3D_IDENT2: args->value = V3D_READ(V3D_IDENT2); break; + case DRM_VC4_PARAM_SUPPORTS_BRANCHES: + args->value = true; + break; default: DRM_DEBUG("Unknown parameter %d\n", args->param); return -EINVAL; diff --git a/include/uapi/drm/vc4_drm.h b/include/uapi/drm/vc4_drm.h index c4427d31b346..86cc0cd0d125 100644 --- a/include/uapi/drm/vc4_drm.h +++ b/include/uapi/drm/vc4_drm.h @@ -285,6 +285,7 @@ struct drm_vc4_get_hang_state { #define DRM_VC4_PARAM_V3D_IDENT0 0 #define DRM_VC4_PARAM_V3D_IDENT1 1 #define DRM_VC4_PARAM_V3D_IDENT2 2 +#define DRM_VC4_PARAM_SUPPORTS_BRANCHES 3 struct drm_vc4_get_param { __u32 param; -- 2.8.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH 5/7] drm/vc4: Add a getparam to signal support for branches. Date: Mon, 4 Jul 2016 18:14:38 -0700 Message-ID: <1467681280-20317-6-git-send-email-eric@anholt.net> References: <1467681280-20317-1-git-send-email-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 30E496E558 for ; Tue, 5 Jul 2016 01:14:47 +0000 (UTC) In-Reply-To: <1467681280-20317-1-git-send-email-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 List-Id: dri-devel@lists.freedesktop.org VXNlcnNwYWNlIG5lZWRzIHRvIGtub3cgaWYgaXQgY2FuIGNyZWF0ZSBzaGFkZXJzIHRoYXQgZG8g YnJhbmNoaW5nLgpPdGhlcndpc2UsIGZvciBiYWNrd2FyZHMgY29tcGF0aWJpbGl0eSB3aXRoIG9s ZCBrZXJuZWxzIGl0IG5lZWRzIHRvCmxvd2VyIGlmIHN0YXRlbWVudHMgdG8gY29uZGl0aW9uYWwg YXNzaWdubWVudHMuCgpTaWduZWQtb2ZmLWJ5OiBFcmljIEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0 PgotLS0KIGRyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5jIHwgMyArKysKIGluY2x1ZGUvdWFw aS9kcm0vdmM0X2RybS5oICAgIHwgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygr KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5jIGIvZHJpdmVycy9n cHUvZHJtL3ZjNC92YzRfZHJ2LmMKaW5kZXggOGEyZjJiNWE4ZjMyLi5mZDZlMzQ2MDBkNTAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS92YzQvdmM0X2Rydi5jCkBAIC01OSw2ICs1OSw5IEBAIHN0YXRpYyBpbnQgdmM0X2dldF9w YXJhbV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWNhc2UgRFJN X1ZDNF9QQVJBTV9WM0RfSURFTlQyOgogCQlhcmdzLT52YWx1ZSA9IFYzRF9SRUFEKFYzRF9JREVO VDIpOwogCQlicmVhazsKKwljYXNlIERSTV9WQzRfUEFSQU1fU1VQUE9SVFNfQlJBTkNIRVM6CisJ CWFyZ3MtPnZhbHVlID0gdHJ1ZTsKKwkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJRFJNX0RFQlVHKCJV bmtub3duIHBhcmFtZXRlciAlZFxuIiwgYXJncy0+cGFyYW0pOwogCQlyZXR1cm4gLUVJTlZBTDsK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9kcm0vdmM0X2RybS5oIGIvaW5jbHVkZS91YXBpL2Ry bS92YzRfZHJtLmgKaW5kZXggYzQ0MjdkMzFiMzQ2Li44NmNjMGNkMGQxMjUgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvdWFwaS9kcm0vdmM0X2RybS5oCisrKyBiL2luY2x1ZGUvdWFwaS9kcm0vdmM0X2Ry bS5oCkBAIC0yODUsNiArMjg1LDcgQEAgc3RydWN0IGRybV92YzRfZ2V0X2hhbmdfc3RhdGUgewog I2RlZmluZSBEUk1fVkM0X1BBUkFNX1YzRF9JREVOVDAJCTAKICNkZWZpbmUgRFJNX1ZDNF9QQVJB TV9WM0RfSURFTlQxCQkxCiAjZGVmaW5lIERSTV9WQzRfUEFSQU1fVjNEX0lERU5UMgkJMgorI2Rl ZmluZSBEUk1fVkM0X1BBUkFNX1NVUFBPUlRTX0JSQU5DSEVTCQkzCiAKIHN0cnVjdCBkcm1fdmM0 X2dldF9wYXJhbSB7CiAJX191MzIgcGFyYW07Ci0tIAoyLjguMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==