From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9179C3F2D4 for ; Tue, 28 Jun 2022 02:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343552AbiF1Cdc (ORCPT ); Mon, 27 Jun 2022 22:33:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244793AbiF1C2B (ORCPT ); Mon, 27 Jun 2022 22:28:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 175C826116; Mon, 27 Jun 2022 19:26:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CAF66B81C0A; Tue, 28 Jun 2022 02:26:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D182C36AEB; Tue, 28 Jun 2022 02:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656383183; bh=wkSmQyAu5AuFSwI7zDzGyA+yFclqeuoENP4rZQ/qlVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sD2AXDF/dIRnhBn/fX5XD4OWz069WXUPi1BZR51nekOFo/VULvx7RcoAbbf4E2ZcP 0RfOokk7YAwjTW0X3UsvOSY0TupC2G38B3si9XjDkCKF/FVFDKpHgHcX6qOPx1svW/ TaZxHvH+0Jfd3ypvLMk44CzP+pV9Eo9y1YvnL7P48Nx87kwzvRxTc3fv+85s+OOjQy zVx4jP5sCVYCj5LkO3sIq6KTB8LLln8sV2dQajQh38GUg9KPAS++RwDZUJA5eFHbCm HF2E/R0bnFjrNrVmszMaqyv+m2LabQzTLa2KeaC6SSXLrpqKhPOH4uHmtrmawnfvtG /FggKRPgOZM0Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maxime Ripard , Melissa Wen , Sasha Levin , emma@anholt.net, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 04/17] drm/vc4: crtc: Use an union to store the page flip callback Date: Mon, 27 Jun 2022 22:26:02 -0400 Message-Id: <20220628022615.596977-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022615.596977-1-sashal@kernel.org> References: <20220628022615.596977-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maxime Ripard [ Upstream commit 2523e9dcc3be91bf9fdc0d1e542557ca00bbef42 ] We'll need to extend the vc4_async_flip_state structure to rely on another callback implementation, so let's move the current one into a union. Reviewed-by: Melissa Wen Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20220610115149.964394-10-maxime@cerno.tech Signed-off-by: Sasha Levin --- drivers/gpu/drm/vc4/vc4_crtc.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 7747f160c740..2ef60dd42a52 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -737,17 +737,17 @@ struct vc4_async_flip_state { struct drm_framebuffer *fb; struct drm_pending_vblank_event *event; - struct vc4_seqno_cb cb; + union { + struct vc4_seqno_cb seqno; + } cb; }; /* Called when the V3D execution for the BO being flipped to is done, so that * we can actually update the plane's address to point to it. */ static void -vc4_async_page_flip_complete(struct vc4_seqno_cb *cb) +vc4_async_page_flip_complete(struct vc4_async_flip_state *flip_state) { - struct vc4_async_flip_state *flip_state = - container_of(cb, struct vc4_async_flip_state, cb); struct drm_crtc *crtc = flip_state->crtc; struct drm_device *dev = crtc->dev; struct vc4_dev *vc4 = to_vc4_dev(dev); @@ -769,6 +769,14 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb) up(&vc4->async_modeset); } +static void vc4_async_page_flip_seqno_complete(struct vc4_seqno_cb *cb) +{ + struct vc4_async_flip_state *flip_state = + container_of(cb, struct vc4_async_flip_state, cb.seqno); + + vc4_async_page_flip_complete(flip_state); +} + /* Implements async (non-vblank-synced) page flips. * * The page flip ioctl needs to return immediately, so we grab the @@ -814,8 +822,8 @@ static int vc4_async_page_flip(struct drm_crtc *crtc, drm_atomic_set_fb_for_plane(plane->state, fb); plane->fb = fb; - vc4_queue_seqno_cb(dev, &flip_state->cb, bo->seqno, - vc4_async_page_flip_complete); + vc4_queue_seqno_cb(dev, &flip_state->cb.seqno, bo->seqno, + vc4_async_page_flip_seqno_complete); /* Driver takes ownership of state on successful async commit. */ return 0; -- 2.35.1