From nobody Sun Feb 8 12:18:43 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 27F2419AA43 for ; Tue, 13 Aug 2024 10:51:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546310; cv=none; b=QxvQB7xvQt2OAIUpGj+DQV4b/Bko5E1tcJLS09FRSIzZylkh0utLgys7hMYyiS4eZYUGBOB6Pg2ERL9jHLFwcU7TIey2/UwXbyL9+OJ9ST8AXC0imhwd4Yi0t/4i+I0AEbDyBgMaNVe0Yhhy+Q88EsEqMr10Ebuspkkj+FEnX1k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546310; c=relaxed/simple; bh=oxGcfz9/v3PDOEPDFfhhh25yuHAPufuIfyTlXKYirGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=njHuy0RXEc2dpleeusTdXdMrRpFrhERo2683KXiJ7ycAEgVimcqti7M8FN0Vc1GkjnqZytuu+q2rkglXnGo1lBkRoNoeO4/UHujkeCDziXzypNVsgD5TQARS7/fc80xOQZ5iILeXzPOYvd/NcPGtRmIZRUS3lq7toddxIwH09W4= 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=f+dQBSrY; arc=none smtp.client-ip=209.85.128.50 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="f+dQBSrY" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-428243f928fso52923575e9.0 for ; Tue, 13 Aug 2024 03:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723546306; x=1724151106; 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=R6Mz2KhFZzROn/KIWb00LTNVvXvYG/m4Vfb07jwptv4=; b=f+dQBSrYuONNxDkLp8CMEZ+AosSuz0j4FRv2YztZBjawGZgsSOuaXyg4sio2U6lv33 f4I2nqULhW5/rfwUtQbM866UULkw3OD9sQ3gob8R02AKfv7LP+bixg6NdRRwyNjqItdq HylsMiWICFnUHqNeimVmkt/oYfYhZmM+mlWoPIMaD2H436wWUVPu0TIcJ79KaZZnjz1O BSEYWJvWGYBs+kYwYpeUBBiU6lYXM+SkNm176mp46o/tiKKYrYBM+Q2+4FqPe9snTNBx JoLgVihan4mEJeSXFw3A0ApkRRtLafgqCx/JQ0VYMGd7TUQdjDtvcmFcdP7J2Xdfla/A P7xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723546306; x=1724151106; 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=R6Mz2KhFZzROn/KIWb00LTNVvXvYG/m4Vfb07jwptv4=; b=TGuKikqWu3j3Qd+0NTfWhHadHGL3Mqn9iKO+9UtoWeqqrfwue0hkkx0TP5Hh+LmCF3 k02B1Ke9lSBlW2l+2bqb0IH2Z/4DgzplGscVU/miFNK15Jl3d1FSK+Koe/2hpfL+MbJK BIhGFfo3guQSKFa/tApsTIzdJ3xnKpCScfLaUl6zjesrrehdO67Gly8NnSiNohfSy3Xy qdsEJ3mZqxEfAK9R5Z9ZeecOQMFQdQwuXsAJngtzOL3x4UBUw9r1BpmKy2nSSq78+A4u PDiyg5k1ynEB98DommAKNXP2OgFAyWxuAUVr1OxcXJNSl49K9oxdQwDH7F5T4bmD1G+8 +/Vw== X-Forwarded-Encrypted: i=1; AJvYcCU5ZQgowxoo7piQZ0mcJGLruPMPtbje2beAP5C0L9Bb3l2fI0DMHVHtfUeSqQ1dZahLFWPxZbH1CNZsJ8/da/qqrmOCVbJld72JEJ0o X-Gm-Message-State: AOJu0YyUrt92PMO/cTU7EVPGjIOMhhrOKqWdy73PciWafb8BnVwDcpBg yvXBeIOp5c+DDW+ectr3NpZ0tER8I9xLHZqYvRsGcVI58ybafPmG X-Google-Smtp-Source: AGHT+IFc1MxDOM9KHwmSg4MIeIUEJ0CdqAeobEZZY+JR1Ums0WJRTX2kswhgxVkQAvgh3eiXBXE65g== X-Received: by 2002:a05:600c:6d3:b0:426:59d3:8cae with SMTP id 5b1f17b1804b1-429d633e764mr21330055e9.13.1723546306306; Tue, 13 Aug 2024 03:51:46 -0700 (PDT) Received: from fedora.. ([213.94.26.172]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429d877e066sm17290785e9.1.2024.08.13.03.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 03:51:45 -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 06/17] drm/vkms: Allow to configure multiple encoders Date: Tue, 13 Aug 2024 12:44:17 +0200 Message-ID: <20240813105134.17439-7-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 encoder configurations to vkms_config and add as many encoders as configured during output initialization. For backwards compatibility, create a single encoder in the default configuration. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_config.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.h | 13 ++++++++ drivers/gpu/drm/vkms/vkms_output.c | 14 ++++++--- 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index 3af750071f04..6a8dfebee24e 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -18,6 +18,7 @@ struct vkms_config *vkms_config_create(char *dev_name) =20 config->dev_name =3D dev_name; config->crtcs =3D (struct list_head)LIST_HEAD_INIT(config->crtcs); + config->encoders =3D (struct list_head)LIST_HEAD_INIT(config->encoders); =20 return config; } @@ -28,6 +29,7 @@ struct vkms_config *vkms_config_default_create(bool enabl= e_cursor, { struct vkms_config *config; struct vkms_config_crtc *crtc_cfg; + struct vkms_config_encoder *encoder_cfg; =20 config =3D vkms_config_create(DEFAULT_DEVICE_NAME); if (IS_ERR(config)) @@ -40,16 +42,24 @@ struct vkms_config *vkms_config_default_create(bool ena= ble_cursor, if (IS_ERR(crtc_cfg)) return ERR_CAST(crtc_cfg); =20 + encoder_cfg =3D vkms_config_add_encoder(config, BIT(0)); + if (IS_ERR(encoder_cfg)) + return ERR_CAST(encoder_cfg); + return config; } =20 void vkms_config_destroy(struct vkms_config *config) { struct vkms_config_crtc *crtc_cfg, *crtc_tmp; + struct vkms_config_encoder *encoder_cfg, *encoder_tmp; =20 list_for_each_entry_safe(crtc_cfg, crtc_tmp, &config->crtcs, list) vkms_config_destroy_crtc(config, crtc_cfg); =20 + list_for_each_entry_safe(encoder_cfg, encoder_tmp, &config->encoders, lis= t) + vkms_config_destroy_encoder(config, encoder_cfg); + kfree(config); } =20 @@ -59,6 +69,7 @@ static int vkms_config_show(struct seq_file *m, void *dat= a) struct drm_device *dev =3D entry->dev; struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); struct vkms_config_crtc *crtc_cfg; + struct vkms_config_encoder *encoder_cfg; int n; =20 seq_printf(m, "dev_name=3D%s\n", vkmsdev->config->dev_name); @@ -72,6 +83,13 @@ static int vkms_config_show(struct seq_file *m, void *da= ta) n++; } =20 + n =3D 0; + list_for_each_entry(encoder_cfg, &vkmsdev->config->encoders, list) { + seq_printf(m, "encoder(%d).possible_crtcs=3D%d\n", n, + encoder_cfg->possible_crtcs); + n++; + } + return 0; } =20 @@ -116,3 +134,35 @@ void vkms_config_destroy_crtc(struct vkms_config *conf= ig, list_del(&crtc_cfg->list); kfree(crtc_cfg); } + +struct vkms_config_encoder *vkms_config_add_encoder(struct vkms_config *co= nfig, + uint32_t possible_crtcs) +{ + struct vkms_config_encoder *encoder_cfg; + + encoder_cfg =3D kzalloc(sizeof(*encoder_cfg), GFP_KERNEL); + if (!encoder_cfg) + return ERR_PTR(-ENOMEM); + + encoder_cfg->possible_crtcs =3D possible_crtcs; + + encoder_cfg->index =3D 0; + if (!list_empty(&config->encoders)) { + struct vkms_config_encoder *last; + + last =3D list_last_entry(&config->encoders, + struct vkms_config_encoder, list); + encoder_cfg->index =3D last->index + 1; + } + + list_add_tail(&encoder_cfg->list, &config->encoders); + + return encoder_cfg; +} + +void vkms_config_destroy_encoder(struct vkms_config *config, + struct vkms_config_encoder *encoder_cfg) +{ + list_del(&encoder_cfg->list); + kfree(encoder_cfg); +} diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index bc40a0e3859a..b717b5c0d3d9 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -14,11 +14,18 @@ struct vkms_config_crtc { bool writeback; }; =20 +struct vkms_config_encoder { + struct list_head list; + unsigned int index; + uint32_t possible_crtcs; +}; + struct vkms_config { char *dev_name; bool cursor; bool overlay; struct list_head crtcs; + struct list_head encoders; /* only set when instantiated */ struct vkms_device *dev; }; @@ -39,4 +46,10 @@ struct vkms_config_crtc *vkms_config_add_crtc(struct vkm= s_config *config, void vkms_config_destroy_crtc(struct vkms_config *config, struct vkms_config_crtc *crtc_cfg); =20 +/* Encoders */ +struct vkms_config_encoder *vkms_config_add_encoder(struct vkms_config *co= nfig, + uint32_t possible_crtcs); +void vkms_config_destroy_encoder(struct vkms_config *config, + struct vkms_config_encoder *encoder_cfg); + #endif /* _VKMS_CONFIG_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 15f0b72af325..7afe37aea52d 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -30,7 +30,8 @@ static const struct drm_connector_helper_funcs vkms_conn_= helper_funcs =3D { }; =20 static struct drm_encoder *vkms_encoder_init(struct vkms_device *vkms_devi= ce, - uint32_t possible_crtcs) + uint32_t possible_crtcs, + unsigned int index) { struct drm_encoder *encoder; int ret; @@ -49,6 +50,7 @@ static struct drm_encoder *vkms_encoder_init(struct vkms_= device *vkms_device, return ERR_PTR(ret); } =20 + encoder->index =3D index; encoder->possible_crtcs =3D possible_crtcs; =20 return encoder; @@ -74,6 +76,7 @@ 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; + struct vkms_config_encoder *encoder_cfg; struct vkms_crtc *vkms_crtc; struct vkms_config_crtc *crtc_cfg; struct vkms_plane *primary, *cursor =3D NULL; @@ -123,9 +126,12 @@ int vkms_output_init(struct vkms_device *vkmsdev, int = index) =20 drm_connector_helper_add(connector, &vkms_conn_helper_funcs); =20 - encoder =3D vkms_encoder_init(vkmsdev, BIT(0)); - if (IS_ERR(encoder)) - return PTR_ERR(encoder); + list_for_each_entry(encoder_cfg, &vkmsdev->config->encoders, list) { + encoder =3D vkms_encoder_init(vkmsdev, encoder_cfg->possible_crtcs, + encoder_cfg->index); + if (IS_ERR(encoder)) + return PTR_ERR(encoder); + } =20 ret =3D drm_connector_attach_encoder(connector, encoder); if (ret) { --=20 2.46.0