From patchwork Tue Jun 27 14:59:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9812183 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 A024860351 for ; Tue, 27 Jun 2017 15:00:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94F9A286AA for ; Tue, 27 Jun 2017 15:00:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89E75286CF; Tue, 27 Jun 2017 15:00:58 +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=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 52872286AA for ; Tue, 27 Jun 2017 15:00:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 209366E40F; Tue, 27 Jun 2017 15:00:05 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E515A6E403 for ; Tue, 27 Jun 2017 14:59:59 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id y5so6275060wmh.3 for ; Tue, 27 Jun 2017 07:59:59 -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=17ppNxAJood/h01UacZu3GjcycMqllTPWq9Ecp4476o=; b=VYdzKSyERo8eWcvQ1nqpegNUVIweeCrRsoOxdLUEEBJabiwa7djIKJIMmD9gPWHyHb XHKV9h5xw+GNwhqzaU+MPfHbe9eXeMFVx4TOJXQY264VuUqv7la6qjDDVOqgqONoj9T9 9q64slrfDIhwTId1PpUFwY9bLW2aGntmCggPA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=17ppNxAJood/h01UacZu3GjcycMqllTPWq9Ecp4476o=; b=YKfTRZ5ZnaY67SwjVRU8S7/R0SQ2k16Bd3d9EyLnWoUT1m6HTmyLQOd4+6353ad+uV fmltkE6ZR2nUF8pXPa1k75zfUZ6cHc/i4GaG518DaHX9DSvPfWUNO26RTK3NWbhgB1o0 c61gBJl8OF9BYq2ZF4XgIAYg/iMDvC+pPonMBSOyPrWMSFbk+I4zefe97grH6vN6C7dh Ed9cntmEMh4jL4L1WsXSU8o+ie9lW+0DrcMPVkskiaYDX+mkV/smy1jz2H/7nfet1edo /aiYRiA5cIthekH/f3hn5l5NyynFjKy6vf/DWI+QQ5XULSVyy66+obZrGKwgCXM/DyUt zCLw== X-Gm-Message-State: AKS2vOxxZuwh8V8HDUW5PAwkdWOeLyzj89fHYzKqEslZLYuLl25dRna6 RGypEQ3GRjafp1jtyVE= X-Received: by 10.80.180.236 with SMTP id x41mr4290754edd.117.1498575598626; Tue, 27 Jun 2017 07:59:58 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id x44sm1557561edx.38.2017.06.27.07.59.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jun 2017 07:59:57 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 27 Jun 2017 16:59:36 +0200 Message-Id: <20170627145936.18983-14-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170627145936.18983-1-daniel.vetter@ffwll.ch> References: <20170627145936.18983-1-daniel.vetter@ffwll.ch> Cc: Alex Deucher , Daniel Vetter , Intel Graphics Development , Daniel Vetter , Andrey Grodzovsky Subject: [Intel-gfx] [PATCH 13/13] drm/atomic-helper: Realign function parameters 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 Too jarring. Fixes: f869a6ecf254 ("drm/atomic: Add target_vblank support in atomic helpers (v2)") Cc: Andrey Grodzovsky Cc: Alex Deucher Signed-off-by: Daniel Vetter Reviewed-by: Alex Deucher Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_atomic_helper.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 2f269e4267da..5a80b6960ae1 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2964,12 +2964,11 @@ drm_atomic_helper_connector_set_property(struct drm_connector *connector, } EXPORT_SYMBOL(drm_atomic_helper_connector_set_property); -static int page_flip_common( - struct drm_atomic_state *state, - struct drm_crtc *crtc, - struct drm_framebuffer *fb, - struct drm_pending_vblank_event *event, - uint32_t flags) +static int page_flip_common(struct drm_atomic_state *state, + struct drm_crtc *crtc, + struct drm_framebuffer *fb, + struct drm_pending_vblank_event *event, + uint32_t flags) { struct drm_plane *plane = crtc->primary; struct drm_plane_state *plane_state; @@ -3063,13 +3062,12 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip); * Returns: * Returns 0 on success, negative errno numbers on failure. */ -int drm_atomic_helper_page_flip_target( - struct drm_crtc *crtc, - struct drm_framebuffer *fb, - struct drm_pending_vblank_event *event, - uint32_t flags, - uint32_t target, - struct drm_modeset_acquire_ctx *ctx) +int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc, + struct drm_framebuffer *fb, + struct drm_pending_vblank_event *event, + uint32_t flags, + uint32_t target, + struct drm_modeset_acquire_ctx *ctx) { struct drm_plane *plane = crtc->primary; struct drm_atomic_state *state;