* [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace
@ 2021-05-06 0:47 Nischal Varide
2021-05-06 0:47 ` [Intel-gfx] [RFC 1/1] " Nischal Varide
` (5 more replies)
0 siblings, 6 replies; 13+ messages in thread
From: Nischal Varide @ 2021-05-06 0:47 UTC (permalink / raw)
To: intel-gfx, nischal.varide, uma.shankar, anshuman.gupta
Right now the HDMI properties like vendor and product ids are hardcoded
in the function "intel_hdmi_compute_spd_infoframe()".
ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
This patch enables the possibility of setting vendor and product fields
of the Infoframe structure in the userspace, instead of hardcoding in
the kernel.
The changes has been Tested by an IGT testcase , which will be floated
in few hours
Nischal Varide (1):
drm/i915/display: Expose HDMI properties to userspace
drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
.../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
.../gpu/drm/i915/display/intel_connector.h | 1 +
.../drm/i915/display/intel_display_types.h | 5 +++++
drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
drivers/gpu/drm/i915/i915_drv.h | 1 +
7 files changed, 59 insertions(+), 1 deletion(-)
--
2.29.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] [RFC 1/1] drm/i915/display: Expose HDMI properties to userspace
2021-05-06 0:47 [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace Nischal Varide
@ 2021-05-06 0:47 ` Nischal Varide
2021-05-06 10:13 ` Jani Nikula
2021-05-07 6:26 ` [igt-dev] [RFC v2 0/1] drm/i915/display: New Property Creation for HDMI Nischal Varide
2021-05-06 8:26 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: Expose HDMI properties to userspace Patchwork
` (4 subsequent siblings)
5 siblings, 2 replies; 13+ messages in thread
From: Nischal Varide @ 2021-05-06 0:47 UTC (permalink / raw)
To: intel-gfx, nischal.varide, uma.shankar, anshuman.gupta
Right now the HDMI properties like vendor and product ids are hardcoded
in the function "intel_hdmi_compute_spd_infoframe()".
ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
This patch enables the possibility of setting vendor and product fields
of the Infoframe structure in the userspace, instead of hardcoding in
the kernel.
The changes has been Tested by an IGT testcase , which will be floated
in few hours
Signed-off-by: Nischal Varide <nischal.varide@intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
.../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
.../gpu/drm/i915/display/intel_connector.h | 1 +
.../drm/i915/display/intel_display_types.h | 5 +++++
drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
drivers/gpu/drm/i915/i915_drv.h | 1 +
7 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 45feaaddab26..4d38eeb9dd33 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -65,6 +65,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
*val = intel_conn_state->force_audio;
else if (property == dev_priv->broadcast_rgb_property)
*val = intel_conn_state->broadcast_rgb;
+ else if (property == dev_priv->hdmi_vendor_product_property)
+ *val = (intel_conn_state->hdmi_vendor_product_blob)
+ ? (intel_conn_state->hdmi_vendor_product_blob->base.id) : 0;
else {
drm_dbg_atomic(&dev_priv->drm,
"Unknown property [PROP:%d:%s]\n",
@@ -93,6 +96,7 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_connector_state *intel_conn_state =
to_intel_digital_connector_state(state);
+ struct drm_property_blob *new_blob = NULL;
if (property == dev_priv->force_audio_property) {
intel_conn_state->force_audio = val;
@@ -104,6 +108,16 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
return 0;
}
+ if (property == dev_priv->hdmi_vendor_product_property) {
+ new_blob = drm_property_lookup_blob(dev, val);
+ if (new_blob == NULL)
+ return -EINVAL;
+ if (drm_property_replace_blob
+ (&intel_conn_state->hdmi_vendor_product_blob, new_blob)) {
+ drm_property_blob_put(new_blob);
+ return 0;
+ }
+ }
drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
property->base.id, property->name);
return -EINVAL;
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index d5ceb7bdc14b..175c6242c5ee 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -269,6 +269,26 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
drm_object_attach_property(&connector->base, prop, 0);
}
+void
+intel_attach_hdmi_vendor_product_property(struct drm_connector *connector)
+{
+ struct drm_device *dev = connector->dev;
+ struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_property *prop;
+
+ prop = dev_priv->hdmi_vendor_product_property;
+ if (prop == NULL) {
+ prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
+ DRM_MODE_PROP_ATOMIC, "hdmi_vendor_product", 0);
+ if (prop == NULL)
+ return;
+
+ dev_priv->hdmi_vendor_product_property = prop;
+ }
+
+ drm_object_attach_property(&connector->base, prop, 0);
+}
+
void
intel_attach_aspect_ratio_property(struct drm_connector *connector)
{
diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
index 661a37a3c6d8..9e16e098f53a 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.h
+++ b/drivers/gpu/drm/i915/display/intel_connector.h
@@ -27,6 +27,7 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector);
int intel_connector_update_modes(struct drm_connector *connector,
struct edid *edid);
int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
+void intel_attach_hdmi_vendor_product_property(struct drm_connector *connector);
void intel_attach_force_audio_property(struct drm_connector *connector);
void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
void intel_attach_aspect_ratio_property(struct drm_connector *connector);
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 6d8cdaa36748..d29f54163044 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -549,6 +549,11 @@ struct intel_digital_connector_state {
enum hdmi_force_audio force_audio;
int broadcast_rgb;
+ /*
+ * hdmi_infoframe metadata
+ * DRM blob with hdmi vendor and product info
+ */
+ struct drm_property_blob *hdmi_vendor_product_blob;
};
#define to_intel_digital_connector_state(x) container_of(x, struct intel_digital_connector_state, base)
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 28e297296160..6f416c4a20b6 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -762,6 +762,9 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
{
struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
int ret;
+ struct hdmi_vendor_product_info *hdmi_vp_info;
+ struct intel_digital_connector_state *intel_conn_state =
+ to_intel_digital_connector_state(conn_state);
if (!crtc_state->has_infoframe)
return true;
@@ -769,7 +772,15 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
crtc_state->infoframes.enable |=
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
- ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
+ if (!intel_conn_state->hdmi_vendor_product_blob)
+ ret = hdmi_spd_infoframe_init(frame, "intel", "Integrated gfx");
+ else {
+ if (intel_conn_state->hdmi_vendor_product_blob->data) {
+ hdmi_vp_info = intel_conn_state->hdmi_vendor_product_blob->data;
+ ret = hdmi_spd_infoframe_init(frame, hdmi_vp_info->vendor,
+ hdmi_vp_info->product);
+ }
+ }
if (drm_WARN_ON(encoder->base.dev, ret))
return false;
@@ -2456,6 +2467,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
intel_attach_force_audio_property(connector);
intel_attach_broadcast_rgb_property(connector);
intel_attach_aspect_ratio_property(connector);
+ intel_attach_hdmi_vendor_product_property(connector);
intel_attach_hdmi_colorspace_property(connector);
drm_connector_attach_content_type_property(connector);
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
index b43a180d007e..5be7179389d1 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.h
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
@@ -23,6 +23,11 @@ struct drm_connector_state;
union hdmi_infoframe;
enum port;
+/*Vendor Id and Product Id for the Hdmi property exported to Userspace*/
+struct hdmi_vendor_product_info {
+ char vendor[30];
+ char product[30];
+};
void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
struct intel_connector *intel_connector);
int intel_hdmi_compute_config(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3cfa6effbb5f..9e3373c0f1eb 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1014,6 +1014,7 @@ struct drm_i915_private {
struct drm_property *broadcast_rgb_property;
struct drm_property *force_audio_property;
+ struct drm_property *hdmi_vendor_product_property;
/* hda/i915 audio component */
struct i915_audio_component *audio_component;
--
2.29.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: Expose HDMI properties to userspace
2021-05-06 0:47 [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace Nischal Varide
2021-05-06 0:47 ` [Intel-gfx] [RFC 1/1] " Nischal Varide
@ 2021-05-06 8:26 ` Patchwork
2021-05-06 8:54 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2021-05-06 8:26 UTC (permalink / raw)
To: Nischal Varide; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: Expose HDMI properties to userspace
URL : https://patchwork.freedesktop.org/series/89833/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
fed7f9fc21db drm/i915/display: Expose HDMI properties to userspace
-:48: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!new_blob"
#48: FILE: drivers/gpu/drm/i915/display/intel_atomic.c:113:
+ if (new_blob == NULL)
-:75: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!prop"
#75: FILE: drivers/gpu/drm/i915/display/intel_connector.c:280:
+ if (prop == NULL) {
-:78: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!prop"
#78: FILE: drivers/gpu/drm/i915/display/intel_connector.c:283:
+ if (prop == NULL)
-:137: CHECK:BRACES: braces {} should be used on all arms of this statement
#137: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:775:
+ if (!intel_conn_state->hdmi_vendor_product_blob)
[...]
+ else {
[...]
-:139: CHECK:BRACES: Unbalanced braces around else statement
#139: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:777:
+ else {
-:143: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#143: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:781:
+ ret = hdmi_spd_infoframe_init(frame, hdmi_vp_info->vendor,
+ hdmi_vp_info->product);
total: 0 errors, 0 warnings, 6 checks, 126 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Expose HDMI properties to userspace
2021-05-06 0:47 [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace Nischal Varide
2021-05-06 0:47 ` [Intel-gfx] [RFC 1/1] " Nischal Varide
2021-05-06 8:26 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: Expose HDMI properties to userspace Patchwork
@ 2021-05-06 8:54 ` Patchwork
2021-05-06 10:33 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2021-05-06 8:54 UTC (permalink / raw)
To: Nischal Varide; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4065 bytes --]
== Series Details ==
Series: drm/i915/display: Expose HDMI properties to userspace
URL : https://patchwork.freedesktop.org/series/89833/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10050 -> Patchwork_20076
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/index.html
Known issues
------------
Here are the changes found in Patchwork_20076 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-bsw-kefka: NOTRUN -> [SKIP][1] ([fdo#109271]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/fi-bsw-kefka/igt@amdgpu/amd_basic@query-info.html
* igt@amdgpu/amd_prime@amd-to-i915:
- fi-tgl-y: NOTRUN -> [SKIP][2] ([fdo#109315] / [i915#2575])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/fi-tgl-y/igt@amdgpu/amd_prime@amd-to-i915.html
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [PASS][3] -> [INCOMPLETE][4] ([i915#2782] / [i915#2940])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-icl-u2: [PASS][5] -> [DMESG-WARN][6] ([i915#2868])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/fi-icl-u2/igt@kms_chamelium@common-hpd-after-suspend.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/fi-icl-u2/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@runner@aborted:
- fi-bsw-nick: NOTRUN -> [FAIL][7] ([i915#1436])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/fi-bsw-nick/igt@runner@aborted.html
- fi-kbl-r: NOTRUN -> [FAIL][8] ([i915#1569] / [i915#192] / [i915#193] / [i915#194] / [i915#3363])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/fi-kbl-r/igt@runner@aborted.html
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-bsw-kefka: [INCOMPLETE][9] ([i915#2782]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/fi-bsw-kefka/igt@i915_selftest@live@hangcheck.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/fi-bsw-kefka/igt@i915_selftest@live@hangcheck.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1569]: https://gitlab.freedesktop.org/drm/intel/issues/1569
[i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
[i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
[i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2868]: https://gitlab.freedesktop.org/drm/intel/issues/2868
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
Participating hosts (44 -> 40)
------------------------------
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-bdw-samus fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_10050 -> Patchwork_20076
CI-20190529: 20190529
CI_DRM_10050: ae46d9d790a148ab7b293cad67c770c0221e2c83 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6079: c77c1e9d716481aa44d713e8c91873aa679547ac @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_20076: fed7f9fc21dbb0bc30f75c1180d775699c3126ad @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
fed7f9fc21db drm/i915/display: Expose HDMI properties to userspace
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/index.html
[-- Attachment #1.2: Type: text/html, Size: 4876 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [RFC 1/1] drm/i915/display: Expose HDMI properties to userspace
2021-05-06 0:47 ` [Intel-gfx] [RFC 1/1] " Nischal Varide
@ 2021-05-06 10:13 ` Jani Nikula
2021-05-07 6:26 ` [igt-dev] [RFC v2 0/1] drm/i915/display: New Property Creation for HDMI Nischal Varide
1 sibling, 0 replies; 13+ messages in thread
From: Jani Nikula @ 2021-05-06 10:13 UTC (permalink / raw)
To: Nischal Varide, intel-gfx, nischal.varide, uma.shankar, anshuman.gupta
On Thu, 06 May 2021, Nischal Varide <nischal.varide@intel.com> wrote:
> Right now the HDMI properties like vendor and product ids are hardcoded
> in the function "intel_hdmi_compute_spd_infoframe()".
>
> ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
>
> This patch enables the possibility of setting vendor and product fields
> of the Infoframe structure in the userspace, instead of hardcoding in
> the kernel.
This explains the "what". We also need an explanation of "why".
BR,
Jani.
>
> The changes has been Tested by an IGT testcase , which will be floated
> in few hours
>
> Signed-off-by: Nischal Varide <nischal.varide@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
> .../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
> .../gpu/drm/i915/display/intel_connector.h | 1 +
> .../drm/i915/display/intel_display_types.h | 5 +++++
> drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
> drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> 7 files changed, 59 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
> index 45feaaddab26..4d38eeb9dd33 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> @@ -65,6 +65,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
> *val = intel_conn_state->force_audio;
> else if (property == dev_priv->broadcast_rgb_property)
> *val = intel_conn_state->broadcast_rgb;
> + else if (property == dev_priv->hdmi_vendor_product_property)
> + *val = (intel_conn_state->hdmi_vendor_product_blob)
> + ? (intel_conn_state->hdmi_vendor_product_blob->base.id) : 0;
> else {
> drm_dbg_atomic(&dev_priv->drm,
> "Unknown property [PROP:%d:%s]\n",
> @@ -93,6 +96,7 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_digital_connector_state *intel_conn_state =
> to_intel_digital_connector_state(state);
> + struct drm_property_blob *new_blob = NULL;
>
> if (property == dev_priv->force_audio_property) {
> intel_conn_state->force_audio = val;
> @@ -104,6 +108,16 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
> return 0;
> }
>
> + if (property == dev_priv->hdmi_vendor_product_property) {
> + new_blob = drm_property_lookup_blob(dev, val);
> + if (new_blob == NULL)
> + return -EINVAL;
> + if (drm_property_replace_blob
> + (&intel_conn_state->hdmi_vendor_product_blob, new_blob)) {
> + drm_property_blob_put(new_blob);
> + return 0;
> + }
> + }
> drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
> property->base.id, property->name);
> return -EINVAL;
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
> index d5ceb7bdc14b..175c6242c5ee 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.c
> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
> @@ -269,6 +269,26 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
> drm_object_attach_property(&connector->base, prop, 0);
> }
>
> +void
> +intel_attach_hdmi_vendor_product_property(struct drm_connector *connector)
> +{
> + struct drm_device *dev = connector->dev;
> + struct drm_i915_private *dev_priv = to_i915(dev);
> + struct drm_property *prop;
> +
> + prop = dev_priv->hdmi_vendor_product_property;
> + if (prop == NULL) {
> + prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
> + DRM_MODE_PROP_ATOMIC, "hdmi_vendor_product", 0);
> + if (prop == NULL)
> + return;
> +
> + dev_priv->hdmi_vendor_product_property = prop;
> + }
> +
> + drm_object_attach_property(&connector->base, prop, 0);
> +}
> +
> void
> intel_attach_aspect_ratio_property(struct drm_connector *connector)
> {
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
> index 661a37a3c6d8..9e16e098f53a 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.h
> +++ b/drivers/gpu/drm/i915/display/intel_connector.h
> @@ -27,6 +27,7 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector);
> int intel_connector_update_modes(struct drm_connector *connector,
> struct edid *edid);
> int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
> +void intel_attach_hdmi_vendor_product_property(struct drm_connector *connector);
> void intel_attach_force_audio_property(struct drm_connector *connector);
> void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
> void intel_attach_aspect_ratio_property(struct drm_connector *connector);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 6d8cdaa36748..d29f54163044 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -549,6 +549,11 @@ struct intel_digital_connector_state {
>
> enum hdmi_force_audio force_audio;
> int broadcast_rgb;
> + /*
> + * hdmi_infoframe metadata
> + * DRM blob with hdmi vendor and product info
> + */
> + struct drm_property_blob *hdmi_vendor_product_blob;
> };
>
> #define to_intel_digital_connector_state(x) container_of(x, struct intel_digital_connector_state, base)
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 28e297296160..6f416c4a20b6 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -762,6 +762,9 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
> {
> struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
> int ret;
> + struct hdmi_vendor_product_info *hdmi_vp_info;
> + struct intel_digital_connector_state *intel_conn_state =
> + to_intel_digital_connector_state(conn_state);
>
> if (!crtc_state->has_infoframe)
> return true;
> @@ -769,7 +772,15 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
> crtc_state->infoframes.enable |=
> intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
>
> - ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
> + if (!intel_conn_state->hdmi_vendor_product_blob)
> + ret = hdmi_spd_infoframe_init(frame, "intel", "Integrated gfx");
> + else {
> + if (intel_conn_state->hdmi_vendor_product_blob->data) {
> + hdmi_vp_info = intel_conn_state->hdmi_vendor_product_blob->data;
> + ret = hdmi_spd_infoframe_init(frame, hdmi_vp_info->vendor,
> + hdmi_vp_info->product);
> + }
> + }
> if (drm_WARN_ON(encoder->base.dev, ret))
> return false;
>
> @@ -2456,6 +2467,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
> intel_attach_force_audio_property(connector);
> intel_attach_broadcast_rgb_property(connector);
> intel_attach_aspect_ratio_property(connector);
> + intel_attach_hdmi_vendor_product_property(connector);
>
> intel_attach_hdmi_colorspace_property(connector);
> drm_connector_attach_content_type_property(connector);
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
> index b43a180d007e..5be7179389d1 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
> @@ -23,6 +23,11 @@ struct drm_connector_state;
> union hdmi_infoframe;
> enum port;
>
> +/*Vendor Id and Product Id for the Hdmi property exported to Userspace*/
> +struct hdmi_vendor_product_info {
> + char vendor[30];
> + char product[30];
> +};
> void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
> struct intel_connector *intel_connector);
> int intel_hdmi_compute_config(struct intel_encoder *encoder,
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 3cfa6effbb5f..9e3373c0f1eb 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1014,6 +1014,7 @@ struct drm_i915_private {
>
> struct drm_property *broadcast_rgb_property;
> struct drm_property *force_audio_property;
> + struct drm_property *hdmi_vendor_product_property;
>
> /* hda/i915 audio component */
> struct i915_audio_component *audio_component;
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/display: Expose HDMI properties to userspace
2021-05-06 0:47 [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace Nischal Varide
` (2 preceding siblings ...)
2021-05-06 8:54 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2021-05-06 10:33 ` Patchwork
2021-05-07 6:45 ` [Intel-gfx] [RFC 0/1] " Ville Syrjälä
2021-05-10 8:29 ` [igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [RFC,v2,1/1] drm/i915/display: New Property Creation for HDMI Patchwork
5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2021-05-06 10:33 UTC (permalink / raw)
To: Nischal Varide; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 28724 bytes --]
== Series Details ==
Series: drm/i915/display: Expose HDMI properties to userspace
URL : https://patchwork.freedesktop.org/series/89833/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10050_full -> Patchwork_20076_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20076_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_20076_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20076_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_ctx_persistence@replace@vcs0:
- shard-tglb: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-tglb8/igt@gem_ctx_persistence@replace@vcs0.html
* igt@kms_properties@connector-properties-atomic:
- shard-iclb: [PASS][2] -> [FAIL][3] +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb8/igt@kms_properties@connector-properties-atomic.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb5/igt@kms_properties@connector-properties-atomic.html
- shard-glk: [PASS][4] -> [FAIL][5] +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-glk6/igt@kms_properties@connector-properties-atomic.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-glk5/igt@kms_properties@connector-properties-atomic.html
- shard-kbl: [PASS][6] -> [FAIL][7] +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl3/igt@kms_properties@connector-properties-atomic.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl1/igt@kms_properties@connector-properties-atomic.html
* igt@kms_properties@connector-properties-legacy:
- shard-skl: [PASS][8] -> [FAIL][9] +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl9/igt@kms_properties@connector-properties-legacy.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl8/igt@kms_properties@connector-properties-legacy.html
- shard-snb: NOTRUN -> [FAIL][10] +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb5/igt@kms_properties@connector-properties-legacy.html
- shard-tglb: [PASS][11] -> [FAIL][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-tglb7/igt@kms_properties@connector-properties-legacy.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-tglb8/igt@kms_properties@connector-properties-legacy.html
Known issues
------------
Here are the changes found in Patchwork_20076_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@api_intel_bb@lot-of-buffers:
- shard-skl: [PASS][13] -> [DMESG-WARN][14] ([i915#1982])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl8/igt@api_intel_bb@lot-of-buffers.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl7/igt@api_intel_bb@lot-of-buffers.html
* igt@device_reset@unbind-reset-rebind:
- shard-tglb: [PASS][15] -> [INCOMPLETE][16] ([i915#750])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-tglb2/igt@device_reset@unbind-reset-rebind.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-tglb7/igt@device_reset@unbind-reset-rebind.html
* igt@drm_mm@all@insert:
- shard-skl: [PASS][17] -> [INCOMPLETE][18] ([i915#2485] / [i915#2502])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl6/igt@drm_mm@all@insert.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl5/igt@drm_mm@all@insert.html
* igt@gem_ctx_persistence@legacy-engines-mixed:
- shard-snb: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#1099]) +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb7/igt@gem_ctx_persistence@legacy-engines-mixed.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [PASS][20] -> [FAIL][21] ([i915#2842])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb4/igt@gem_exec_fair@basic-none-share@rcs0.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb8/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none-vip@rcs0:
- shard-glk: [PASS][22] -> [FAIL][23] ([i915#2842]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-glk5/igt@gem_exec_fair@basic-none-vip@rcs0.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-glk6/igt@gem_exec_fair@basic-none-vip@rcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][24] -> [FAIL][25] ([i915#2842]) +3 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl1/igt@gem_exec_fair@basic-none@vcs0.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl6/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-tglb: [PASS][26] -> [FAIL][27] ([i915#2842])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-tglb7/igt@gem_exec_fair@basic-pace@vcs0.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-tglb8/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][28] -> [SKIP][29] ([i915#2190])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-tglb5/igt@gem_huc_copy@huc-copy.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-tglb6/igt@gem_huc_copy@huc-copy.html
* igt@gem_mmap_gtt@big-copy:
- shard-skl: [PASS][30] -> [FAIL][31] ([i915#307])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl6/igt@gem_mmap_gtt@big-copy.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl5/igt@gem_mmap_gtt@big-copy.html
* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [PASS][32] -> [FAIL][33] ([i915#307])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb2/igt@gem_mmap_gtt@cpuset-big-copy-xy.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb3/igt@gem_mmap_gtt@cpuset-big-copy-xy.html
* igt@gem_mmap_offset@clear:
- shard-glk: [PASS][34] -> [FAIL][35] ([i915#1888] / [i915#3160])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-glk1/igt@gem_mmap_offset@clear.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-glk6/igt@gem_mmap_offset@clear.html
* igt@gem_userptr_blits@input-checking:
- shard-snb: NOTRUN -> [DMESG-WARN][36] ([i915#3002])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb7/igt@gem_userptr_blits@input-checking.html
* igt@gem_userptr_blits@vma-merge:
- shard-snb: NOTRUN -> [FAIL][37] ([i915#2724])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb5/igt@gem_userptr_blits@vma-merge.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][38] -> [DMESG-WARN][39] ([i915#1436] / [i915#716])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl4/igt@gen9_exec_parse@allowed-single.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl1/igt@gen9_exec_parse@allowed-single.html
* igt@gen9_exec_parse@batch-invalid-length:
- shard-snb: NOTRUN -> [SKIP][40] ([fdo#109271]) +256 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb2/igt@gen9_exec_parse@batch-invalid-length.html
* igt@i915_pm_dc@dc6-psr:
- shard-kbl: NOTRUN -> [SKIP][41] ([fdo#109271]) +50 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl4/igt@i915_pm_dc@dc6-psr.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
- shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271] / [i915#1937])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl2/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: NOTRUN -> [DMESG-WARN][43] ([i915#180])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl6/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@kms_chamelium@hdmi-hpd:
- shard-kbl: NOTRUN -> [SKIP][44] ([fdo#109271] / [fdo#111827]) +3 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl4/igt@kms_chamelium@hdmi-hpd.html
* igt@kms_color_chamelium@pipe-a-ctm-0-25:
- shard-snb: NOTRUN -> [SKIP][45] ([fdo#109271] / [fdo#111827]) +14 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb7/igt@kms_color_chamelium@pipe-a-ctm-0-25.html
* igt@kms_color_chamelium@pipe-a-ctm-limited-range:
- shard-apl: NOTRUN -> [SKIP][46] ([fdo#109271] / [fdo#111827]) +12 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl7/igt@kms_color_chamelium@pipe-a-ctm-limited-range.html
* igt@kms_content_protection@atomic:
- shard-kbl: NOTRUN -> [TIMEOUT][47] ([i915#1319])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl4/igt@kms_content_protection@atomic.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-skl: [PASS][48] -> [INCOMPLETE][49] ([i915#300])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl9/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_flip@2x-plain-flip-ts-check@bc-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][50] -> [FAIL][51] ([i915#2122])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-glk5/igt@kms_flip@2x-plain-flip-ts-check@bc-hdmi-a1-hdmi-a2.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-glk2/igt@kms_flip@2x-plain-flip-ts-check@bc-hdmi-a1-hdmi-a2.html
* igt@kms_flip@flip-vs-expired-vblank@c-edp1:
- shard-skl: [PASS][52] -> [FAIL][53] ([i915#79]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl8/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl1/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1:
- shard-skl: [PASS][54] -> [FAIL][55] ([i915#2122]) +1 similar issue
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl7/igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl4/igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile:
- shard-apl: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#2642])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-apl: NOTRUN -> [SKIP][57] ([fdo#109271] / [i915#2672])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][58] -> [DMESG-WARN][59] ([i915#180]) +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl6/igt@kms_hdr@bpc-switch-suspend.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl1/igt@kms_hdr@bpc-switch-suspend.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-apl: NOTRUN -> [SKIP][60] ([fdo#109271] / [i915#533])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl7/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-kbl: NOTRUN -> [FAIL][61] ([fdo#108145] / [i915#265])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl4/igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][62] ([i915#265])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl7/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-apl: NOTRUN -> [FAIL][63] ([fdo#108145] / [i915#265])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl2/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][64] -> [FAIL][65] ([fdo#108145] / [i915#265]) +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2:
- shard-apl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#658]) +3 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl7/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2:
- shard-kbl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#658])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][68] -> [SKIP][69] ([fdo#109441]) +3 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb3/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_vblank@pipe-d-wait-forked-hang:
- shard-apl: NOTRUN -> [SKIP][70] ([fdo#109271]) +142 similar issues
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl6/igt@kms_vblank@pipe-d-wait-forked-hang.html
* igt@kms_writeback@writeback-pixel-formats:
- shard-apl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#2437])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl2/igt@kms_writeback@writeback-pixel-formats.html
* igt@runner@aborted:
- shard-snb: NOTRUN -> [FAIL][72] ([i915#3002] / [i915#698])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb7/igt@runner@aborted.html
* igt@sysfs_clients@sema-50:
- shard-apl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#2994])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl2/igt@sysfs_clients@sema-50.html
#### Possible fixes ####
* igt@gem_ctx_persistence@replace@bcs0:
- shard-tglb: [INCOMPLETE][74] -> [PASS][75]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-tglb3/igt@gem_ctx_persistence@replace@bcs0.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-tglb8/igt@gem_ctx_persistence@replace@bcs0.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-apl: [SKIP][76] ([fdo#109271]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-apl2/igt@gem_exec_fair@basic-none-share@rcs0.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-apl3/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][78] ([i915#2842]) -> [PASS][79]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-tglb3/igt@gem_exec_fair@basic-pace-share@rcs0.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-tglb5/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-iclb: [FAIL][80] ([i915#2842]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb5/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb8/igt@gem_exec_fair@basic-pace-solo@rcs0.html
- shard-glk: [FAIL][82] ([i915#2842]) -> [PASS][83] +1 similar issue
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-glk8/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-glk4/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: [FAIL][84] ([i915#2842]) -> [PASS][85] +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl2/igt@gem_exec_fair@basic-pace@vecs0.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl2/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_fenced_exec_thrash@no-spare-fences:
- shard-snb: [INCOMPLETE][86] ([i915#2055]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-snb6/igt@gem_fenced_exec_thrash@no-spare-fences.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-snb7/igt@gem_fenced_exec_thrash@no-spare-fences.html
* igt@gem_mmap_gtt@big-copy-odd:
- shard-glk: [FAIL][88] ([i915#307]) -> [PASS][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-glk2/igt@gem_mmap_gtt@big-copy-odd.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-glk9/igt@gem_mmap_gtt@big-copy-odd.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [FAIL][90] ([i915#2521]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl10/igt@kms_async_flips@alternate-sync-async-flip.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl10/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_color@pipe-b-ctm-0-75:
- shard-skl: [DMESG-WARN][92] ([i915#1982]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl7/igt@kms_color@pipe-b-ctm-0-75.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl4/igt@kms_color@pipe-b-ctm-0-75.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-skl: [FAIL][94] ([i915#2346]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-skl: [FAIL][96] ([i915#79]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl8/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl1/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][98] ([i915#180]) -> [PASS][99] +5 similar issues
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl6/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl4/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][100] ([i915#1188]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl8/igt@kms_hdr@bpc-switch.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl6/igt@kms_hdr@bpc-switch.html
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [SKIP][102] ([fdo#109441]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb3/igt@kms_psr@psr2_sprite_blt.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
* igt@perf@polling-small-buf:
- shard-skl: [FAIL][104] ([i915#1722]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl10/igt@perf@polling-small-buf.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl10/igt@perf@polling-small-buf.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][106] ([i915#2684]) -> [WARN][107] ([i915#1804] / [i915#2684])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb1/igt@i915_pm_rc6_residency@rc6-idle.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb6/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2:
- shard-iclb: [SKIP][108] ([i915#2920]) -> [SKIP][109] ([i915#658]) +1 similar issue
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb3/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][110] ([i915#658]) -> [SKIP][111] ([i915#2920]) +2 similar issues
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-iclb3/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][112], [FAIL][113], [FAIL][114], [FAIL][115], [FAIL][116]) ([i915#1436] / [i915#180] / [i915#2505] / [i915#3002] / [i915#3363]) -> ([FAIL][117], [FAIL][118], [FAIL][119], [FAIL][120]) ([i915#1814] / [i915#2505] / [i915#3002] / [i915#3363] / [i915#602])
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl1/igt@runner@aborted.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl2/igt@runner@aborted.html
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl6/igt@runner@aborted.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl4/igt@runner@aborted.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-kbl4/igt@runner@aborted.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl1/igt@runner@aborted.html
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl1/igt@runner@aborted.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl3/igt@runner@aborted.html
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-kbl6/igt@runner@aborted.html
- shard-skl: ([FAIL][121], [FAIL][122], [FAIL][123], [FAIL][124]) ([i915#2029] / [i915#2369] / [i915#3002] / [i915#3363]) -> ([FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130]) ([i915#1436] / [i915#1814] / [i915#2029] / [i915#2485] / [i915#3002] / [i915#3363])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl2/igt@runner@aborted.html
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl5/igt@runner@aborted.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl2/igt@runner@aborted.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10050/shard-skl2/igt@runner@aborted.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl5/igt@runner@aborted.html
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl2/igt@runner@aborted.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl2/igt@runner@aborted.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl9/igt@runner@aborted.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl2/igt@runner@aborted.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/shard-skl1/igt@runner@aborted.html
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2485]: https://gitlab.freedesktop.org/drm/intel/issues/2485
[i915#2502]: https://gitlab.freedesktop.org/drm/intel/issues/2502
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2642]: https://gitlab.freedesktop.org/drm/intel/issues/2642
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#307]: https://gitlab.freedesktop.org/drm/intel/issues/307
[i915#3160]: https://gitlab.freedesktop.org/drm/intel/issues/3160
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#602]: https://gitlab.freedesktop.org/drm/intel/issues/602
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#698]: https://gitlab.freedesktop.org/drm/intel/issues/698
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#750]: https://gitlab.freedesktop.org/drm/intel/issues/750
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_10050 -> Patchwork_20076
CI-20190529: 20190529
CI_DRM_10050: ae46d9d790a148ab7b293cad67c770c0221e2c83 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6079: c77c1e9d716481aa44d713e8c91873aa679547ac @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_20076: fed7f9fc21dbb0bc30f75c1180d775699c3126ad @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20076/index.html
[-- Attachment #1.2: Type: text/html, Size: 35201 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [igt-dev] [RFC v2 0/1] drm/i915/display: New Property Creation for HDMI
2021-05-06 0:47 ` [Intel-gfx] [RFC 1/1] " Nischal Varide
2021-05-06 10:13 ` Jani Nikula
@ 2021-05-07 6:26 ` Nischal Varide
2021-05-07 6:27 ` [igt-dev] [RFC v2 1/1] " Nischal Varide
1 sibling, 1 reply; 13+ messages in thread
From: Nischal Varide @ 2021-05-07 6:26 UTC (permalink / raw)
To: igt-dev, nischal.varide, uma.shankar, ankit.k.nautiyal
Right now the HDMI properties like vendor and product ids are hardcoded
in the function "intel_hdmi_compute_spd_infoframe()".
ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
This patch enables the possibility of setting vendor and product id fields
of the Infoframe structure in the userspace instead of hardcoding in
the kernel, and this will help display manufacturers preload picture
configurations for the devices.
The changes has been Tested by an IGT testcase which got floated.
https://patchwork.freedesktop.org/series/89852/.
Nischal Varide (1):
drm/i915/display: New Property Creation for HDMI
drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
.../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
.../gpu/drm/i915/display/intel_connector.h | 1 +
.../drm/i915/display/intel_display_types.h | 5 +++++
drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
drivers/gpu/drm/i915/i915_drv.h | 1 +
7 files changed, 59 insertions(+), 1 deletion(-)
--
2.29.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* [igt-dev] [RFC v2 1/1] drm/i915/display: New Property Creation for HDMI
2021-05-07 6:26 ` [igt-dev] [RFC v2 0/1] drm/i915/display: New Property Creation for HDMI Nischal Varide
@ 2021-05-07 6:27 ` Nischal Varide
0 siblings, 0 replies; 13+ messages in thread
From: Nischal Varide @ 2021-05-07 6:27 UTC (permalink / raw)
To: igt-dev, nischal.varide, uma.shankar, ankit.k.nautiyal
Right now the HDMI properties like vendor and product ids are hardcoded
in the function "intel_hdmi_compute_spd_infoframe()".
ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
This patch enables the possibility of setting vendor and product id fields
of the Infoframe structure in the userspace instead of hardcoding in
the kernel, and this will help display manufacturers preload picture
configurations for the devices.
The changes has been tested by an IGT testcase which got floated.
v2: Edited the commit message on comments received (Ville, Jani)
v1: Create new property for vendor and product id of HDMI.
Signed-off-by: Nischal Varide <nischal.varide@intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
.../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
.../gpu/drm/i915/display/intel_connector.h | 1 +
.../drm/i915/display/intel_display_types.h | 5 +++++
drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
drivers/gpu/drm/i915/i915_drv.h | 1 +
7 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 45feaaddab26..4d38eeb9dd33 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -65,6 +65,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
*val = intel_conn_state->force_audio;
else if (property == dev_priv->broadcast_rgb_property)
*val = intel_conn_state->broadcast_rgb;
+ else if (property == dev_priv->hdmi_vendor_product_property)
+ *val = (intel_conn_state->hdmi_vendor_product_blob)
+ ? (intel_conn_state->hdmi_vendor_product_blob->base.id) : 0;
else {
drm_dbg_atomic(&dev_priv->drm,
"Unknown property [PROP:%d:%s]\n",
@@ -93,6 +96,7 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_connector_state *intel_conn_state =
to_intel_digital_connector_state(state);
+ struct drm_property_blob *new_blob = NULL;
if (property == dev_priv->force_audio_property) {
intel_conn_state->force_audio = val;
@@ -104,6 +108,16 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
return 0;
}
+ if (property == dev_priv->hdmi_vendor_product_property) {
+ new_blob = drm_property_lookup_blob(dev, val);
+ if (new_blob == NULL)
+ return -EINVAL;
+ if (drm_property_replace_blob
+ (&intel_conn_state->hdmi_vendor_product_blob, new_blob)) {
+ drm_property_blob_put(new_blob);
+ return 0;
+ }
+ }
drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
property->base.id, property->name);
return -EINVAL;
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index d5ceb7bdc14b..c4ce8f70e752 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -269,6 +269,26 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
drm_object_attach_property(&connector->base, prop, 0);
}
+void
+intel_attach_hdmi_vendor_product_property(struct drm_connector *connector)
+{
+ struct drm_device *dev = connector->dev;
+ struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_property *prop;
+
+ prop = dev_priv->hdmi_vendor_product_property;
+ if (!prop) {
+ prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
+ DRM_MODE_PROP_ATOMIC, "hdmi_vendor_product", 0);
+ if (!prop)
+ return;
+
+ dev_priv->hdmi_vendor_product_property = prop;
+ }
+
+ drm_object_attach_property(&connector->base, prop, 0);
+}
+
void
intel_attach_aspect_ratio_property(struct drm_connector *connector)
{
diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
index 661a37a3c6d8..9e16e098f53a 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.h
+++ b/drivers/gpu/drm/i915/display/intel_connector.h
@@ -27,6 +27,7 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector);
int intel_connector_update_modes(struct drm_connector *connector,
struct edid *edid);
int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
+void intel_attach_hdmi_vendor_product_property(struct drm_connector *connector);
void intel_attach_force_audio_property(struct drm_connector *connector);
void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
void intel_attach_aspect_ratio_property(struct drm_connector *connector);
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 6d8cdaa36748..d29f54163044 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -549,6 +549,11 @@ struct intel_digital_connector_state {
enum hdmi_force_audio force_audio;
int broadcast_rgb;
+ /*
+ * hdmi_infoframe metadata
+ * DRM blob with hdmi vendor and product info
+ */
+ struct drm_property_blob *hdmi_vendor_product_blob;
};
#define to_intel_digital_connector_state(x) container_of(x, struct intel_digital_connector_state, base)
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 28e297296160..6bda096b411d 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -762,6 +762,9 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
{
struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
int ret;
+ struct hdmi_vendor_product_info *hdmi_vp_info;
+ struct intel_digital_connector_state *intel_conn_state =
+ to_intel_digital_connector_state(conn_state);
if (!crtc_state->has_infoframe)
return true;
@@ -769,7 +772,15 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
crtc_state->infoframes.enable |=
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
- ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
+ if (!intel_conn_state->hdmi_vendor_product_blob) {
+ ret = hdmi_spd_infoframe_init(frame, "intel", "Integrated gfx");
+ } else {
+ if (intel_conn_state->hdmi_vendor_product_blob->data) {
+ hdmi_vp_info = intel_conn_state->hdmi_vendor_product_blob->data;
+ ret = hdmi_spd_infoframe_init(frame, hdmi_vp_info->vendor,
+ hdmi_vp_info->product);
+ }
+ }
if (drm_WARN_ON(encoder->base.dev, ret))
return false;
@@ -2456,6 +2467,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
intel_attach_force_audio_property(connector);
intel_attach_broadcast_rgb_property(connector);
intel_attach_aspect_ratio_property(connector);
+ intel_attach_hdmi_vendor_product_property(connector);
intel_attach_hdmi_colorspace_property(connector);
drm_connector_attach_content_type_property(connector);
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
index b43a180d007e..5be7179389d1 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.h
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
@@ -23,6 +23,11 @@ struct drm_connector_state;
union hdmi_infoframe;
enum port;
+/*Vendor Id and Product Id for the Hdmi property exported to Userspace*/
+struct hdmi_vendor_product_info {
+ char vendor[30];
+ char product[30];
+};
void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
struct intel_connector *intel_connector);
int intel_hdmi_compute_config(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3cfa6effbb5f..9e3373c0f1eb 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1014,6 +1014,7 @@ struct drm_i915_private {
struct drm_property *broadcast_rgb_property;
struct drm_property *force_audio_property;
+ struct drm_property *hdmi_vendor_product_property;
/* hda/i915 audio component */
struct i915_audio_component *audio_component;
--
2.29.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace
2021-05-06 0:47 [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace Nischal Varide
` (3 preceding siblings ...)
2021-05-06 10:33 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2021-05-07 6:45 ` Ville Syrjälä
2021-05-10 8:29 ` [igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [RFC,v2,1/1] drm/i915/display: New Property Creation for HDMI Patchwork
5 siblings, 0 replies; 13+ messages in thread
From: Ville Syrjälä @ 2021-05-07 6:45 UTC (permalink / raw)
To: Nischal Varide; +Cc: intel-gfx
On Thu, May 06, 2021 at 06:17:18AM +0530, Nischal Varide wrote:
> Right now the HDMI properties like vendor and product ids are hardcoded
> in the function "intel_hdmi_compute_spd_infoframe()".
>
> ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
>
> This patch enables the possibility of setting vendor and product fields
> of the Infoframe structure in the userspace, instead of hardcoding in
> the kernel.
>
> The changes has been Tested by an IGT testcase , which will be floated
> in few hours
>
>
> Nischal Varide (1):
> drm/i915/display: Expose HDMI properties to userspace
That subject is quite misleading/vague.
Any uapi additions must be posted to dri-devel.
>
> drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
> .../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
> .../gpu/drm/i915/display/intel_connector.h | 1 +
> .../drm/i915/display/intel_display_types.h | 5 +++++
> drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
> drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> 7 files changed, 59 insertions(+), 1 deletion(-)
>
> --
> 2.29.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [RFC,v2,1/1] drm/i915/display: New Property Creation for HDMI
2021-05-06 0:47 [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace Nischal Varide
` (4 preceding siblings ...)
2021-05-07 6:45 ` [Intel-gfx] [RFC 0/1] " Ville Syrjälä
@ 2021-05-10 8:29 ` Patchwork
5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2021-05-10 8:29 UTC (permalink / raw)
To: Nischal Varide; +Cc: igt-dev
== Series Details ==
Series: series starting with [RFC,v2,1/1] drm/i915/display: New Property Creation for HDMI
URL : https://patchwork.freedesktop.org/series/89939/
State : failure
== Summary ==
Applying: drm/i915/display: New Property Creation for HDMI
Patch failed at 0001 drm/i915/display: New Property Creation for HDMI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [igt-dev] [RFC v2 1/1] drm/i915/display: New Property Creation for HDMI
2021-05-10 9:31 ` Jani Nikula
@ 2021-05-10 12:22 ` Varide, Nischal
0 siblings, 0 replies; 13+ messages in thread
From: Varide, Nischal @ 2021-05-10 12:22 UTC (permalink / raw)
To: Jani Nikula, igt-dev, Shankar, Uma, Nautiyal, Ankit K
On Fri, 07 May 2021, Nischal Varide <nischal.varide@intel.com> wrote:
> Right now the HDMI properties like vendor and product ids are
> hardcoded in the function "intel_hdmi_compute_spd_infoframe()".
>
> ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
>
> This patch enables the possibility of setting vendor and product id
> fields of the Infoframe structure in the userspace instead of
> hardcoding in the kernel, and this will help display manufacturers
> preload picture configurations for the devices.
And what does that mean? :o
As Ville said, uapi changes need to be posted on dri-devel in addition to intel-gfx mailing lists.
BR,
Jani.
I have floated in dri-devel, two days ago and yes... I will try to elaborate on "why" part :[]
-
Nischal
>
> The changes has been tested by an IGT testcase which got floated.
>
> v2: Edited the commit message on comments received (Ville, Jani)
> v1: Create new property for vendor and product id of HDMI.
>
> Signed-off-by: Nischal Varide <nischal.varide@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
> .../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
> .../gpu/drm/i915/display/intel_connector.h | 1 +
> .../drm/i915/display/intel_display_types.h | 5 +++++
> drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
> drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> 7 files changed, 59 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c
> b/drivers/gpu/drm/i915/display/intel_atomic.c
> index 45feaaddab26..4d38eeb9dd33 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> @@ -65,6 +65,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
> *val = intel_conn_state->force_audio;
> else if (property == dev_priv->broadcast_rgb_property)
> *val = intel_conn_state->broadcast_rgb;
> + else if (property == dev_priv->hdmi_vendor_product_property)
> + *val = (intel_conn_state->hdmi_vendor_product_blob)
> + ? (intel_conn_state->hdmi_vendor_product_blob->base.id) : 0;
> else {
> drm_dbg_atomic(&dev_priv->drm,
> "Unknown property [PROP:%d:%s]\n", @@ -93,6 +96,7 @@ int
> intel_digital_connector_atomic_set_property(struct drm_connector *connector,
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_digital_connector_state *intel_conn_state =
> to_intel_digital_connector_state(state);
> + struct drm_property_blob *new_blob = NULL;
>
> if (property == dev_priv->force_audio_property) {
> intel_conn_state->force_audio = val; @@ -104,6 +108,16 @@ int
> intel_digital_connector_atomic_set_property(struct drm_connector *connector,
> return 0;
> }
>
> + if (property == dev_priv->hdmi_vendor_product_property) {
> + new_blob = drm_property_lookup_blob(dev, val);
> + if (new_blob == NULL)
> + return -EINVAL;
> + if (drm_property_replace_blob
> + (&intel_conn_state->hdmi_vendor_product_blob, new_blob)) {
> + drm_property_blob_put(new_blob);
> + return 0;
> + }
> + }
> drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
> property->base.id, property->name);
> return -EINVAL;
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c
> b/drivers/gpu/drm/i915/display/intel_connector.c
> index d5ceb7bdc14b..c4ce8f70e752 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.c
> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
> @@ -269,6 +269,26 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
> drm_object_attach_property(&connector->base, prop, 0); }
>
> +void
> +intel_attach_hdmi_vendor_product_property(struct drm_connector
> +*connector) {
> + struct drm_device *dev = connector->dev;
> + struct drm_i915_private *dev_priv = to_i915(dev);
> + struct drm_property *prop;
> +
> + prop = dev_priv->hdmi_vendor_product_property;
> + if (!prop) {
> + prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
> + DRM_MODE_PROP_ATOMIC, "hdmi_vendor_product", 0);
> + if (!prop)
> + return;
> +
> + dev_priv->hdmi_vendor_product_property = prop;
> + }
> +
> + drm_object_attach_property(&connector->base, prop, 0); }
> +
> void
> intel_attach_aspect_ratio_property(struct drm_connector *connector)
> { diff --git a/drivers/gpu/drm/i915/display/intel_connector.h
> b/drivers/gpu/drm/i915/display/intel_connector.h
> index 661a37a3c6d8..9e16e098f53a 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.h
> +++ b/drivers/gpu/drm/i915/display/intel_connector.h
> @@ -27,6 +27,7 @@ enum pipe intel_connector_get_pipe(struct
> intel_connector *connector); int intel_connector_update_modes(struct drm_connector *connector,
> struct edid *edid);
> int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter
> *adapter);
> +void intel_attach_hdmi_vendor_product_property(struct drm_connector
> +*connector);
> void intel_attach_force_audio_property(struct drm_connector
> *connector); void intel_attach_broadcast_rgb_property(struct
> drm_connector *connector); void
> intel_attach_aspect_ratio_property(struct drm_connector *connector);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 6d8cdaa36748..d29f54163044 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -549,6 +549,11 @@ struct intel_digital_connector_state {
>
> enum hdmi_force_audio force_audio;
> int broadcast_rgb;
> + /*
> + * hdmi_infoframe metadata
> + * DRM blob with hdmi vendor and product info
> + */
> + struct drm_property_blob *hdmi_vendor_product_blob;
> };
>
> #define to_intel_digital_connector_state(x) container_of(x, struct
> intel_digital_connector_state, base) diff --git
> a/drivers/gpu/drm/i915/display/intel_hdmi.c
> b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 28e297296160..6bda096b411d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -762,6 +762,9 @@ intel_hdmi_compute_spd_infoframe(struct
> intel_encoder *encoder, {
> struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
> int ret;
> + struct hdmi_vendor_product_info *hdmi_vp_info;
> + struct intel_digital_connector_state *intel_conn_state =
> + to_intel_digital_connector_state(conn_state);
>
> if (!crtc_state->has_infoframe)
> return true;
> @@ -769,7 +772,15 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
> crtc_state->infoframes.enable |=
> intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
>
> - ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
> + if (!intel_conn_state->hdmi_vendor_product_blob) {
> + ret = hdmi_spd_infoframe_init(frame, "intel", "Integrated gfx");
> + } else {
> + if (intel_conn_state->hdmi_vendor_product_blob->data) {
> + hdmi_vp_info = intel_conn_state->hdmi_vendor_product_blob->data;
> + ret = hdmi_spd_infoframe_init(frame, hdmi_vp_info->vendor,
> + hdmi_vp_info->product);
> + }
> + }
> if (drm_WARN_ON(encoder->base.dev, ret))
> return false;
>
> @@ -2456,6 +2467,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
> intel_attach_force_audio_property(connector);
> intel_attach_broadcast_rgb_property(connector);
> intel_attach_aspect_ratio_property(connector);
> + intel_attach_hdmi_vendor_product_property(connector);
>
> intel_attach_hdmi_colorspace_property(connector);
> drm_connector_attach_content_type_property(connector);
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h
> b/drivers/gpu/drm/i915/display/intel_hdmi.h
> index b43a180d007e..5be7179389d1 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
> @@ -23,6 +23,11 @@ struct drm_connector_state; union hdmi_infoframe;
> enum port;
>
> +/*Vendor Id and Product Id for the Hdmi property exported to
> +Userspace*/ struct hdmi_vendor_product_info {
> + char vendor[30];
> + char product[30];
> +};
> void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
> struct intel_connector *intel_connector); int
> intel_hdmi_compute_config(struct intel_encoder *encoder, diff --git
> a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 3cfa6effbb5f..9e3373c0f1eb 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1014,6 +1014,7 @@ struct drm_i915_private {
>
> struct drm_property *broadcast_rgb_property;
> struct drm_property *force_audio_property;
> + struct drm_property *hdmi_vendor_product_property;
>
> /* hda/i915 audio component */
> struct i915_audio_component *audio_component;
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [igt-dev] [RFC v2 1/1] drm/i915/display: New Property Creation for HDMI
2021-05-07 6:40 ` [igt-dev] [RFC v2 1/1] " Nischal Varide
@ 2021-05-10 9:31 ` Jani Nikula
2021-05-10 12:22 ` Varide, Nischal
0 siblings, 1 reply; 13+ messages in thread
From: Jani Nikula @ 2021-05-10 9:31 UTC (permalink / raw)
To: Nischal Varide, igt-dev, nischal.varide, uma.shankar, ankit.k.nautiyal
On Fri, 07 May 2021, Nischal Varide <nischal.varide@intel.com> wrote:
> Right now the HDMI properties like vendor and product ids are hardcoded
> in the function "intel_hdmi_compute_spd_infoframe()".
>
> ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
>
> This patch enables the possibility of setting vendor and product id fields
> of the Infoframe structure in the userspace instead of hardcoding in
> the kernel, and this will help display manufacturers preload picture
> configurations for the devices.
And what does that mean? :o
As Ville said, uapi changes need to be posted on dri-devel in addition
to intel-gfx mailing lists.
BR,
Jani.
>
> The changes has been tested by an IGT testcase which got floated.
>
> v2: Edited the commit message on comments received (Ville, Jani)
> v1: Create new property for vendor and product id of HDMI.
>
> Signed-off-by: Nischal Varide <nischal.varide@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
> .../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
> .../gpu/drm/i915/display/intel_connector.h | 1 +
> .../drm/i915/display/intel_display_types.h | 5 +++++
> drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
> drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> 7 files changed, 59 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
> index 45feaaddab26..4d38eeb9dd33 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> @@ -65,6 +65,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
> *val = intel_conn_state->force_audio;
> else if (property == dev_priv->broadcast_rgb_property)
> *val = intel_conn_state->broadcast_rgb;
> + else if (property == dev_priv->hdmi_vendor_product_property)
> + *val = (intel_conn_state->hdmi_vendor_product_blob)
> + ? (intel_conn_state->hdmi_vendor_product_blob->base.id) : 0;
> else {
> drm_dbg_atomic(&dev_priv->drm,
> "Unknown property [PROP:%d:%s]\n",
> @@ -93,6 +96,7 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_digital_connector_state *intel_conn_state =
> to_intel_digital_connector_state(state);
> + struct drm_property_blob *new_blob = NULL;
>
> if (property == dev_priv->force_audio_property) {
> intel_conn_state->force_audio = val;
> @@ -104,6 +108,16 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
> return 0;
> }
>
> + if (property == dev_priv->hdmi_vendor_product_property) {
> + new_blob = drm_property_lookup_blob(dev, val);
> + if (new_blob == NULL)
> + return -EINVAL;
> + if (drm_property_replace_blob
> + (&intel_conn_state->hdmi_vendor_product_blob, new_blob)) {
> + drm_property_blob_put(new_blob);
> + return 0;
> + }
> + }
> drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
> property->base.id, property->name);
> return -EINVAL;
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
> index d5ceb7bdc14b..c4ce8f70e752 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.c
> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
> @@ -269,6 +269,26 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
> drm_object_attach_property(&connector->base, prop, 0);
> }
>
> +void
> +intel_attach_hdmi_vendor_product_property(struct drm_connector *connector)
> +{
> + struct drm_device *dev = connector->dev;
> + struct drm_i915_private *dev_priv = to_i915(dev);
> + struct drm_property *prop;
> +
> + prop = dev_priv->hdmi_vendor_product_property;
> + if (!prop) {
> + prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
> + DRM_MODE_PROP_ATOMIC, "hdmi_vendor_product", 0);
> + if (!prop)
> + return;
> +
> + dev_priv->hdmi_vendor_product_property = prop;
> + }
> +
> + drm_object_attach_property(&connector->base, prop, 0);
> +}
> +
> void
> intel_attach_aspect_ratio_property(struct drm_connector *connector)
> {
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
> index 661a37a3c6d8..9e16e098f53a 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.h
> +++ b/drivers/gpu/drm/i915/display/intel_connector.h
> @@ -27,6 +27,7 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector);
> int intel_connector_update_modes(struct drm_connector *connector,
> struct edid *edid);
> int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
> +void intel_attach_hdmi_vendor_product_property(struct drm_connector *connector);
> void intel_attach_force_audio_property(struct drm_connector *connector);
> void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
> void intel_attach_aspect_ratio_property(struct drm_connector *connector);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 6d8cdaa36748..d29f54163044 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -549,6 +549,11 @@ struct intel_digital_connector_state {
>
> enum hdmi_force_audio force_audio;
> int broadcast_rgb;
> + /*
> + * hdmi_infoframe metadata
> + * DRM blob with hdmi vendor and product info
> + */
> + struct drm_property_blob *hdmi_vendor_product_blob;
> };
>
> #define to_intel_digital_connector_state(x) container_of(x, struct intel_digital_connector_state, base)
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 28e297296160..6bda096b411d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -762,6 +762,9 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
> {
> struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
> int ret;
> + struct hdmi_vendor_product_info *hdmi_vp_info;
> + struct intel_digital_connector_state *intel_conn_state =
> + to_intel_digital_connector_state(conn_state);
>
> if (!crtc_state->has_infoframe)
> return true;
> @@ -769,7 +772,15 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
> crtc_state->infoframes.enable |=
> intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
>
> - ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
> + if (!intel_conn_state->hdmi_vendor_product_blob) {
> + ret = hdmi_spd_infoframe_init(frame, "intel", "Integrated gfx");
> + } else {
> + if (intel_conn_state->hdmi_vendor_product_blob->data) {
> + hdmi_vp_info = intel_conn_state->hdmi_vendor_product_blob->data;
> + ret = hdmi_spd_infoframe_init(frame, hdmi_vp_info->vendor,
> + hdmi_vp_info->product);
> + }
> + }
> if (drm_WARN_ON(encoder->base.dev, ret))
> return false;
>
> @@ -2456,6 +2467,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
> intel_attach_force_audio_property(connector);
> intel_attach_broadcast_rgb_property(connector);
> intel_attach_aspect_ratio_property(connector);
> + intel_attach_hdmi_vendor_product_property(connector);
>
> intel_attach_hdmi_colorspace_property(connector);
> drm_connector_attach_content_type_property(connector);
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
> index b43a180d007e..5be7179389d1 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
> @@ -23,6 +23,11 @@ struct drm_connector_state;
> union hdmi_infoframe;
> enum port;
>
> +/*Vendor Id and Product Id for the Hdmi property exported to Userspace*/
> +struct hdmi_vendor_product_info {
> + char vendor[30];
> + char product[30];
> +};
> void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
> struct intel_connector *intel_connector);
> int intel_hdmi_compute_config(struct intel_encoder *encoder,
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 3cfa6effbb5f..9e3373c0f1eb 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1014,6 +1014,7 @@ struct drm_i915_private {
>
> struct drm_property *broadcast_rgb_property;
> struct drm_property *force_audio_property;
> + struct drm_property *hdmi_vendor_product_property;
>
> /* hda/i915 audio component */
> struct i915_audio_component *audio_component;
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* [igt-dev] [RFC v2 1/1] drm/i915/display: New Property Creation for HDMI
2021-05-07 6:40 [igt-dev] [RFC v2 0/1] " Nischal Varide
@ 2021-05-07 6:40 ` Nischal Varide
2021-05-10 9:31 ` Jani Nikula
0 siblings, 1 reply; 13+ messages in thread
From: Nischal Varide @ 2021-05-07 6:40 UTC (permalink / raw)
To: igt-dev, nischal.varide, uma.shankar, ankit.k.nautiyal
Right now the HDMI properties like vendor and product ids are hardcoded
in the function "intel_hdmi_compute_spd_infoframe()".
ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx").
This patch enables the possibility of setting vendor and product id fields
of the Infoframe structure in the userspace instead of hardcoding in
the kernel, and this will help display manufacturers preload picture
configurations for the devices.
The changes has been tested by an IGT testcase which got floated.
v2: Edited the commit message on comments received (Ville, Jani)
v1: Create new property for vendor and product id of HDMI.
Signed-off-by: Nischal Varide <nischal.varide@intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic.c | 14 +++++++++++++
.../gpu/drm/i915/display/intel_connector.c | 20 +++++++++++++++++++
.../gpu/drm/i915/display/intel_connector.h | 1 +
.../drm/i915/display/intel_display_types.h | 5 +++++
drivers/gpu/drm/i915/display/intel_hdmi.c | 14 ++++++++++++-
drivers/gpu/drm/i915/display/intel_hdmi.h | 5 +++++
drivers/gpu/drm/i915/i915_drv.h | 1 +
7 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 45feaaddab26..4d38eeb9dd33 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -65,6 +65,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
*val = intel_conn_state->force_audio;
else if (property == dev_priv->broadcast_rgb_property)
*val = intel_conn_state->broadcast_rgb;
+ else if (property == dev_priv->hdmi_vendor_product_property)
+ *val = (intel_conn_state->hdmi_vendor_product_blob)
+ ? (intel_conn_state->hdmi_vendor_product_blob->base.id) : 0;
else {
drm_dbg_atomic(&dev_priv->drm,
"Unknown property [PROP:%d:%s]\n",
@@ -93,6 +96,7 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_connector_state *intel_conn_state =
to_intel_digital_connector_state(state);
+ struct drm_property_blob *new_blob = NULL;
if (property == dev_priv->force_audio_property) {
intel_conn_state->force_audio = val;
@@ -104,6 +108,16 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
return 0;
}
+ if (property == dev_priv->hdmi_vendor_product_property) {
+ new_blob = drm_property_lookup_blob(dev, val);
+ if (new_blob == NULL)
+ return -EINVAL;
+ if (drm_property_replace_blob
+ (&intel_conn_state->hdmi_vendor_product_blob, new_blob)) {
+ drm_property_blob_put(new_blob);
+ return 0;
+ }
+ }
drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
property->base.id, property->name);
return -EINVAL;
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index d5ceb7bdc14b..c4ce8f70e752 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -269,6 +269,26 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
drm_object_attach_property(&connector->base, prop, 0);
}
+void
+intel_attach_hdmi_vendor_product_property(struct drm_connector *connector)
+{
+ struct drm_device *dev = connector->dev;
+ struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_property *prop;
+
+ prop = dev_priv->hdmi_vendor_product_property;
+ if (!prop) {
+ prop = drm_property_create(dev, DRM_MODE_PROP_BLOB |
+ DRM_MODE_PROP_ATOMIC, "hdmi_vendor_product", 0);
+ if (!prop)
+ return;
+
+ dev_priv->hdmi_vendor_product_property = prop;
+ }
+
+ drm_object_attach_property(&connector->base, prop, 0);
+}
+
void
intel_attach_aspect_ratio_property(struct drm_connector *connector)
{
diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
index 661a37a3c6d8..9e16e098f53a 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.h
+++ b/drivers/gpu/drm/i915/display/intel_connector.h
@@ -27,6 +27,7 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector);
int intel_connector_update_modes(struct drm_connector *connector,
struct edid *edid);
int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
+void intel_attach_hdmi_vendor_product_property(struct drm_connector *connector);
void intel_attach_force_audio_property(struct drm_connector *connector);
void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
void intel_attach_aspect_ratio_property(struct drm_connector *connector);
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 6d8cdaa36748..d29f54163044 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -549,6 +549,11 @@ struct intel_digital_connector_state {
enum hdmi_force_audio force_audio;
int broadcast_rgb;
+ /*
+ * hdmi_infoframe metadata
+ * DRM blob with hdmi vendor and product info
+ */
+ struct drm_property_blob *hdmi_vendor_product_blob;
};
#define to_intel_digital_connector_state(x) container_of(x, struct intel_digital_connector_state, base)
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 28e297296160..6bda096b411d 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -762,6 +762,9 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
{
struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd;
int ret;
+ struct hdmi_vendor_product_info *hdmi_vp_info;
+ struct intel_digital_connector_state *intel_conn_state =
+ to_intel_digital_connector_state(conn_state);
if (!crtc_state->has_infoframe)
return true;
@@ -769,7 +772,15 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder,
crtc_state->infoframes.enable |=
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD);
- ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx");
+ if (!intel_conn_state->hdmi_vendor_product_blob) {
+ ret = hdmi_spd_infoframe_init(frame, "intel", "Integrated gfx");
+ } else {
+ if (intel_conn_state->hdmi_vendor_product_blob->data) {
+ hdmi_vp_info = intel_conn_state->hdmi_vendor_product_blob->data;
+ ret = hdmi_spd_infoframe_init(frame, hdmi_vp_info->vendor,
+ hdmi_vp_info->product);
+ }
+ }
if (drm_WARN_ON(encoder->base.dev, ret))
return false;
@@ -2456,6 +2467,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
intel_attach_force_audio_property(connector);
intel_attach_broadcast_rgb_property(connector);
intel_attach_aspect_ratio_property(connector);
+ intel_attach_hdmi_vendor_product_property(connector);
intel_attach_hdmi_colorspace_property(connector);
drm_connector_attach_content_type_property(connector);
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
index b43a180d007e..5be7179389d1 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.h
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
@@ -23,6 +23,11 @@ struct drm_connector_state;
union hdmi_infoframe;
enum port;
+/*Vendor Id and Product Id for the Hdmi property exported to Userspace*/
+struct hdmi_vendor_product_info {
+ char vendor[30];
+ char product[30];
+};
void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
struct intel_connector *intel_connector);
int intel_hdmi_compute_config(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3cfa6effbb5f..9e3373c0f1eb 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1014,6 +1014,7 @@ struct drm_i915_private {
struct drm_property *broadcast_rgb_property;
struct drm_property *force_audio_property;
+ struct drm_property *hdmi_vendor_product_property;
/* hda/i915 audio component */
struct i915_audio_component *audio_component;
--
2.29.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-05-10 12:23 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-06 0:47 [Intel-gfx] [RFC 0/1] drm/i915/display: Expose HDMI properties to userspace Nischal Varide
2021-05-06 0:47 ` [Intel-gfx] [RFC 1/1] " Nischal Varide
2021-05-06 10:13 ` Jani Nikula
2021-05-07 6:26 ` [igt-dev] [RFC v2 0/1] drm/i915/display: New Property Creation for HDMI Nischal Varide
2021-05-07 6:27 ` [igt-dev] [RFC v2 1/1] " Nischal Varide
2021-05-06 8:26 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: Expose HDMI properties to userspace Patchwork
2021-05-06 8:54 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-05-06 10:33 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-05-07 6:45 ` [Intel-gfx] [RFC 0/1] " Ville Syrjälä
2021-05-10 8:29 ` [igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [RFC,v2,1/1] drm/i915/display: New Property Creation for HDMI Patchwork
2021-05-07 6:40 [igt-dev] [RFC v2 0/1] " Nischal Varide
2021-05-07 6:40 ` [igt-dev] [RFC v2 1/1] " Nischal Varide
2021-05-10 9:31 ` Jani Nikula
2021-05-10 12:22 ` Varide, Nischal
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.