From nobody Tue Dec 2 02:32:19 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BF0A359F8F for ; Wed, 19 Nov 2025 16:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763570632; cv=none; b=GWkGoX4NrOTuOOCcdMKybPIAWNfS9cErYKFKRwlvRf3DDo2BFSpT2sUDkfAcVUq7bX58PfdAO3s8VBbCC05csZVBU985/xMfwXH5LTXaP+j86QFGTA0ZXU/CRi4TeQj7mZaeqtCvy4I2VhulSJ32LMAq468ytZvJXCM8qTn73tM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763570632; c=relaxed/simple; bh=OBYVd22j8eoSzc6slWMraP5IEXtWSEY+qoCTkxSiTIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SWLyV5sAq4o8um6qh7gqfbnTtcHXhqDRf1emiclzXkB+E3HfnkNSrhLwOwulZT35nwpYHP3QyLEvfskZl3OaswPiEG2ohAAZdX3rWge+H6NaJTqdGa5GOWQSH82VvByWBj1poWGkaDBYBSHm/e6oQ3lXgRgKwHgaZ2VDA120FYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=kn2YtVG1; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="kn2YtVG1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1763570626; bh=OBYVd22j8eoSzc6slWMraP5IEXtWSEY+qoCTkxSiTIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kn2YtVG10htrETxoAr9nVKI9k4h0jPXcgCcbxPRjRGn6+ItMkQDpIZYSPPuHXQ/Yz 7EP5Q70sT5MT0S93N26Q7EsRV8oiF1FaykQ3IRT7wh5hpoZV6AWf4NqqB1m+igqO9T hLXkmufuItUPwYZbz82RoheIl9ZFYeTU2UVfYZCNCHslxrFr3+WlsYyCl/K7yD5emH ZZV17G8w2/4I80wi6o1DJrPkeAkRHwTgEIKEAguQ0zsjTqSIhvhij3IvQwxA1vPzTy gcyY+jbSLICPfWFKucvBJOUoexBmmBqdhXFtBVFDB6Gx40qqwx5enxQuXAU6Mz3+nN ZYUPiAUeDTCPA== Received: from localhost.localdomain (unknown [92.206.121.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: gerddie) by bali.collaboradmins.com (Postfix) with ESMTPSA id E7F5017E10E7; Wed, 19 Nov 2025 17:43:45 +0100 (CET) From: gert.wollny@collabora.com To: Christian Gmeiner Cc: Lucas Stach , Russell King , David Airlie , Daniel Vetter , Marek Vasut , etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Gert Wollny Subject: [PATCH v5 2/5] drm/etnaviv: move some functions to a header to be able to use them externally Date: Wed, 19 Nov 2025 17:45:48 +0100 Message-ID: <20251119164624.9297-3-gert.wollny@collabora.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251119164624.9297-1-gert.wollny@collabora.com> References: <20251110144625.18653-1-gert.wollny@collabora.com> <20251119164624.9297-1-gert.wollny@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gert Wollny v2: Add license info to header v3: remove unused headers (Christian Gmainer) Signed-off-by: Gert Wollny Reviewed-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 71 +-------------------- drivers/gpu/drm/etnaviv/etnaviv_buffer.h | 79 ++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 70 deletions(-) create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_buffer.h diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etn= aviv/etnaviv_buffer.c index 384df1659..829f8497d 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c @@ -9,6 +9,7 @@ #include "etnaviv_gpu.h" #include "etnaviv_gem.h" #include "etnaviv_mmu.h" +#include "etnaviv_buffer.h" =20 #include "common.xml.h" #include "state.xml.h" @@ -17,76 +18,6 @@ #include "state_3d.xml.h" #include "cmdstream.xml.h" =20 -/* - * Command Buffer helper: - */ - - -static inline void OUT(struct etnaviv_cmdbuf *buffer, u32 data) -{ - u32 *vaddr =3D (u32 *)buffer->vaddr; - - BUG_ON(buffer->user_size >=3D buffer->size); - - vaddr[buffer->user_size / 4] =3D data; - buffer->user_size +=3D 4; -} - -static inline void CMD_LOAD_STATE(struct etnaviv_cmdbuf *buffer, - u32 reg, u32 value) -{ - u32 index =3D reg >> VIV_FE_LOAD_STATE_HEADER_OFFSET__SHR; - - buffer->user_size =3D ALIGN(buffer->user_size, 8); - - /* write a register via cmd stream */ - OUT(buffer, VIV_FE_LOAD_STATE_HEADER_OP_LOAD_STATE | - VIV_FE_LOAD_STATE_HEADER_COUNT(1) | - VIV_FE_LOAD_STATE_HEADER_OFFSET(index)); - OUT(buffer, value); -} - -static inline void CMD_END(struct etnaviv_cmdbuf *buffer) -{ - buffer->user_size =3D ALIGN(buffer->user_size, 8); - - OUT(buffer, VIV_FE_END_HEADER_OP_END); -} - -static inline void CMD_WAIT(struct etnaviv_cmdbuf *buffer, - unsigned int waitcycles) -{ - buffer->user_size =3D ALIGN(buffer->user_size, 8); - - OUT(buffer, VIV_FE_WAIT_HEADER_OP_WAIT | waitcycles); -} - -static inline void CMD_LINK(struct etnaviv_cmdbuf *buffer, - u16 prefetch, u32 address) -{ - buffer->user_size =3D ALIGN(buffer->user_size, 8); - - OUT(buffer, VIV_FE_LINK_HEADER_OP_LINK | - VIV_FE_LINK_HEADER_PREFETCH(prefetch)); - OUT(buffer, address); -} - -static inline void CMD_STALL(struct etnaviv_cmdbuf *buffer, - u32 from, u32 to) -{ - buffer->user_size =3D ALIGN(buffer->user_size, 8); - - OUT(buffer, VIV_FE_STALL_HEADER_OP_STALL); - OUT(buffer, VIV_FE_STALL_TOKEN_FROM(from) | VIV_FE_STALL_TOKEN_TO(to)); -} - -static inline void CMD_SEM(struct etnaviv_cmdbuf *buffer, u32 from, u32 to) -{ - CMD_LOAD_STATE(buffer, VIVS_GL_SEMAPHORE_TOKEN, - VIVS_GL_SEMAPHORE_TOKEN_FROM(from) | - VIVS_GL_SEMAPHORE_TOKEN_TO(to)); -} - static void etnaviv_cmd_select_pipe(struct etnaviv_gpu *gpu, struct etnaviv_cmdbuf *buffer, u8 pipe) { diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.h b/drivers/gpu/drm/etn= aviv/etnaviv_buffer.h new file mode 100644 index 000000000..4cf77cdee --- /dev/null +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.h @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2014-2025 Etnaviv Project + */ + +#ifndef etnaviv_buffer_h +#define etnaviv_buffer_h + +#include "etnaviv_cmdbuf.h" + +#include "common.xml.h" +#include "state.xml.h" +#include "cmdstream.xml.h" + +static inline void OUT(struct etnaviv_cmdbuf *buffer, u32 data) +{ + u32 *vaddr =3D (u32 *)buffer->vaddr; + + BUG_ON(buffer->user_size >=3D buffer->size); + + vaddr[buffer->user_size / 4] =3D data; + buffer->user_size +=3D 4; +} + +static inline void CMD_LOAD_STATE(struct etnaviv_cmdbuf *buffer, u32 reg, + u32 value) +{ + u32 index =3D reg >> VIV_FE_LOAD_STATE_HEADER_OFFSET__SHR; + + buffer->user_size =3D ALIGN(buffer->user_size, 8); + + /* write a register via cmd stream */ + OUT(buffer, VIV_FE_LOAD_STATE_HEADER_OP_LOAD_STATE | + VIV_FE_LOAD_STATE_HEADER_COUNT(1) | + VIV_FE_LOAD_STATE_HEADER_OFFSET(index)); + OUT(buffer, value); +} + +static inline void CMD_END(struct etnaviv_cmdbuf *buffer) +{ + buffer->user_size =3D ALIGN(buffer->user_size, 8); + + OUT(buffer, VIV_FE_END_HEADER_OP_END); +} + +static inline void CMD_WAIT(struct etnaviv_cmdbuf *buffer, + unsigned int waitcycles) +{ + buffer->user_size =3D ALIGN(buffer->user_size, 8); + + OUT(buffer, VIV_FE_WAIT_HEADER_OP_WAIT | waitcycles); +} + +static inline void CMD_LINK(struct etnaviv_cmdbuf *buffer, u16 prefetch, + u32 address) +{ + buffer->user_size =3D ALIGN(buffer->user_size, 8); + + OUT(buffer, + VIV_FE_LINK_HEADER_OP_LINK | VIV_FE_LINK_HEADER_PREFETCH(prefetch)); + OUT(buffer, address); +} + +static inline void CMD_STALL(struct etnaviv_cmdbuf *buffer, u32 from, u32 = to) +{ + buffer->user_size =3D ALIGN(buffer->user_size, 8); + + OUT(buffer, VIV_FE_STALL_HEADER_OP_STALL); + OUT(buffer, VIV_FE_STALL_TOKEN_FROM(from) | VIV_FE_STALL_TOKEN_TO(to)); +} + +static inline void CMD_SEM(struct etnaviv_cmdbuf *buffer, u32 from, u32 to) +{ + CMD_LOAD_STATE(buffer, VIVS_GL_SEMAPHORE_TOKEN, + VIVS_GL_SEMAPHORE_TOKEN_FROM(from) | + VIVS_GL_SEMAPHORE_TOKEN_TO(to)); +} + +#endif --=20 2.51.0