From patchwork Wed Mar 30 14:19:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8697131 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 696B19F44D for ; Wed, 30 Mar 2016 14:20:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95D9B20386 for ; Wed, 30 Mar 2016 14:20:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BA42A20383 for ; Wed, 30 Mar 2016 14:20:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E53B6E81E; Wed, 30 Mar 2016 14:19:51 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com [IPv6:2a00:1450:400c:c09::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id E34BE6E81E for ; Wed, 30 Mar 2016 14:19:48 +0000 (UTC) Received: by mail-wm0-x236.google.com with SMTP id p65so185535649wmp.1 for ; Wed, 30 Mar 2016 07:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3eU1pVNMemR20WohvsQYeqrcKhkTHR6jKZ94PmEXNks=; b=FcbNSNwurok+k1WPGOmA6AU3R67g6/3eSz5ensaWrIQK2LpsiJQ1DIr/C75S82ZeEV UJTGYA9asi55fvFe3WZjEeCeByTj94d2ug3Zb8ajD/cJL9+usrPjueoiDrzdWNJIypbE 9nmew8BfaGfaUrE53cDQPCxn07EBKHNJZ6ygM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3eU1pVNMemR20WohvsQYeqrcKhkTHR6jKZ94PmEXNks=; b=by4EZcu2xWhoL2YL7yE7zphYaElU9M5DenagxrwTWKC85YK7jAMtOfIvQ7GzUj9w+J ntRt/kYQy4jZH0Ie6zeoBtk+zWhO9vbSHe2yT7CkXNG30KXej/kjchD+4lI72gCkYKK2 x8OjiJe64lDKReWTPKg3vcgOjlBg9gNN2WAWm4OGLb24MNuthySj7K4xESmtENSt9qbj fBi2029Huu9VmR3QLINH+MYV0Q1JYKD6PqrSyMHMuUBUUKWjf2X5ymvFflvKvuCkIAHu uBVhEbEPhTFK06LfzeVcWktVIlAza55e569Rb9+3xREXbO7rfgejWJRRTX1/5PYPOZq8 VhYg== X-Gm-Message-State: AD7BkJIkOI1gXwgjZ9vw1SlqJ/OpG61j5+9HksgD5IF2++JwisiOgJiHIMmhNM5eYV8Slg== X-Received: by 10.194.189.143 with SMTP id gi15mr9620394wjc.54.1459347586947; Wed, 30 Mar 2016 07:19:46 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id u16sm4728205wmd.5.2016.03.30.07.19.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 07:19:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/3] drm: Move DRM_MODE_OBJECT_* to uapi headers Date: Wed, 30 Mar 2016 16:19:44 +0200 Message-Id: <1459347584-30566-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Emil Velikov , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These type defines are officially part of the uapi, but ended up in the wrong headers somehow when we split them all. Cc: Emil Velikov Signed-off-by: Daniel Vetter Reviewed-by: Emil Velikov --- include/drm/drm_crtc.h | 10 ---------- include/uapi/drm/drm_mode.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index bc7fbb572155..8cb377c5eb93 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -45,16 +45,6 @@ struct drm_clip_rect; struct device_node; struct fence; -#define DRM_MODE_OBJECT_CRTC 0xcccccccc -#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0 -#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0 -#define DRM_MODE_OBJECT_MODE 0xdededede -#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0 -#define DRM_MODE_OBJECT_FB 0xfbfbfbfb -#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb -#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee -#define DRM_MODE_OBJECT_ANY 0 - struct drm_mode_object { uint32_t id; uint32_t type; diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index db106ab01039..8c48c0a558c0 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -318,6 +318,16 @@ struct drm_mode_connector_set_property { __u32 connector_id; }; +#define DRM_MODE_OBJECT_CRTC 0xcccccccc +#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0 +#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0 +#define DRM_MODE_OBJECT_MODE 0xdededede +#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0 +#define DRM_MODE_OBJECT_FB 0xfbfbfbfb +#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb +#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee +#define DRM_MODE_OBJECT_ANY 0 + struct drm_mode_obj_get_properties { __u64 props_ptr; __u64 prop_values_ptr;