From patchwork Tue Mar 11 10:30:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3810861 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 189E8BF540 for ; Tue, 11 Mar 2014 10:31:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 04E842021F for ; Tue, 11 Mar 2014 10:31:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DE1BE202A1 for ; Tue, 11 Mar 2014 10:31:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B36CEFA19A; Tue, 11 Mar 2014 03:31:34 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com [74.125.83.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 90B87FAB6D for ; Tue, 11 Mar 2014 03:31:11 -0700 (PDT) Received: by mail-ee0-f47.google.com with SMTP id b15so3585805eek.6 for ; Tue, 11 Mar 2014 03:31: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=IdN/Z9YXQlB662ZqNFMG/Apv6If67ilNAlQAghWI0+Q=; b=daJm0DSJ+rROsn0mZ0QVkr+avxa/o2SGO18LTaJ3GVkmufyDate9oDoO8f5cTFJqNY wvjd11/Utd2alvj08VuLyNuWyqE/mf63zgxFjU94bGf3Q4mohr5VgGVERRMiVH1I2GHn F2UeulJwwzMfomO1KqPU/80xg4Trj8nkJzU7Q= 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=IdN/Z9YXQlB662ZqNFMG/Apv6If67ilNAlQAghWI0+Q=; b=NhRr/EVQsoFSCL3Ae2BnC9lYWtvzk8OmkrPF7sUg/mLShV1kaN3Uz4q3kYvEH4Nf2E /Xh2S0Y1OycamZ606eUxiO+8FWk7gY+d4+7TuWVF6khlDj5yluPPI+15WmQkR1iSUHx7 iJrmYAxI+frJh26CrVDiQNM82hDyEH62oHiwAQp87x4XDECvCCn25rL1hJT531k8rXrK q9Q0qrI/N4r6+oHd77EX3QnXzNuqGp9XHeoeonWWHXMrffwIhGEDovp6cUZMFIzn29u6 OZdlCUrodV9He+/2u7o79ME53q6d9cUq9v/5YpIjdQsy/Aia1K+xsaQMjrPpk/JS34zY bZZw== X-Gm-Message-State: ALoCoQnJiY8hle7UIw+G0Obrz/JmSEU1N7jKcWOLCMSunNPzq+2H3nNMyV27j1IjTerwySGn7f8v X-Received: by 10.15.60.199 with SMTP id g47mr40852929eex.37.1394533870973; Tue, 11 Mar 2014 03:31:10 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id q44sm55958331eez.1.2014.03.11.03.31.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Mar 2014 03:31:10 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 20/34] drm/doc: Repleace LOCKING kerneldoc sections in drm_modes.c Date: Tue, 11 Mar 2014 11:30:16 +0100 Message-Id: <1394533830-30150-21-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1394533830-30150-1-git-send-email-daniel.vetter@ffwll.ch> References: <1394533830-30150-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 There's not really any value in stating that no locking is needed. And even if the comment is useful, a check for the right mutex at the beginning of the function is better since that can't be ingored as easily as a bit of documentation. Note that drm_mode_probed_add in drm_crtc.c is also changed, the next patch will move this into drm_modes.c v2: Don't add locking WARN_ONs where it is not strictly required (i.e. the two functions to validate/prune mode lists). Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc.c | 2 ++ drivers/gpu/drm/drm_modes.c | 59 ++------------------------------------------- 2 files changed, 4 insertions(+), 57 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index ea620f4cf6c7..353ff6398c36 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -730,6 +730,8 @@ EXPORT_SYMBOL(drm_crtc_index); void drm_mode_probed_add(struct drm_connector *connector, struct drm_display_mode *mode) { + WARN_ON(!mutex_is_locked(&connector->dev->mode_config.mutex)); + list_add_tail(&mode->head, &connector->probed_modes); } EXPORT_SYMBOL(drm_mode_probed_add); diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 4892194937f3..be86fed30fda 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -42,9 +42,6 @@ * drm_mode_debug_printmodeline - print a mode to dmesg * @mode: mode to print * - * LOCKING: - * none. - * * Describe @mode using DRM_DEBUG. */ void drm_mode_debug_printmodeline(const struct drm_display_mode *mode) @@ -69,9 +66,6 @@ EXPORT_SYMBOL(drm_mode_debug_printmodeline); * @interlaced:Whether the interlace is supported * @margins: whether to add margins or not * - * LOCKING: - * none. - * * return the modeline based on CVT algorithm * * This function is called to generate the modeline based on CVT algorithm @@ -294,9 +288,6 @@ EXPORT_SYMBOL(drm_cvt_mode); * @GTF_K: extended GTF formula parameters * @GTF_2J: extended GTF formula parameters * - * LOCKING. - * none. - * * return the modeline based on full GTF algorithm. * * GTF feature blocks specify C and J in multiples of 0.5, so we pass them @@ -479,9 +470,6 @@ EXPORT_SYMBOL(drm_gtf_mode_complex); * @interlaced :whether the interlace is supported * @margins :whether the margin is supported * - * LOCKING. - * none. - * * return the modeline based on GTF algorithm * * This function is to create the modeline based on the GTF algorithm. @@ -584,9 +572,6 @@ EXPORT_SYMBOL_GPL(of_get_drm_display_mode); * drm_mode_set_name - set the name on a mode * @mode: name will be set in this mode * - * LOCKING: - * None. - * * Set the name of @mode to a standard format. */ void drm_mode_set_name(struct drm_display_mode *mode) @@ -603,9 +588,6 @@ EXPORT_SYMBOL(drm_mode_set_name); * drm_mode_width - get the width of a mode * @mode: mode * - * LOCKING: - * None. - * * Return @mode's width (hdisplay) value. * * FIXME: is this needed? @@ -624,9 +606,6 @@ EXPORT_SYMBOL(drm_mode_width); * drm_mode_height - get the height of a mode * @mode: mode * - * LOCKING: - * None. - * * Return @mode's height (vdisplay) value. * * FIXME: is this needed? @@ -643,9 +622,6 @@ EXPORT_SYMBOL(drm_mode_height); /** drm_mode_hsync - get the hsync of a mode * @mode: mode * - * LOCKING: - * None. - * * Return @modes's hsync rate in kHz, rounded to the nearest int. */ int drm_mode_hsync(const struct drm_display_mode *mode) @@ -670,9 +646,6 @@ EXPORT_SYMBOL(drm_mode_hsync); * drm_mode_vrefresh - get the vrefresh of a mode * @mode: mode * - * LOCKING: - * None. - * * Return @mode's vrefresh rate in Hz or calculate it if necessary. * * FIXME: why is this needed? shouldn't vrefresh be set already? @@ -713,9 +686,6 @@ EXPORT_SYMBOL(drm_mode_vrefresh); * @p: mode * @adjust_flags: a combination of adjustment flags * - * LOCKING: - * None. - * * Setup the CRTC modesetting parameters for @p, adjusting if necessary. * * - The CRTC_INTERLACE_HALVE_V flag can be used to halve vertical timings of @@ -790,9 +760,6 @@ EXPORT_SYMBOL(drm_mode_set_crtcinfo); * @dst: mode to overwrite * @src: mode to copy * - * LOCKING: - * None. - * * Copy an existing mode into another mode, preserving the object id and * list head of the destination mode. */ @@ -812,9 +779,6 @@ EXPORT_SYMBOL(drm_mode_copy); * @dev: drm_device to allocate the duplicated mode for * @mode: mode to duplicate * - * LOCKING: - * None. - * * Just allocate a new mode, copy the existing mode into it, and return * a pointer to it. Used to create new instances of established modes. */ @@ -838,9 +802,6 @@ EXPORT_SYMBOL(drm_mode_duplicate); * @mode1: first mode * @mode2: second mode * - * LOCKING: - * None. - * * Check to see if @mode1 and @mode2 are equivalent. * * RETURNS: @@ -869,9 +830,6 @@ EXPORT_SYMBOL(drm_mode_equal); * @mode1: first mode * @mode2: second mode * - * LOCKING: - * None. - * * Check to see if @mode1 and @mode2 are equivalent, but * don't check the pixel clocks nor the stereo layout. * @@ -907,9 +865,6 @@ EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo); * @maxY: maximum height * @maxPitch: max pitch * - * LOCKING: - * Caller must hold a lock protecting @mode_list. - * * The DRM device (@dev) has size and pitch limits. Here we validate the * modes we probed for @dev against those limits and set their status as * necessary. @@ -939,9 +894,6 @@ EXPORT_SYMBOL(drm_mode_validate_size); * @mode_list: list of modes to check * @verbose: be verbose about it * - * LOCKING: - * Caller must hold a lock protecting @mode_list. - * * Once mode list generation is complete, a caller can use this routine to * remove invalid modes from a mode list. If any of the modes have a * status other than %MODE_OK, they are removed from @mode_list and freed. @@ -971,9 +923,6 @@ EXPORT_SYMBOL(drm_mode_prune_invalid); * @lh_a: list_head for first mode * @lh_b: list_head for second mode * - * LOCKING: - * None. - * * Compare two modes, given by @lh_a and @lh_b, returning a value indicating * which is better. * @@ -1007,9 +956,6 @@ static int drm_mode_compare(void *priv, struct list_head *lh_a, struct list_head * drm_mode_sort - sort mode list * @mode_list: list to sort * - * LOCKING: - * Caller must hold a lock protecting @mode_list. - * * Sort @mode_list by favorability, putting good modes first. */ void drm_mode_sort(struct list_head *mode_list) @@ -1022,9 +968,6 @@ EXPORT_SYMBOL(drm_mode_sort); * drm_mode_connector_list_update - update the mode list for the connector * @connector: the connector to update * - * LOCKING: - * Caller must hold a lock protecting @mode_list. - * * This moves the modes from the @connector probed_modes list * to the actual mode list. It compares the probed mode against the current * list and only adds different modes. All modes unverified after this point @@ -1036,6 +979,8 @@ void drm_mode_connector_list_update(struct drm_connector *connector) struct drm_display_mode *pmode, *pt; int found_it; + WARN_ON(!mutex_is_locked(&connector->dev->mode_config.mutex)); + list_for_each_entry_safe(pmode, pt, &connector->probed_modes, head) { found_it = 0;