Re: [Intel-gfx] [i-g-t PATCH v4 1/2] lib/igt_kms: Add support for 4K and audio HDMI EDID injection.

[Abdiel Janulgue]

On 19.04.2017 11:13, Petri Latvala wrote:

> 
> The only Intel-specific part I can spot is that one chunk where you
> check for at-least-hsw. Is that so you can properly report skip
> instead of fail? It would be good to make this all suitable for
> non-Intel hw.
> 

That is meant to report skip on hardware before HSW - those can't
properly handle 4K anyway. I'm not sure how other older non-intel HW
handles 4K though.

> 
> Anyway, series is
> 
> Reviewed-by: Petri Latvala 
> 
> 

Thanks, pushed!

> 
> 
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [i-g-t PATCH v4 1/2] lib/igt_kms: Add support for 4K and audio HDMI EDID injection.

[Petri Latvala]

Some minor nitpicks on the series:

lib/tests/.gitignore:
 You need to add igt_hdmi_inject here. Only
 tests/ has automatic .gitignore generation.

tests/Makefile.sources:
 You added kms_hdmi_inject to TESTS_progs, it should go to
 TESTS_progs_M as it contains subtests. The difference is absolutely
 zero though, both sets get handled in the exact same way, and the
 different listings will go away as soon as I can clean up the build
 system some more, but meanwhile... *shrug*


The only Intel-specific part I can spot is that one chunk where you
check for at-least-hsw. Is that so you can properly report skip
instead of fail? It would be good to make this all suitable for
non-Intel hw.


Anyway, series is

Reviewed-by: Petri Latvala 



___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [i-g-t PATCH v4 1/2] lib/igt_kms: Add support for 4K and audio HDMI EDID injection.

[Abdiel Janulgue]

Based on the initial work by Marius Vlad.

v3: Bring back audio injection
v4: Make a helper for 3d/4k/audio HDMI injection (Petri)

Cc: Petri Latvala 
Signed-off-by: Abdiel Janulgue 
---
 lib/igt_kms.c | 230 +++---
 lib/igt_kms.h |   2 +
 2 files changed, 175 insertions(+), 57 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 5811414..9bfa0e1 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -83,7 +83,7 @@
 static char *forced_connectors[MAX_CONNECTORS + 1];
 static int forced_connectors_device[MAX_CONNECTORS + 1];
 
-static void update_edid_csum(unsigned char *edid)
+static void update_edid_csum(unsigned char *edid, int cea_pos)
 {
int i, sum = 0;
struct tm *tm;
@@ -96,9 +96,9 @@ static void update_edid_csum(unsigned char *edid)
 
/* calculate checksum */
for (i = 0; i < 127; i++) {
-   sum = sum + edid[i];
+   sum = sum + edid[cea_pos + i];
}
-   edid[127] = 256 - sum;
+   edid[cea_pos + 127] = 256 - sum;
 }
 
 #define VFREQ 60
@@ -136,7 +136,7 @@ static void update_edid_csum(unsigned char *edid)
  */
 const unsigned char* igt_kms_get_base_edid(void)
 {
-   update_edid_csum(base_edid);
+   update_edid_csum(base_edid, 0);
 
return base_edid;
 }
@@ -306,7 +306,7 @@ igt_atomic_fill_pipe_props(igt_display_t *display, 
igt_pipe_t *pipe,
  */
 const unsigned char* igt_kms_get_alt_edid(void)
 {
-   update_edid_csum(alt_edid);
+   update_edid_csum(alt_edid, 0);
 
return alt_edid;
 }
@@ -1116,6 +1116,59 @@ kmstest_get_property(int drm_fd, uint32_t object_id, 
uint32_t object_type,
return found;
 }
 
+struct edid_block {
+int pos;
+unsigned char *data;
+};
+
+#define DTD_SUPPORTS_AUDIO 1<<6
+
+static struct edid_block
+init_cea_block(const unsigned char *edid, size_t length,
+  unsigned char *new_edid_ptr[], size_t *new_length,
+  char extra_extensions_length,
+  uint32_t dtd_support)
+{
+   struct edid_block new_edid;
+   int n_extensions;
+   int pos;
+   static const char cea_header_len = 4, video_block_len = 6;
+
+   igt_assert(new_edid_ptr != NULL && new_length != NULL);
+
+   *new_length = length + 128;
+
+   new_edid.data = calloc(*new_length, sizeof(char));
+   igt_assert_f(new_edid.data, "Failed to allocate %zu bytes for edid\n", 
sizeof(new_length));
+   memcpy(new_edid.data, edid, length);
+   *new_edid_ptr = new_edid.data;
+
+   n_extensions = new_edid.data[126];
+   n_extensions++;
+   new_edid.data[126] = n_extensions;
+
+   update_edid_csum(new_edid.data, 0);
+
+   /* add a cea-861 extension block */
+   pos = length;
+   new_edid.data[pos++] = 0x2;
+   new_edid.data[pos++] = 0x3;
+   new_edid.data[pos++] = cea_header_len + video_block_len +
+   extra_extensions_length;
+   new_edid.data[pos++] = dtd_support;
+
+   /* video block (id | length) */
+   new_edid.data[pos++] = 2 << 5 | (video_block_len - 1);
+   new_edid.data[pos++] = 32 | 0x80; /* 1080p @ 24Hz | (native)*/
+   new_edid.data[pos++] = 5; /* 1080i @ 60Hz */
+   new_edid.data[pos++] = 20;/* 1080i @ 50Hz */
+   new_edid.data[pos++] = 4; /* 720p @ 60Hz*/
+   new_edid.data[pos++] = 19;/* 720p @ 50Hz*/
+   new_edid.pos = pos;
+
+   return new_edid;
+}
+
 /**
  * kmstest_edid_add_3d:
  * @edid: an existing valid edid block
@@ -1129,72 +1182,135 @@ kmstest_get_property(int drm_fd, uint32_t object_id, 
uint32_t object_type,
 void kmstest_edid_add_3d(const unsigned char *edid, size_t length,
 unsigned char *new_edid_ptr[], size_t *new_length)
 {
-   unsigned char *new_edid;
-   int n_extensions;
-   char sum = 0;
-   int pos;
-   int i;
-   char cea_header_len = 4, video_block_len = 6, vsdb_block_len = 11;
-
-   igt_assert(new_edid_ptr != NULL && new_length != NULL);
+   char vsdb_block_len = 11;
+   struct edid_block new_edid = init_cea_block(edid, length, new_edid_ptr,
+   new_length, vsdb_block_len,
+   0);
+   int pos = new_edid.pos;
 
-   *new_length = length + 128;
+   /* vsdb block ( id | length ) */
+   new_edid.data[pos++] = 3 << 5 | (vsdb_block_len - 1);
+   /* registration id */
+   new_edid.data[pos++] = 0x3;
+   new_edid.data[pos++] = 0xc;
+   new_edid.data[pos++] = 0x0;
+   /* source physical address */
+   new_edid.data[pos++] = 0x10;
+   new_edid.data[pos++] = 0x00;
+   /* Supports_AI ... etc */
+   new_edid.data[pos++] = 0x00;
+   /* Max TMDS Clock */
+   new_edid.data[pos++] = 0x00;
+   /* Latency present, HDMI Video Present */
+   new_edid.data[pos++] = 0x20;
+   /* HDMI