From patchwork Tue Jul 19 16:25:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9237809 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AE386602F0 for ; Tue, 19 Jul 2016 16:25:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A015E26B4A for ; Tue, 19 Jul 2016 16:25:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94F2E26E64; Tue, 19 Jul 2016 16:25:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F128C26E81 for ; Tue, 19 Jul 2016 16:25:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BFE026E6BE; Tue, 19 Jul 2016 16:25:14 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 200126E6BD for ; Tue, 19 Jul 2016 16:25:11 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id i5so3356445wmg.2 for ; Tue, 19 Jul 2016 09:25:11 -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=BUMhx4hxCvaeX5FYC0WmgHa8Ra4ZrsPb3oCYAxUTURY=; b=ILnd3O7DKGXlfm+WkNXBNqVXzgQa1PBY3uewM4HtENBWo1/csmvnMCoJW+tnnvNEBJ y7wxcN4DhdgLTTPt5ttpM61KH0Rw3WxVM/l2dSzzHlGeN3vcNqg5IJdhz2Em6IEYVIs7 OqWFL9TtE3/4cofOEPilFDGZU0klZF/GxNxhE= 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=BUMhx4hxCvaeX5FYC0WmgHa8Ra4ZrsPb3oCYAxUTURY=; b=NehAS1qe7UVINUvVeXil0ao9qQGwr5Mkj9YknLP2RS6o2jS9v14ycCeCUC8O67GKhR YUN1yj1eMJsbR6jkE7D7cAUtt5oQKvXhYzFhYJmhDwYFI5TarnkOprcLpDnzgGIsY/EH f/o0H9C60Ygsr3u/uOZ0WUcF4Cd/IrlcK0mITYbb5ke/hS1HQB8JsZ/sRr00M761bCgk WhZA2MDIMCsXMd8V5+pozCdibbBZdFOvz7oIkoI6s0bQccAUnKwfCf+K3B1PyKFrZdpz 2VZIi3KlR66B4wr6IRcjDScDlCvF5id77hlCavX92PtEfbKxohKwkYCLbDxhfm1D7d2b 0fWg== X-Gm-Message-State: ALyK8tLeTEPABK4RQpv2IRgj2+If9JMRMybg6mvQbGuU1Z6P4/yP62Lyk+6u7XjxH7GPZQ== X-Received: by 10.28.22.6 with SMTP id 6mr5619423wmw.55.1468945508284; Tue, 19 Jul 2016 09:25:08 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id e65sm5251677wmg.3.2016.07.19.09.25.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jul 2016 09:25:07 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 19 Jul 2016 18:25:01 +0200 Message-Id: <1468945501-23166-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1468925872-26405-1-git-send-email-daniel.vetter@ffwll.ch> References: <1468925872-26405-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , DRI Development Subject: [Intel-gfx] [PATCH] drm: drm_connector->s/connector_id/index/ for consistency X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP connector_id in the uapi actually means drm_connector->base.id, which is something entirely different. And ->index is also consistent with plane/encoder/CRTCS and the various drm_*_index() functions. While at it also improve/align the kerneldoc comment. v2: Mention where those ids are from ... v3: Add -ing to supporting and try to not break the world. Cc: Chris Wilson Cc: Maarten Lankhorst Acked-by: Chris Wilson Acked-by: Maarten Lankhorst Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/drm_crtc.c | 12 ++++++------ include/drm/drm_crtc.h | 13 ++++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index c456628740dd..da9bbe0fdb1e 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -934,11 +934,11 @@ int drm_connector_init(struct drm_device *dev, connector->dev = dev; connector->funcs = funcs; - connector->connector_id = ida_simple_get(&config->connector_ida, 0, 0, GFP_KERNEL); - if (connector->connector_id < 0) { - ret = connector->connector_id; + ret = ida_simple_get(&config->connector_ida, 0, 0, GFP_KERNEL); + if (ret < 0) goto out_put; - } + connector->index = ret; + ret = 0; connector->connector_type = connector_type; connector->connector_type_id = @@ -986,7 +986,7 @@ out_put_type_id: ida_remove(connector_ida, connector->connector_type_id); out_put_id: if (ret) - ida_remove(&config->connector_ida, connector->connector_id); + ida_remove(&config->connector_ida, connector->index); out_put: if (ret) drm_mode_object_unregister(dev, &connector->base); @@ -1030,7 +1030,7 @@ void drm_connector_cleanup(struct drm_connector *connector) connector->connector_type_id); ida_remove(&dev->mode_config.connector_ida, - connector->connector_id); + connector->index); kfree(connector->display_info.bus_formats); drm_mode_object_unregister(dev, &connector->base); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index f8ba5aab5d28..3edeaf88ebc0 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1246,7 +1246,6 @@ struct drm_encoder { * @head: list management * @base: base KMS object * @name: human readable name, can be overwritten by the driver - * @connector_id: compacted connector id useful indexing arrays * @connector_type: one of the %DRM_MODE_CONNECTOR_ types from drm_mode.h * @connector_type_id: index into connector type enum * @interlace_allowed: can this connector handle interlaced modes? @@ -1303,7 +1302,15 @@ struct drm_connector { struct drm_mode_object base; char *name; - int connector_id; + + /** + * @index: Compacted connector index, which matches the position inside + * the mode_config.list for drivers not supporting hot-add/removing. Can + * be used as an array index. It is invariant over the lifetime of the + * connector. + */ + unsigned index; + int connector_type; int connector_type_id; bool interlace_allowed; @@ -2764,7 +2771,7 @@ void drm_connector_unregister(struct drm_connector *connector); extern void drm_connector_cleanup(struct drm_connector *connector); static inline unsigned drm_connector_index(struct drm_connector *connector) { - return connector->connector_id; + return connector->index; } extern __printf(5, 6)