From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DBD0192B79 for ; Tue, 20 Aug 2024 15:29:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724167787; cv=none; b=pbAIl0WuOoHOkb282ZAI0Q7TDX6xpABjXX9uq65C0brH2gsSdODP9ZdGaZUXiac4FdnJlF5Pi2ndcumVd+yeqNMH0q9GOuH83ruHu+dDPjAiSjKeF4kGGyVB2GxY4jhaO/SJY1SQOXZjGC0CcLVOmjiXVsbxsj6CaDPjRacFoHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724167787; c=relaxed/simple; bh=vuq1Q9W5lesTeOMlqjAhbsjAjNEpTZ32TsyEASCPXeQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SSbC/fhA4bIlnatvr3MoLAxsJFwlxy0Ef1MqZUs5cNLYfhxR7jWn6I/qggxu3YnIywXpWYtzqD0QD18KqiM/QtPgur+5y3NnkIv3kVkdAQkY0BMEYjFIqNA82w9tRXW3WM9vaEErx1PPajpeP2SsTUjwsFv/l1We5uBMKMzW1U0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YmMwJsC8; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YmMwJsC8" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4281c164408so45054755e9.1 for ; Tue, 20 Aug 2024 08:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724167783; x=1724772583; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vmy5eyWYXSTGXe5JMYP6uHGEABCpvJZivoHkRZ/jgHs=; b=YmMwJsC8USoIsdbEevBBMOFm8a8qEExZQ0zWbjSgmL9p8d7HENvmUS3/L6fsgE/PZY jpMqS7Sl3GE45dRsZibvzHOiO5qCL212WycpVodMG8GbvePHf4OglnaNyeJ8/24BOdqQ shfvW3+li32zMmyUZddHQ9dpk7r032uDmrSPQ82QsEUnpy3xWBonkfmYH7/q7+9nZ3x3 MTQvrP4C099nCGzJasdBAM4n2sP00SsHgUXJGreSn5bHQtpfE+LLnZ2FhOPbtUFhpELu PSAmOIu84+GOMU+ar/Y27jYd4rGTKSZkSquvA4q88rM+xQpvyRGrTyWckZR8dUi2e3Am 46cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724167783; x=1724772583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vmy5eyWYXSTGXe5JMYP6uHGEABCpvJZivoHkRZ/jgHs=; b=YPm1DQKl5KANXvK/VdmSUVydV+5M8OisTAg5zoiZAPjhJI2GJqkswoit03M8I2WWbF kIg+xco50gT0vhsFkp9xK6BqE9Lkq6emJrKpe69J33HGSbkE/vnEjc37PjABvKfEanCz ZeMbStc9zaL+3+vta2D4JqO1OLzTrEjqk8qptQVbjB9lg6JN/o0jPurkuaWPvZMdhfHq Qv4XFSutOUsuxDSeEdMMlO/p0gRcc/gNNQHGlyNsjYQF61Wd5YyagLhiBG750sPhHUo9 WIIWyxdDCMoLPmV+1/XETb5U7i7ElG4IjM4eXB25lnswZ9EfcKQKoYHUyuMA118T+K7r xmww== X-Forwarded-Encrypted: i=1; AJvYcCXzyvpVvY/N+mrXvA2VEvvuujFcTjfxxd0pudhal7wmxrVrmvWa4GYeDw6HrcpVudW8m9EATsY/nHDHaqtzoDolPGtYXsUhFKXbhQTZ X-Gm-Message-State: AOJu0YxQUJPKmJbZiflzi9EBdkFCMvJ27ersq+OWahKbXtLIHX4SxCuT WFDr27U8T4Vs3W72CPN4c+UxclSe9UKDboGyqPbQhfytgKT2JS5m X-Google-Smtp-Source: AGHT+IF12vgFxpdR5bG3QLIVQnVILiwKKPCPu/t68ew/cyUTKRxu9tT281vOdA/VbyuuftPk2di4Hg== X-Received: by 2002:a05:600c:1e0c:b0:426:6765:d6b0 with SMTP id 5b1f17b1804b1-429ed789bebmr84999765e9.15.1724167782957; Tue, 20 Aug 2024 08:29:42 -0700 (PDT) Received: from fedora.. ([213.94.26.172]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429ded7ead3sm203113735e9.47.2024.08.20.08.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 08:29:42 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: louis.chauvet@bootlin.com Cc: airlied@gmail.com, arthurgrillo@riseup.net, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, hamohammed.sa@gmail.com, jeremie.dautheribes@bootlin.com, linux-kernel@vger.kernel.org, maarten.lankhorst@linux.intel.com, mairacanal@riseup.net, marcheu@google.com, melissa.srw@gmail.com, miquel.raynal@bootlin.com, mripard@kernel.org, nicolejadeyee@google.com, rodrigosiqueiramelo@gmail.com, seanpaul@google.com, thomas.petazzoni@bootlin.com, tzimmermann@suse.de, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH RFC 5/6] drm/vkms: Extract vkms_crtc header Date: Tue, 20 Aug 2024 17:29:39 +0200 Message-ID: <20240820152940.2881-1-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240814-google-split-headers-v1-5-51712f088f5d@bootlin.com> References: <20240814-google-split-headers-v1-5-51712f088f5d@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > The vkms crtc functions are defined in a different .c, so make the same The VKMS CRTC... > thing for the function declaration in the headers and create vkms_crtc.h. > > Signed-off-by: Louis Chauvet Reviewed-by: José Expósito > --- > drivers/gpu/drm/vkms/vkms_composer.c | 2 +- > drivers/gpu/drm/vkms/vkms_crtc.c | 2 +- > drivers/gpu/drm/vkms/vkms_crtc.h | 87 +++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/vkms/vkms_drv.c | 1 + > drivers/gpu/drm/vkms/vkms_drv.h | 45 ------------------ > drivers/gpu/drm/vkms/vkms_output.c | 1 + > drivers/gpu/drm/vkms/vkms_plane.h | 1 - > drivers/gpu/drm/vkms/vkms_writeback.c | 1 + > 8 files changed, 92 insertions(+), 48 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > index 825011f696ee..139d249454c4 100644 > --- a/drivers/gpu/drm/vkms/vkms_composer.c > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > @@ -11,7 +11,7 @@ > #include > #include > > -#include "vkms_drv.h" > +#include "vkms_crtc.h" > #include "vkms_writeback.h" > > static u16 pre_mul_blend_channel(u16 src, u16 dst, u16 alpha) > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c > index 08e5db07aca6..cb6e49a86745 100644 > --- a/drivers/gpu/drm/vkms/vkms_crtc.c > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > @@ -8,7 +8,7 @@ > #include > #include > > -#include "vkms_drv.h" > +#include "vkms_crtc.h" > #include "vkms_plane.h" > > static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.h b/drivers/gpu/drm/vkms/vkms_crtc.h > new file mode 100644 > index 000000000000..9f5ce21f3425 > --- /dev/null > +++ b/drivers/gpu/drm/vkms/vkms_crtc.h > @@ -0,0 +1,87 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > + > +#ifndef _VKMS_CRTC_H > +#define _VKMS_CRTC_H #ifndef _VKMS_CRTC_H_ #define _VKMS_CRTC_H_ > +#include > +#include > +#include > + > +#include "vkms_writeback.h" > +#include "vkms_plane.h" > + > +/** > + * struct vkms_crtc_state - Driver specific CRTC state > + * > + * @base: base CRTC state > + * @composer_work: work struct to compose and add CRC entries > + * > + * @num_active_planes: Number of active planes > + * @active_planes: List containing all the active planes (counted by > + * @num_active_planes). They should be stored in z-order. > + * @active_writeback: Current active writeback job > + * @gamma_lut: Look up table for gamma used in this CRTC > + * @crc_pending: Protected by @vkms_output.composer_lock. > + * @wb_pending: Protected by @vkms_output.composer_lock. > + * @frame_start: Protected by @vkms_output.composer_lock. > + * @frame_end: Protected by @vkms_output.composer_lock. > + */ > +struct vkms_crtc_state { > + struct drm_crtc_state base; > + struct work_struct composer_work; > + > + int num_active_planes; > + struct vkms_plane_state **active_planes; > + struct vkms_writeback_job *active_writeback; > + struct vkms_color_lut gamma_lut; > + > + bool crc_pending; > + bool wb_pending; > + u64 frame_start; > + u64 frame_end; > +}; > + > +/** > + * struct vkms_crtc - crtc internal representation > + * > + * @crtc: Base crtc in drm > + * @wb_connecter: DRM writeback connector used for this output > + * @vblank_hrtimer: > + * @period_ns: > + * @event: > + * @composer_workq: Ordered workqueue for composer_work > + * @lock: Lock used to project concurrent acces to the composer > + * @composer_enabled: Protected by @lock. > + * @composer_lock: Lock used internally to protect @composer_state members > + * @composer_state: Protected by @lock. > + */ > +struct vkms_crtc { > + struct drm_crtc base; > + > + struct drm_writeback_connector wb_connector; > + struct hrtimer vblank_hrtimer; > + ktime_t period_ns; > + struct drm_pending_vblank_event *event; > + struct workqueue_struct *composer_workq; > + spinlock_t lock; > + > + bool composer_enabled; > + struct vkms_crtc_state *composer_state; > + > + spinlock_t composer_lock; > +}; > + > +#define to_vkms_crtc_state(target)\ > + container_of(target, struct vkms_crtc_state, base) > + > +/** > + * vkms_crtc_init() - Initialize a crtc for vkms > + * @dev: drm_device associated with the vkms buffer > + * @crtc: uninitialized crtc device > + * @primary: primary plane to attach to the crtc > + * @cursor plane to attach to the crtc > + */ > +int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, > + struct drm_plane *primary, struct drm_plane *cursor); > + > +#endif //_VKMS_CRTC_H #endif /* _VKMS_CRTC_H_ */ > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c > index 5aeb43592960..5907877bdfa0 100644 > --- a/drivers/gpu/drm/vkms/vkms_drv.c > +++ b/drivers/gpu/drm/vkms/vkms_drv.c > @@ -27,6 +27,7 @@ > #include > > #include "vkms_drv.h" > +#include "vkms_crtc.h" It might make sense to leave drv.h on top as it is the main file, but if you are going to stick to alphabetical order: +#include "vkms_crtc.h" #include "vkms_drv.h" > #include > #include > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h > index ea73f01fcc74..943ad55e0172 100644 > --- a/drivers/gpu/drm/vkms/vkms_drv.h > +++ b/drivers/gpu/drm/vkms/vkms_drv.h > @@ -12,8 +12,6 @@ > #include > #include > > -#include "vkms_formats.h" > - > #define XRES_MIN 10 > #define YRES_MIN 10 > > @@ -27,37 +25,6 @@ > > #define VKMS_LUT_SIZE 256 > > -/** > - * struct vkms_crtc_state - Driver specific CRTC state > - * > - * @base: base CRTC state > - * @composer_work: work struct to compose and add CRC entries > - * > - * @num_active_planes: Number of active planes > - * @active_planes: List containing all the active planes (counted by > - * @num_active_planes). They should be stored in z-order. > - * @active_writeback: Current active writeback job > - * @gamma_lut: Look up table for gamma used in this CRTC > - * @crc_pending: Protected by @vkms_output.composer_lock. > - * @wb_pending: Protected by @vkms_output.composer_lock. > - * @frame_start: Protected by @vkms_output.composer_lock. > - * @frame_end: Protected by @vkms_output.composer_lock. > - */ > -struct vkms_crtc_state { > - struct drm_crtc_state base; > - struct work_struct composer_work; > - > - int num_active_planes; > - struct vkms_plane_state **active_planes; > - struct vkms_writeback_job *active_writeback; > - struct vkms_color_lut gamma_lut; > - > - bool crc_pending; > - bool wb_pending; > - u64 frame_start; > - u64 frame_end; > -}; > - > /** > * struct vkms_output - Internal representation of all output components in vkms > * > @@ -129,18 +96,6 @@ struct vkms_device { > #define drm_device_to_vkms_device(target) \ > container_of(target, struct vkms_device, drm) > > -#define to_vkms_crtc_state(target)\ > - container_of(target, struct vkms_crtc_state, base) > - > -/** > - * vkms_crtc_init() - Initialize a crtc for vkms > - * @dev: drm_device associated with the vkms buffer > - * @crtc: uninitialized crtc device > - * @primary: primary plane to attach to the crtc > - * @cursor plane to attach to the crtc > - */ > -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, > - struct drm_plane *primary, struct drm_plane *cursor); > /** > * vkms_output_init() - Initialize all sub-components needed for a vkms device. > * > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c > index 09fcf242ecf7..20073a00b200 100644 > --- a/drivers/gpu/drm/vkms/vkms_output.c > +++ b/drivers/gpu/drm/vkms/vkms_output.c > @@ -6,6 +6,7 @@ > > #include "vkms_writeback.h" > #include "vkms_plane.h" > +#include "vkms_crtc.h" > > static const struct drm_connector_funcs vkms_connector_funcs = { > .fill_modes = drm_helper_probe_single_connector_modes, > diff --git a/drivers/gpu/drm/vkms/vkms_plane.h b/drivers/gpu/drm/vkms/vkms_plane.h > index 68170a75e9c9..90554c9fe250 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.h > +++ b/drivers/gpu/drm/vkms/vkms_plane.h > @@ -8,7 +8,6 @@ > #include > #include > > -#include "vkms_drv.h" > #include "vkms_formats.h" > > struct vkms_plane { > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c > index 740d9e2f3d71..48f3f7f2e2a4 100644 > --- a/drivers/gpu/drm/vkms/vkms_writeback.c > +++ b/drivers/gpu/drm/vkms/vkms_writeback.c > @@ -13,6 +13,7 @@ > #include > > #include "vkms_writeback.h" > +#include "vkms_crtc.h" > #include "vkms_formats.h" > > static const u32 vkms_wb_formats[] = { >