From nobody Sun Feb 8 15:57:44 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 1E7AE19B3C6 for ; Tue, 13 Aug 2024 10:51:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546309; cv=none; b=izHMJE2OQo+ILN7htYXbz/a/DwK5bKmZ3Znw1L9uN/t0VJpniEuExT5CgdPaoYO54PwVAlnGcb4FPubDWS9twtyupXc5pgMnGDpWo12eeWQ2vY6mqn0Lt6ubt1/5r1+KFdMGliX6nVn20O7Vwd2nmNT1QFRohGL+0VJkW+RBme4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546309; c=relaxed/simple; bh=zDHGOERE1H51WQtZT5VOPCpSW43jM4U9T6Kcb075wlU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fBvgtdg4fxhYgbC9PASa92Cqwj8GpmHhvootqMBp0QHx6PcMKZdBTbL/Lw+vHokcjUfmVK15q3zqJbuNlr0y9QPhMdGd1sNtcW/f+gMmfkX8Q4b5Ayp0/T4K2QvIFBSkSYMmbOhHyHHci5Px44j5BtlDXwmJgSBA6rVJxMI1+jA= 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=T7qGXhd4; arc=none smtp.client-ip=209.85.128.48 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="T7qGXhd4" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-428141be2ddso39971765e9.2 for ; Tue, 13 Aug 2024 03:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723546304; x=1724151104; 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=Jy+nd+TAf4IESSyfkjPEUCiVjjMM3g7sHyZYE6lpLK4=; b=T7qGXhd4XMu+ZmTNCb81dBa19BjavmCBvHsQv3FrOXJZK9U/ApwES+8qBizp4Ykm/t Au8ieEAunmGefY+QuFoe4meVUZUnSKgWZuu9yLR/bfvzVIHG/RLcl523J2D4NLLokrIj VPf7VgieVEdqyJQEO7oH9FXVRM/q31wyFvQyrH+JWTkmpJ/GnewMSOeVuxjObERiqb69 6/XmwUhDM78fCKyFnqwibBNHNTiXI0PIXZoRurzNmv9c8OEwQUe8c5Ut0rHiO+a8eItR uYAegP695PsSiE5f2bFzfGdezux5MvUYo6RIUuxzP4BNxa+4bGrpOX7S1PyNwK6s6kLJ ZrPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723546304; x=1724151104; 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=Jy+nd+TAf4IESSyfkjPEUCiVjjMM3g7sHyZYE6lpLK4=; b=NTXq77PVdi42nUKwFbpZiJLlfTjQIuDdlm0eDgwuysgA3EvdboVBeJgxVPLRNrS3gU yGQY5OsDgu+G1tJ7CEA+xejkgovJrQepmYyCrB895884Afluf+9m4cAuq0ZiWkSTXyPj UlULFq7ITOjE23l6N4+JiqSTxqYxPC0DNSxUxgZYjvVnLFr7+D0+3FuBvzI/8yD/xezA jQEyQ6qCW4h867QP75Vk9HEQry9QvbrK46MfUL3JgS9eGn9Yd0mIx9YVox0HKuHwoXjp c7d9cxUzRd0+mrl+lhVKZ7kO0FlIHRNpaaNkdTjKWM+g6OGxHqbMj9GZlpPRo4FDt0uY tRog== X-Forwarded-Encrypted: i=1; AJvYcCX9S5r1EdqwmahbfLH57QoimJPHvj2GtCHlSLv/1NrlI8DTPvXfGRWyrT7aZtxBT3Iu+mtemPQm/IcJM7qXaQj7Q+Ol8TiphJ0eUQqB X-Gm-Message-State: AOJu0YxnInA3B0s+6YL0N+gLjX+T8nPFA7/+kitKW8uM6OlDlEYg8xn5 ShE831IQfJlFMveAdWmH6UvtchbhExDI7gGAPyRbfeJij7nIso4s X-Google-Smtp-Source: AGHT+IF3l5a4JzrfLhkKB4hv+VwVgn6Mbv1kVLmbzNJj3J6TXJA+MNrPOXrNN/qld+ZDEq9xJpiUQQ== X-Received: by 2002:a05:600c:474d:b0:426:5ef5:bcb1 with SMTP id 5b1f17b1804b1-429d47f1e4emr20048745e9.6.1723546304134; Tue, 13 Aug 2024 03:51:44 -0700 (PDT) Received: from fedora.. ([213.94.26.172]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429d877e066sm17290785e9.1.2024.08.13.03.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 03:51:42 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: rodrigosiqueiramelo@gmail.com Cc: melissa.srw@gmail.com, mairacanal@riseup.net, hamohammed.sa@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, louis.chauvet@bootlin.com, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [RFC PATCH 04/17] drm/vkms: Allow to configure multiple CRTCs Date: Tue, 13 Aug 2024 12:44:15 +0200 Message-ID: <20240813105134.17439-5-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813105134.17439-1-jose.exposito89@gmail.com> References: <20240813105134.17439-1-jose.exposito89@gmail.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: quoted-printable Add a list of CRTC configurations to vkms_config and add as many CRTCs as configured during output initialization. For backwards compatibility, create a single CRTC in the default configuration. Since writeback support, vblank and composer states are now per CRTC, extract all the fields to the vkms_crtc structure and allow each vkms_device to have a list of CRTCs. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_composer.c | 30 ++++---- drivers/gpu/drm/vkms/vkms_config.c | 54 ++++++++++++++- drivers/gpu/drm/vkms/vkms_config.h | 15 +++- drivers/gpu/drm/vkms/vkms_crtc.c | 99 ++++++++++++++------------- drivers/gpu/drm/vkms/vkms_drv.c | 10 ++- drivers/gpu/drm/vkms/vkms_drv.h | 35 +++++++--- drivers/gpu/drm/vkms/vkms_output.c | 38 +++++----- drivers/gpu/drm/vkms/vkms_writeback.c | 27 ++++---- 8 files changed, 197 insertions(+), 111 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index e7441b227b3c..b1723cf02ed3 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -306,13 +306,13 @@ void vkms_composer_worker(struct work_struct *work) composer_work); struct drm_crtc *crtc =3D crtc_state->base.crtc; struct vkms_writeback_job *active_wb =3D crtc_state->active_writeback; - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); bool crc_pending, wb_pending; u64 frame_start, frame_end; u32 crc32 =3D 0; int ret; =20 - spin_lock_irq(&out->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); frame_start =3D crtc_state->frame_start; frame_end =3D crtc_state->frame_end; crc_pending =3D crtc_state->crc_pending; @@ -336,7 +336,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state->gamma_lut.base =3D NULL; } =20 - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); =20 /* * We raced with the vblank hrtimer and previous work already computed @@ -354,10 +354,10 @@ void vkms_composer_worker(struct work_struct *work) return; =20 if (wb_pending) { - drm_writeback_signal_completion(&out->wb_connector, 0); - spin_lock_irq(&out->composer_lock); + drm_writeback_signal_completion(&vkms_crtc->wb_connector, 0); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->wb_pending =3D false; - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); } =20 /* @@ -407,31 +407,31 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, con= st char *src_name, return 0; } =20 -void vkms_set_composer(struct vkms_output *out, bool enabled) +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled) { bool old_enabled; =20 if (enabled) - drm_crtc_vblank_get(&out->crtc); + drm_crtc_vblank_get(&vkms_crtc->base); =20 - spin_lock_irq(&out->lock); - old_enabled =3D out->composer_enabled; - out->composer_enabled =3D enabled; - spin_unlock_irq(&out->lock); + spin_lock_irq(&vkms_crtc->lock); + old_enabled =3D vkms_crtc->composer_enabled; + vkms_crtc->composer_enabled =3D enabled; + spin_unlock_irq(&vkms_crtc->lock); =20 if (old_enabled) - drm_crtc_vblank_put(&out->crtc); + drm_crtc_vblank_put(&vkms_crtc->base); } =20 int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); bool enabled =3D false; int ret =3D 0; =20 ret =3D vkms_crc_parse_source(src_name, &enabled); =20 - vkms_set_composer(out, enabled); + vkms_set_composer(vkms_crtc, enabled); =20 return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index 6ab8091bf72f..3af750071f04 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -17,6 +17,7 @@ struct vkms_config *vkms_config_create(char *dev_name) return ERR_PTR(-ENOMEM); =20 config->dev_name =3D dev_name; + config->crtcs =3D (struct list_head)LIST_HEAD_INIT(config->crtcs); =20 return config; } @@ -26,20 +27,29 @@ struct vkms_config *vkms_config_default_create(bool ena= ble_cursor, bool enable_overlay) { struct vkms_config *config; + struct vkms_config_crtc *crtc_cfg; =20 config =3D vkms_config_create(DEFAULT_DEVICE_NAME); if (IS_ERR(config)) return config; =20 config->cursor =3D enable_cursor; - config->writeback =3D enable_writeback; config->overlay =3D enable_overlay; =20 + crtc_cfg =3D vkms_config_add_crtc(config, enable_writeback); + if (IS_ERR(crtc_cfg)) + return ERR_CAST(crtc_cfg); + return config; } =20 void vkms_config_destroy(struct vkms_config *config) { + struct vkms_config_crtc *crtc_cfg, *crtc_tmp; + + list_for_each_entry_safe(crtc_cfg, crtc_tmp, &config->crtcs, list) + vkms_config_destroy_crtc(config, crtc_cfg); + kfree(config); } =20 @@ -48,12 +58,20 @@ static int vkms_config_show(struct seq_file *m, void *d= ata) struct drm_debugfs_entry *entry =3D m->private; struct drm_device *dev =3D entry->dev; struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); + struct vkms_config_crtc *crtc_cfg; + int n; =20 seq_printf(m, "dev_name=3D%s\n", vkmsdev->config->dev_name); - seq_printf(m, "writeback=3D%d\n", vkmsdev->config->writeback); seq_printf(m, "cursor=3D%d\n", vkmsdev->config->cursor); seq_printf(m, "overlay=3D%d\n", vkmsdev->config->overlay); =20 + n =3D 0; + list_for_each_entry(crtc_cfg, &vkmsdev->config->crtcs, list) { + seq_printf(m, "crtc(%d).writeback=3D%d\n", n, + crtc_cfg->writeback); + n++; + } + return 0; } =20 @@ -66,3 +84,35 @@ void vkms_config_debugfs_init(struct vkms_device *vkms_d= evice) drm_debugfs_add_files(&vkms_device->drm, vkms_config_debugfs_list, ARRAY_SIZE(vkms_config_debugfs_list)); } + +struct vkms_config_crtc *vkms_config_add_crtc(struct vkms_config *config, + bool enable_writeback) +{ + struct vkms_config_crtc *crtc_cfg; + + crtc_cfg =3D kzalloc(sizeof(*crtc_cfg), GFP_KERNEL); + if (!crtc_cfg) + return ERR_PTR(-ENOMEM); + + crtc_cfg->writeback =3D enable_writeback; + + crtc_cfg->index =3D 0; + if (!list_empty(&config->crtcs)) { + struct vkms_config_crtc *last; + + last =3D list_last_entry(&config->crtcs, struct vkms_config_crtc, + list); + crtc_cfg->index =3D last->index + 1; + } + + list_add_tail(&crtc_cfg->list, &config->crtcs); + + return crtc_cfg; +} + +void vkms_config_destroy_crtc(struct vkms_config *config, + struct vkms_config_crtc *crtc_cfg) +{ + list_del(&crtc_cfg->list); + kfree(crtc_cfg); +} diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index ba06aad32799..bc40a0e3859a 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -3,15 +3,22 @@ #ifndef _VKMS_CONFIG_H_ #define _VKMS_CONFIG_H_ =20 +#include #include =20 struct vkms_device; =20 +struct vkms_config_crtc { + struct list_head list; + unsigned int index; + bool writeback; +}; + struct vkms_config { char *dev_name; - bool writeback; bool cursor; bool overlay; + struct list_head crtcs; /* only set when instantiated */ struct vkms_device *dev; }; @@ -26,4 +33,10 @@ void vkms_config_destroy(struct vkms_config *config); /* DebugFS */ void vkms_config_debugfs_init(struct vkms_device *vkms_device); =20 +/* CRTCs */ +struct vkms_config_crtc *vkms_config_add_crtc(struct vkms_config *config, + bool enable_writeback); +void vkms_config_destroy_crtc(struct vkms_config *config, + struct vkms_config_crtc *crtc_cfg); + #endif /* _VKMS_CONFIG_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 40b4d084e3ce..41ab8f47331c 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -11,35 +11,34 @@ =20 static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) { - struct vkms_output *output =3D container_of(timer, struct vkms_output, - vblank_hrtimer); - struct drm_crtc *crtc =3D &output->crtc; + struct vkms_crtc *vkms_crtc =3D timer_to_vkms_crtc(timer); + struct drm_crtc *crtc =3D &vkms_crtc->base; struct vkms_crtc_state *state; u64 ret_overrun; bool ret, fence_cookie; =20 fence_cookie =3D dma_fence_begin_signalling(); =20 - ret_overrun =3D hrtimer_forward_now(&output->vblank_hrtimer, - output->period_ns); + ret_overrun =3D hrtimer_forward_now(&vkms_crtc->vblank_hrtimer, + vkms_crtc->period_ns); if (ret_overrun !=3D 1) pr_warn("%s: vblank timer overrun\n", __func__); =20 - spin_lock(&output->lock); + spin_lock(&vkms_crtc->lock); ret =3D drm_crtc_handle_vblank(crtc); if (!ret) DRM_ERROR("vkms failure on handling vblank"); =20 - state =3D output->composer_state; - spin_unlock(&output->lock); + state =3D vkms_crtc->composer_state; + spin_unlock(&vkms_crtc->lock); =20 - if (state && output->composer_enabled) { + if (state && vkms_crtc->composer_enabled) { u64 frame =3D drm_crtc_accurate_vblank_count(crtc); =20 /* update frame_start only if a queued vkms_composer_worker() * has read the data */ - spin_lock(&output->composer_lock); + spin_lock(&vkms_crtc->composer_lock); if (!state->crc_pending) state->frame_start =3D frame; else @@ -47,9 +46,9 @@ static enum hrtimer_restart vkms_vblank_simulate(struct h= rtimer *timer) state->frame_start, frame); state->frame_end =3D frame; state->crc_pending =3D true; - spin_unlock(&output->composer_lock); + spin_unlock(&vkms_crtc->composer_lock); =20 - ret =3D queue_work(output->composer_workq, &state->composer_work); + ret =3D queue_work(vkms_crtc->composer_workq, &state->composer_work); if (!ret) DRM_DEBUG_DRIVER("Composer worker already queued\n"); } @@ -62,32 +61,30 @@ static enum hrtimer_restart vkms_vblank_simulate(struct= hrtimer *timer) static int vkms_enable_vblank(struct drm_crtc *crtc) { struct drm_vblank_crtc *vblank =3D drm_crtc_vblank_crtc(crtc); - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 drm_calc_timestamping_constants(crtc, &crtc->mode); =20 - hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - out->vblank_hrtimer.function =3D &vkms_vblank_simulate; - out->period_ns =3D ktime_set(0, vblank->framedur_ns); - hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL); + hrtimer_init(&vkms_crtc->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_RE= L); + vkms_crtc->vblank_hrtimer.function =3D &vkms_vblank_simulate; + vkms_crtc->period_ns =3D ktime_set(0, vblank->framedur_ns); + hrtimer_start(&vkms_crtc->vblank_hrtimer, vkms_crtc->period_ns, HRTIMER_M= ODE_REL); =20 return 0; } =20 static void vkms_disable_vblank(struct drm_crtc *crtc) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 - hrtimer_cancel(&out->vblank_hrtimer); + hrtimer_cancel(&vkms_crtc->vblank_hrtimer); } =20 static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc, int *max_error, ktime_t *vblank_time, bool in_vblank_irq) { - struct drm_device *dev =3D crtc->dev; - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); - struct vkms_output *output =3D &vkmsdev->output; + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); struct drm_vblank_crtc *vblank =3D drm_crtc_vblank_crtc(crtc); =20 if (!READ_ONCE(vblank->enabled)) { @@ -95,7 +92,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *cr= tc, return true; } =20 - *vblank_time =3D READ_ONCE(output->vblank_hrtimer.node.expires); + *vblank_time =3D READ_ONCE(vkms_crtc->vblank_hrtimer.node.expires); =20 if (WARN_ON(*vblank_time =3D=3D vblank->time)) return true; @@ -107,7 +104,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *= crtc, * the vblank core expects. Therefore we need to always correct the * timestampe by one frame. */ - *vblank_time -=3D output->period_ns; + *vblank_time -=3D vkms_crtc->period_ns; =20 return true; } @@ -233,18 +230,18 @@ static void vkms_crtc_atomic_disable(struct drm_crtc = *crtc, static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 /* This lock is held across the atomic commit to block vblank timer * from scheduling vkms_composer_worker until the composer is updated */ - spin_lock_irq(&vkms_output->lock); + spin_lock_irq(&vkms_crtc->lock); } =20 static void vkms_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 if (crtc->state->event) { spin_lock(&crtc->dev->event_lock); @@ -259,9 +256,9 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crt= c, crtc->state->event =3D NULL; } =20 - vkms_output->composer_state =3D to_vkms_crtc_state(crtc->state); + vkms_crtc->composer_state =3D to_vkms_crtc_state(crtc->state); =20 - spin_unlock_irq(&vkms_output->lock); + spin_unlock_irq(&vkms_crtc->lock); } =20 static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs =3D { @@ -272,30 +269,38 @@ static const struct drm_crtc_helper_funcs vkms_crtc_h= elper_funcs =3D { .atomic_disable =3D vkms_crtc_atomic_disable, }; =20 -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor) +struct vkms_crtc *vkms_crtc_init(struct drm_device *dev, + struct drm_plane *primary, + struct drm_plane *cursor, + unsigned int index) { - struct vkms_output *vkms_out =3D drm_crtc_to_vkms_output(crtc); - int ret; + struct vkms_crtc *crtc; =20 - ret =3D drmm_crtc_init_with_planes(dev, crtc, primary, cursor, - &vkms_crtc_funcs, NULL); - if (ret) { - DRM_ERROR("Failed to init CRTC\n"); - return ret; + crtc =3D drmm_crtc_alloc_with_planes(dev, struct vkms_crtc, base, primary, + cursor, &vkms_crtc_funcs, NULL); + if (IS_ERR(crtc)) { + DRM_ERROR("Failed to alloc CRTC\n"); + return crtc; } =20 - drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs); + crtc->base.index =3D index; + primary->possible_crtcs =3D drm_crtc_mask(&crtc->base); + if (cursor) + cursor->possible_crtcs =3D drm_crtc_mask(&crtc->base); =20 - drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE); - drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE); + INIT_LIST_HEAD(&crtc->list); =20 - spin_lock_init(&vkms_out->lock); - spin_lock_init(&vkms_out->composer_lock); + drm_crtc_helper_add(&crtc->base, &vkms_crtc_helper_funcs); =20 - vkms_out->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); - if (!vkms_out->composer_workq) - return -ENOMEM; + drm_mode_crtc_set_gamma_size(&crtc->base, VKMS_LUT_SIZE); + drm_crtc_enable_color_mgmt(&crtc->base, 0, false, VKMS_LUT_SIZE); + + spin_lock_init(&crtc->lock); + spin_lock_init(&crtc->composer_lock); + + crtc->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); + if (!crtc->composer_workq) + return ERR_PTR(-ENOMEM); =20 - return ret; + return crtc; } diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 2f9d1db0cfae..15a2ba26d190 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -54,9 +54,12 @@ DEFINE_DRM_GEM_FOPS(vkms_driver_fops); static void vkms_release(struct drm_device *dev) { struct vkms_device *vkms =3D drm_device_to_vkms_device(dev); + struct vkms_crtc *vkms_crtc; =20 - if (vkms->output.composer_workq) - destroy_workqueue(vkms->output.composer_workq); + list_for_each_entry(vkms_crtc, &vkms->crtcs, list) { + if (vkms_crtc->composer_workq) + destroy_workqueue(vkms_crtc->composer_workq); + } } =20 static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state) @@ -177,6 +180,7 @@ static int vkms_create(struct vkms_config *config) } vkms_device->platform =3D pdev; vkms_device->config =3D config; + vkms_device->crtcs =3D (struct list_head)LIST_HEAD_INIT(vkms_device->crtc= s); config->dev =3D vkms_device; =20 ret =3D dma_coerce_mask_and_coherent(vkms_device->drm.dev, @@ -187,7 +191,7 @@ static int vkms_create(struct vkms_config *config) goto out_devres; } =20 - ret =3D drm_vblank_init(&vkms_device->drm, 1); + ret =3D drm_vblank_init(&vkms_device->drm, list_count_nodes(&config->crtc= s)); if (ret) { DRM_ERROR("Failed to vblank\n"); goto out_devres; diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 87e44b51a03f..3156ff896c33 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -4,6 +4,7 @@ #define _VKMS_DRV_H_ =20 #include +#include =20 #include #include @@ -98,10 +99,11 @@ struct vkms_crtc_state { u64 frame_end; }; =20 -struct vkms_output { - struct drm_crtc crtc; - struct drm_encoder encoder; - struct drm_connector connector; +struct vkms_crtc { + struct list_head list; + + struct drm_crtc base; + struct drm_writeback_connector wb_connector; struct hrtimer vblank_hrtimer; ktime_t period_ns; @@ -119,19 +121,28 @@ struct vkms_output { =20 struct vkms_config; =20 +struct vkms_output { + struct drm_encoder encoder; + struct drm_connector connector; +}; + struct vkms_device { struct drm_device drm; struct platform_device *platform; struct vkms_output output; + struct list_head crtcs; const struct vkms_config *config; }; =20 -#define drm_crtc_to_vkms_output(target) \ - container_of(target, struct vkms_output, crtc) - #define drm_device_to_vkms_device(target) \ container_of(target, struct vkms_device, drm) =20 +#define drm_crtc_to_vkms_crtc(crtc) \ + container_of(crtc, struct vkms_crtc, base) + +#define timer_to_vkms_crtc(timer) \ + container_of(timer, struct vkms_crtc, vblank_hrtimer) + #define to_vkms_crtc_state(target)\ container_of(target, struct vkms_crtc_state, base) =20 @@ -139,8 +150,10 @@ struct vkms_device { container_of(target, struct vkms_plane_state, base.base) =20 /* CRTC */ -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor); +struct vkms_crtc *vkms_crtc_init(struct drm_device *dev, + struct drm_plane *primary, + struct drm_plane *cursor, + unsigned int index); =20 int vkms_output_init(struct vkms_device *vkmsdev, int index); =20 @@ -156,11 +169,11 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, con= st char *source_name, =20 /* Composer Support */ void vkms_composer_worker(struct work_struct *work); -void vkms_set_composer(struct vkms_output *out, bool enabled); +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled); void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_= state *plane, int y); void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_b= uffer *src_buffer, int y); =20 /* Writeback */ -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev); +int vkms_enable_writeback_connector(struct vkms_crtc *vkms_crtc); =20 #endif /* _VKMS_DRV_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index afe3945c1962..dcd32bc30e17 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -32,8 +32,7 @@ static const struct drm_connector_helper_funcs vkms_conn_= helper_funcs =3D { .get_modes =3D vkms_conn_get_modes, }; =20 -static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int index, - struct drm_crtc *crtc) +static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int index) { struct vkms_plane *overlay; =20 @@ -42,7 +41,7 @@ static int vkms_add_overlay_plane(struct vkms_device *vkm= sdev, int index, return PTR_ERR(overlay); =20 if (!overlay->base.possible_crtcs) - overlay->base.possible_crtcs =3D drm_crtc_mask(crtc); + overlay->base.possible_crtcs =3D BIT(index); =20 return 0; } @@ -53,7 +52,8 @@ int vkms_output_init(struct vkms_device *vkmsdev, int ind= ex) struct drm_device *dev =3D &vkmsdev->drm; struct drm_connector *connector =3D &output->connector; struct drm_encoder *encoder =3D &output->encoder; - struct drm_crtc *crtc =3D &output->crtc; + struct vkms_crtc *vkms_crtc; + struct vkms_config_crtc *crtc_cfg; struct vkms_plane *primary, *cursor =3D NULL; int ret; int writeback; @@ -65,7 +65,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int ind= ex) =20 if (vkmsdev->config->overlay) { for (n =3D 0; n < NUM_OVERLAY_PLANES; n++) { - ret =3D vkms_add_overlay_plane(vkmsdev, index, crtc); + ret =3D vkms_add_overlay_plane(vkmsdev, index); if (ret) return ret; } @@ -77,15 +77,26 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) return PTR_ERR(cursor); } =20 - ret =3D vkms_crtc_init(dev, crtc, &primary->base, &cursor->base); - if (ret) - return ret; + list_for_each_entry(crtc_cfg, &vkmsdev->config->crtcs, list) { + vkms_crtc =3D vkms_crtc_init(dev, &primary->base, &cursor->base, + crtc_cfg->index); + if (IS_ERR(vkms_crtc)) + return PTR_ERR(vkms_crtc); + + list_add_tail(&vkms_crtc->list, &vkmsdev->crtcs); + + if (crtc_cfg->writeback) { + writeback =3D vkms_enable_writeback_connector(vkms_crtc); + if (writeback) + DRM_ERROR("Failed to init writeback connector\n"); + } + } =20 ret =3D drm_connector_init(dev, connector, &vkms_connector_funcs, DRM_MODE_CONNECTOR_VIRTUAL); if (ret) { DRM_ERROR("Failed to init connector\n"); - goto err_connector; + return ret; } =20 drm_connector_helper_add(connector, &vkms_conn_helper_funcs); @@ -104,12 +115,6 @@ int vkms_output_init(struct vkms_device *vkmsdev, int = index) goto err_attach; } =20 - if (vkmsdev->config->writeback) { - writeback =3D vkms_enable_writeback_connector(vkmsdev); - if (writeback) - DRM_ERROR("Failed to init writeback connector\n"); - } - drm_mode_config_reset(dev); =20 return 0; @@ -120,8 +125,5 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) err_encoder: drm_connector_cleanup(connector); =20 -err_connector: - drm_crtc_cleanup(crtc); - return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index bc724cbd5e3a..b317cb291586 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -106,7 +106,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob =3D job->priv; - struct vkms_device *vkmsdev; + struct vkms_crtc *vkms_crtc; =20 if (!job->fb) return; @@ -115,8 +115,8 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, =20 drm_framebuffer_put(vkmsjob->wb_frame_info.fb); =20 - vkmsdev =3D drm_device_to_vkms_device(job->fb->dev); - vkms_set_composer(&vkmsdev->output, false); + vkms_crtc =3D container_of(connector, struct vkms_crtc, wb_connector); + vkms_set_composer(vkms_crtc, false); kfree(vkmsjob); } =20 @@ -125,11 +125,10 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *conn, { struct drm_connector_state *connector_state =3D drm_atomic_get_new_connec= tor_state(state, conn); - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(conn->dev); - struct vkms_output *output =3D &vkmsdev->output; - struct drm_writeback_connector *wb_conn =3D &output->wb_connector; + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(connector_state->cr= tc); + struct drm_writeback_connector *wb_conn =3D &vkms_crtc->wb_connector; struct drm_connector_state *conn_state =3D wb_conn->base.state; - struct vkms_crtc_state *crtc_state =3D output->composer_state; + struct vkms_crtc_state *crtc_state =3D vkms_crtc->composer_state; struct drm_framebuffer *fb =3D connector_state->writeback_job->fb; u16 crtc_height =3D crtc_state->base.crtc->mode.vdisplay; u16 crtc_width =3D crtc_state->base.crtc->mode.hdisplay; @@ -140,15 +139,15 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *conn, if (!conn_state) return; =20 - vkms_set_composer(&vkmsdev->output, true); + vkms_set_composer(vkms_crtc, true); =20 active_wb =3D conn_state->writeback_job->priv; wb_frame_info =3D &active_wb->wb_frame_info; =20 - spin_lock_irq(&output->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->active_writeback =3D active_wb; crtc_state->wb_pending =3D true; - spin_unlock_irq(&output->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); =20 wb_frame_info->offset =3D fb->offsets[0]; wb_frame_info->pitch =3D fb->pitches[0]; @@ -168,16 +167,16 @@ static const struct drm_connector_helper_funcs vkms_w= b_conn_helper_funcs =3D { .atomic_check =3D vkms_wb_atomic_check, }; =20 -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev) +int vkms_enable_writeback_connector(struct vkms_crtc *vkms_crtc) { - struct drm_writeback_connector *wb =3D &vkmsdev->output.wb_connector; + struct drm_writeback_connector *wb =3D &vkms_crtc->wb_connector; =20 drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); =20 - return drm_writeback_connector_init(&vkmsdev->drm, wb, + return drm_writeback_connector_init(vkms_crtc->base.dev, wb, &vkms_wb_connector_funcs, NULL, vkms_wb_formats, ARRAY_SIZE(vkms_wb_formats), - 1); + drm_crtc_mask(&vkms_crtc->base)); } --=20 2.46.0