From nobody Sun Feb 8 16:31:46 2026 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 3E79F19CD0A for ; Tue, 13 Aug 2024 10:51:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546313; cv=none; b=i+G1axXDDfy5RXEgmQuYYTfwFmr6bo+sxXWxvelJpqumAOyvtPSDBgLyiez96RTMejoVjBgzSJ995hZqVVmPNv7TbI2drNoTthLtG59Df2ODe9ZvlRZ+PxxVXlNgMwy9xOcL5BtVOa2dEMfcCmQF+l5JnpTy0iZ9Rgf7ZtVHIMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546313; c=relaxed/simple; bh=IEbzy0xiW/7I/kkCdKp6/fuhTTcrQvU7IOcSqo0GqmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=of4vMOF4diJj8oXSPUhZvXFgY29K8XnbPiBEBy2IpJhBLPBMHWiEz/sOGCvjC06vL82MZJ4EjBI4PQdf4PAffeBA3o+Tl2A0geLxIWF1qkWFi7z87pflAy0Jh88h7p/KsKRXKiKVtz8edWELz4IION5xlfsocxF7X+rCPCfcHbY= 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=B1MerMkW; arc=none smtp.client-ip=209.85.167.43 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="B1MerMkW" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-52f01afa11cso6533752e87.0 for ; Tue, 13 Aug 2024 03:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723546309; x=1724151109; 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=z1b1Eswx9qL8T6Rd6UW0NQch1ATeb/MIAR8sy8FcP0k=; b=B1MerMkWpGwJsV2Maw99U9QckYDjO780MtYxW5UePmpwoFZ9te2Xanxa0BYWglSJ5C rJJUREx6TxmoIK7FQrZlk41NudSDE5bnyfLK/uKxdxP4i1pXNmioPGrvwPJBiVoWFQXY H7/MItszdVxFBUWV6nkx2XdEVaW/7EGj7Ru72kwpsLfzd1gm41/SRiAGTnUd9BsMo/IG bW1M1mv16IkbD+/mgcDtwEQzo3ai4ZhkbsVRC/dJ+Ujwu+6l6EGD1gLn1A+ayDCmTYS2 0BBHt/XE+ADXwultC+SmKNNB0q5eyvFtTlytbkbpu78/s0bmjBW2TKEzSKvCvXFiudZY rsDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723546309; x=1724151109; 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=z1b1Eswx9qL8T6Rd6UW0NQch1ATeb/MIAR8sy8FcP0k=; b=gDRRU6kHgJLRfjJjbki0Sv5xnfKJjrnoKG3/CRBaAbuXYsvk4gxWX8layaTpZF6wuN I5UDwxcBypxS7IFNirvTjffrF+zJ7PI+yWDyt3A7SMTYS+T1YuZveh2VqjDTPmO7WKSG d4pbmayJ72fnua/FvZY0TNSyYcnLyF4bTjGLmhRwPcEZHqY0pMm56zOMzlX/q0xZSMi6 2aVnlin/iVelYugnW6bk+rAIFFnGj/Lw9Pu4ug9XevevtBews3623PDysWW3RdEX1MWU EVNi293tJY9mDJEcghl9dpQrkyoBwIuz0a9LfNij9nOnvE0NkMsRYNcRjpSdY4FBEZfc GcWg== X-Forwarded-Encrypted: i=1; AJvYcCUAnwa+gMhe8hld5ln1ANvc7nKgOxY0KkBPzeqeSRrCPyY8BuAtUnLR/xz3tTymi0epRNuKdjVeYrZJ4XfPMSHxnEuzVPCB3hfHrVdV X-Gm-Message-State: AOJu0Ywv4VNUOvFwpm3cyz8qL6bAGhWr4FvRraUUxaaipRN9O2vFTdVj 48wIUHvCNENBi7ApRdehK92LcuxM5LhpibxONCvCxwffPav0bl1d X-Google-Smtp-Source: AGHT+IHDMdoPIt0vDtMzdf2vnVHY+f/UlarsLfOsG/b/9vpdwiWF/yN55OgcMzvIyUbn7rGva+IR1w== X-Received: by 2002:a05:6512:1592:b0:52b:bf8e:ffea with SMTP id 2adb3069b0e04-532136840a4mr1940424e87.40.1723546308846; Tue, 13 Aug 2024 03:51:48 -0700 (PDT) Received: from fedora.. ([213.94.26.172]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429d877e066sm17290785e9.1.2024.08.13.03.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 03:51:48 -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 08/17] drm/vkms: Allow to configure multiple connectors Date: Tue, 13 Aug 2024 12:44:19 +0200 Message-ID: <20240813105134.17439-9-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 connector configurations to vkms_config and add as many connector as configured during output initialization. For backwards compatibility, create a single connector in the default configuration. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_config.c | 40 ++++++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.h | 12 +++++++++ drivers/gpu/drm/vkms/vkms_output.c | 11 +++++--- 3 files changed, 59 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index 6a8dfebee24e..a456f9db3c66 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -19,6 +19,7 @@ struct vkms_config *vkms_config_create(char *dev_name) 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); + config->connectors =3D (struct list_head)LIST_HEAD_INIT(config->connector= s); =20 return config; } @@ -30,6 +31,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; + struct vkms_config_connector *connector_cfg; =20 config =3D vkms_config_create(DEFAULT_DEVICE_NAME); if (IS_ERR(config)) @@ -46,6 +48,10 @@ struct vkms_config *vkms_config_default_create(bool enab= le_cursor, if (IS_ERR(encoder_cfg)) return ERR_CAST(encoder_cfg); =20 + connector_cfg =3D vkms_config_add_connector(config, BIT(0)); + if (IS_ERR(connector_cfg)) + return ERR_CAST(connector_cfg); + return config; } =20 @@ -53,6 +59,7 @@ void vkms_config_destroy(struct vkms_config *config) { struct vkms_config_crtc *crtc_cfg, *crtc_tmp; struct vkms_config_encoder *encoder_cfg, *encoder_tmp; + struct vkms_config_connector *connector_cfg, *connector_tmp; =20 list_for_each_entry_safe(crtc_cfg, crtc_tmp, &config->crtcs, list) vkms_config_destroy_crtc(config, crtc_cfg); @@ -60,6 +67,9 @@ void vkms_config_destroy(struct vkms_config *config) list_for_each_entry_safe(encoder_cfg, encoder_tmp, &config->encoders, lis= t) vkms_config_destroy_encoder(config, encoder_cfg); =20 + list_for_each_entry_safe(connector_cfg, connector_tmp, &config->connector= s, list) + vkms_config_destroy_connector(config, connector_cfg); + kfree(config); } =20 @@ -70,6 +80,7 @@ static int vkms_config_show(struct seq_file *m, void *dat= a) struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); struct vkms_config_crtc *crtc_cfg; struct vkms_config_encoder *encoder_cfg; + struct vkms_config_connector *connector_cfg; int n; =20 seq_printf(m, "dev_name=3D%s\n", vkmsdev->config->dev_name); @@ -90,6 +101,13 @@ static int vkms_config_show(struct seq_file *m, void *d= ata) n++; } =20 + n =3D 0; + list_for_each_entry(connector_cfg, &vkmsdev->config->connectors, list) { + seq_printf(m, "connector(%d).possible_encoders=3D%d\n", n, + connector_cfg->possible_encoders); + n++; + } + return 0; } =20 @@ -166,3 +184,25 @@ void vkms_config_destroy_encoder(struct vkms_config *c= onfig, list_del(&encoder_cfg->list); kfree(encoder_cfg); } + +struct vkms_config_connector *vkms_config_add_connector(struct vkms_config= *config, + uint32_t possible_encoders) +{ + struct vkms_config_connector *connector_cfg; + + connector_cfg =3D kzalloc(sizeof(*connector_cfg), GFP_KERNEL); + if (!connector_cfg) + return ERR_PTR(-ENOMEM); + + connector_cfg->possible_encoders =3D possible_encoders; + list_add_tail(&connector_cfg->list, &config->connectors); + + return connector_cfg; +} + +void vkms_config_destroy_connector(struct vkms_config *config, + struct vkms_config_connector *connector_cfg) +{ + list_del(&connector_cfg->list); + kfree(connector_cfg); +} diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index b717b5c0d3d9..f1dd59fc6300 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -20,12 +20,18 @@ struct vkms_config_encoder { uint32_t possible_crtcs; }; =20 +struct vkms_config_connector { + struct list_head list; + uint32_t possible_encoders; +}; + struct vkms_config { char *dev_name; bool cursor; bool overlay; struct list_head crtcs; struct list_head encoders; + struct list_head connectors; /* only set when instantiated */ struct vkms_device *dev; }; @@ -52,4 +58,10 @@ struct vkms_config_encoder *vkms_config_add_encoder(stru= ct vkms_config *config, void vkms_config_destroy_encoder(struct vkms_config *config, struct vkms_config_encoder *encoder_cfg); =20 +/* Connectors */ +struct vkms_config_connector *vkms_config_add_connector(struct vkms_config= *config, + uint32_t possible_encoders); +void vkms_config_destroy_connector(struct vkms_config *config, + struct vkms_config_connector *connector_cfg); + #endif /* _VKMS_CONFIG_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 4413cf88afc7..021a491de817 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -100,6 +100,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) { struct drm_device *dev =3D &vkmsdev->drm; struct drm_connector *connector; + struct vkms_config_connector *connector_cfg; struct drm_encoder *encoder; struct vkms_config_encoder *encoder_cfg; struct vkms_crtc *vkms_crtc; @@ -142,10 +143,6 @@ int vkms_output_init(struct vkms_device *vkmsdev, int = index) } } =20 - connector =3D vkms_connector_init(vkmsdev, BIT(index)); - if (IS_ERR(connector)) - return PTR_ERR(connector); - list_for_each_entry(encoder_cfg, &vkmsdev->config->encoders, list) { encoder =3D vkms_encoder_init(vkmsdev, encoder_cfg->possible_crtcs, encoder_cfg->index); @@ -153,6 +150,12 @@ int vkms_output_init(struct vkms_device *vkmsdev, int = index) return PTR_ERR(encoder); } =20 + list_for_each_entry(connector_cfg, &vkmsdev->config->connectors, list) { + connector =3D vkms_connector_init(vkmsdev, connector_cfg->possible_encod= ers); + if (IS_ERR(connector)) + return PTR_ERR(connector); + } + drm_mode_config_reset(dev); =20 return 0; --=20 2.46.0