From patchwork Mon May 30 08:38:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9140431 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 1E89460759 for ; Mon, 30 May 2016 08:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14F3827D17 for ; Mon, 30 May 2016 08:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09E6328213; Mon, 30 May 2016 08:39:13 +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 C34D727D17 for ; Mon, 30 May 2016 08:39:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 554EB6E6C8; Mon, 30 May 2016 08:38:57 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BA306E6C3; Mon, 30 May 2016 08:38:55 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id n129so20274284wmn.1; Mon, 30 May 2016 01:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q0GD6nkO0DqjlVdFH0jSuxoncJe1wdyaxU+yj6sLyyA=; b=JKnfe3cPXY7OJNspWLtdC0HNfeqxBL0fnJ7WntDiN4gk0XPer6IOn2PmsmLAymkvPH pCenGPYSxSoTMzuz/fYR1C+dffb1GUOMJ49o0s0MeptsyV758IXcPD0MG1tV6Z5Z1rIb y+Vop0gOosA7L8ENj9SKgChZV8VDrMykx59wINZQip2EFLPc1YXfIIoD0WYxdalbvcZO Q7x2OYzsiZRoiboeCpyNPtqQtd3/wY/nBDZxuv/HlD6dGsYW2QHZbLTuwMzdyjoVI8EA Bc3OkRMbFSVn2b3ySBPN7bEwmucFGgfG8q5uGO/RAmjSLjMUYHdWzlAGji22fWV4fdNV ieCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Q0GD6nkO0DqjlVdFH0jSuxoncJe1wdyaxU+yj6sLyyA=; b=VHAzgwhUj9Xsyea3tyRjFKP3+WnyCaj/cen9xE09DEOU75R6Z1EIf/dmj+TMJdXZ2n 9jE2YRY+rrbd+BbqS5a6dEmLmAWJOlALJ1LUjFet0LvKfWCg7x3oajwaRX3sm+de0Q6h 70QwKntwNIIt3F9IuN7QLeX3VlC1Qd/gDTOi6rAki+S6pV6G/174q8GSyrmvTgCkRGki KFm1iG1Xc8wWsuu2CjvhHVWtKzjxpkgG3jInMxnUY8qhPDZ9bDXIHsffq1LsszaL0RmW UNM0hZ93sw5yWGXd6xOkNtGlctqv5eUGVO0g29mfvXTu8wm+DkNXoTrLV5xnQYMJoo+H iOBQ== X-Gm-Message-State: ALyK8tLjkwy0DiEK6gaF4udUfDNIneIezVA1QKZvgIzAL+3nx/m6x74yRE4h3sluSeluVQ== X-Received: by 10.28.144.133 with SMTP id s127mr10443117wmd.12.1464597533415; Mon, 30 May 2016 01:38:53 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id l9sm6945376wjm.0.2016.05.30.01.38.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 May 2016 01:38:52 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 30 May 2016 09:38:21 +0100 Message-Id: <1464597519-16659-4-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464597519-16659-1-git-send-email-chris@chris-wilson.co.uk> References: <1464597519-16659-1-git-send-email-chris@chris-wilson.co.uk> Cc: dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH v2 03/21] drm: Make drm_connector_register() safe against multiple calls 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 Protect against drivers that may try to register the connector more than once, or who try to unregister it multiple times. Signed-off-by: Chris Wilson Cc: dri-devel@lists.freedesktop.org Reviewed-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc.c | 9 +++++++++ include/drm/drm_crtc.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 81641544ac3e..8b9ee921a9e1 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1030,6 +1030,9 @@ int drm_connector_register(struct drm_connector *connector) { int ret; + if (connector->registered) + return 0; + ret = drm_sysfs_connector_add(connector); if (ret) return ret; @@ -1047,6 +1050,7 @@ int drm_connector_register(struct drm_connector *connector) drm_mode_object_register(connector->dev, &connector->base); + connector->registered = true; return 0; err_debugfs: @@ -1065,11 +1069,16 @@ EXPORT_SYMBOL(drm_connector_register); */ void drm_connector_unregister(struct drm_connector *connector) { + if (!connector->registered) + return; + if (connector->funcs->early_unregister) connector->funcs->early_unregister(connector); drm_sysfs_connector_remove(connector); drm_debugfs_connector_remove(connector); + + connector->registered = false; } EXPORT_SYMBOL(drm_connector_unregister); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 77b775cff4e7..35e47eea5ee1 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1212,6 +1212,7 @@ struct drm_connector { bool interlace_allowed; bool doublescan_allowed; bool stereo_allowed; + bool registered; struct list_head modes; /* list of modes on this connector */ enum drm_connector_status status;