From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 4/5] lib/edid: Add support for making DisplayID tile blocks
Date: Fri, 13 Mar 2020 18:11:32 +0200 [thread overview]
Message-ID: <20200313161133.2012-4-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20200313161133.2012-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We want to test tiled display support without actually having tiled
displays. To that end we will want to construct fake tile infromation
and append it to the EDID.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
lib/igt_edid.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++
lib/igt_edid.h | 49 +++++++++++++++++++++++++++++++
2 files changed, 128 insertions(+)
diff --git a/lib/igt_edid.c b/lib/igt_edid.c
index 1c85486df11b..d1ca3916443d 100644
--- a/lib/igt_edid.c
+++ b/lib/igt_edid.c
@@ -313,6 +313,10 @@ void edid_update_checksum(struct edid *edid)
ext->data.cea.checksum =
compute_checksum((uint8_t *) ext,
sizeof(struct edid_ext));
+ if (ext->tag == EDID_EXT_DISPID)
+ ext->data.dispid.checksum =
+ compute_checksum((uint8_t *) ext,
+ sizeof(struct edid_dispid));
}
}
@@ -477,3 +481,78 @@ void edid_ext_set_cea(struct edid_ext *ext, size_t data_blocks_size,
cea->dtd_start = 4 + data_blocks_size;
cea->misc = flags | num_native_dtds;
}
+
+void *dispid_block_tiled(void *ptr,
+ int num_htiles, int num_vtiles,
+ int htile, int vtile,
+ int hsize, int vsize,
+ const char *topology_id)
+{
+ struct dispid_block_header *block = ptr;
+ struct dispid_tiled_block *tiled = (void*)(block + 1);
+
+ block->tag = 0x12;
+ block->rev = 0;
+ block->num_bytes = sizeof(*tiled);
+
+ num_htiles--;
+ num_vtiles--;
+ hsize--;
+ vsize--;
+
+ tiled->tile_caps =
+ DISPID_MULTI_TILE_AT_TILE_LOCATION |
+ DISPID_SINGLE_TILE_AT_TILE_LOCATION;
+
+ tiled->topo[0] = (num_htiles & 0xf) << 4 |
+ (num_vtiles & 0xf) << 0;
+
+ tiled->topo[1] = (htile & 0xf) << 4 |
+ (vtile & 0xf) << 0;
+
+ tiled->topo[2] = (num_htiles >> 4) << 6 |
+ (num_vtiles >> 4) << 4 |
+ (htile >> 4) << 2 |
+ (vtile >> 4) << 0;
+
+ tiled->tile_size[0] = hsize;
+ tiled->tile_size[1] = hsize >> 8;
+ tiled->tile_size[2] = vsize;
+ tiled->tile_size[3] = vsize >> 8;
+
+ strncpy((char *)tiled->topology_id, topology_id,
+ sizeof(tiled->topology_id));
+
+ return tiled + 1;
+}
+
+void *edid_ext_dispid(struct edid_ext *ext)
+{
+ struct edid_dispid *dispid = &ext->data.dispid;
+
+ ext->tag = EDID_EXT_DISPID;
+
+ return dispid;
+}
+
+void *dispid_init(void *ptr)
+{
+ struct dispid_header *dispid = ptr;
+
+ dispid->rev = 0x10;
+ dispid->prod_id = 0x3;
+ dispid->ext_count = 0;
+
+ return dispid + 1;
+}
+
+void *dispid_done(struct dispid_header *dispid, void *ptr)
+{
+ int bytes = ptr - (void *)dispid;
+
+ dispid->num_bytes = bytes - sizeof(*dispid);
+
+ *(uint8_t *)ptr = compute_checksum((void*)dispid, bytes + 1);
+
+ return ptr + 1;
+}
diff --git a/lib/igt_edid.h b/lib/igt_edid.h
index 59b47a977fe3..8e74052f54ab 100644
--- a/lib/igt_edid.h
+++ b/lib/igt_edid.h
@@ -302,14 +302,54 @@ struct edid_cea {
uint8_t checksum;
} __attribute__((packed));
+enum dispid_tile_caps {
+ DISPID_SINGLE_PHYSICAL_ENCLOSURE = 1 << 7,
+ DISPID_BEZEL_INFORMATION_PRESENT = 1 << 6,
+ DISPID_MULTI_TILE_UNKNOWN = 0 << 3,
+ DISPID_MULTI_TILE_AT_TILE_LOCATION = 1 << 3,
+ DISPID_SINGLE_TILE_UNKNOWN = 1 << 0,
+ DISPID_SINGLE_TILE_AT_TILE_LOCATION = 1 << 0,
+ DISPID_SINGLE_TILE_SCALED_FULLSCREEN = 2 << 0,
+ DISPID_SINGLE_TILE_CLONED_TO_ALL_TILES = 3 << 0,
+};
+
+struct dispid_header {
+ uint8_t rev;
+ uint8_t num_bytes;
+ uint8_t prod_id;
+ uint8_t ext_count;
+} __attribute__((packed));
+
+struct dispid_block_header {
+ uint8_t tag;
+ uint8_t rev;
+ uint8_t num_bytes;
+} __attribute__((packed));
+
+struct dispid_tiled_block {
+ uint8_t tile_caps;
+ uint8_t topo[3];
+ uint8_t tile_size[4];
+ uint8_t tile_pixel_bezel[5];
+ uint8_t topology_id[9];
+} __attribute__((packed));
+
+struct edid_dispid {
+ struct dispid_header header;
+ char data[122];
+ uint8_t checksum;
+} __attribute__((packed));
+
enum edid_ext_tag {
EDID_EXT_CEA = 0x02,
+ EDID_EXT_DISPID = 0x70,
};
struct edid_ext {
uint8_t tag; /* enum edid_ext_tag */
union {
struct edid_cea cea;
+ struct edid_dispid dispid;
} data;
} __attribute__((packed));
@@ -383,4 +423,13 @@ size_t edid_cea_data_block_set_speaker_alloc(struct edid_cea_data_block *block,
void edid_ext_set_cea(struct edid_ext *ext, size_t data_blocks_size,
uint8_t num_native_dtds, uint8_t flags);
+void *edid_ext_dispid(struct edid_ext *ext);
+void *dispid_init(void *ptr);
+void *dispid_done(struct dispid_header *dispid, void *ptr);
+void *dispid_block_tiled(void *ptr,
+ int num_htiles, int num_vtiles,
+ int htile, int vtile,
+ int hsize, int vsize,
+ const char *topology_id);
+
#endif
--
2.24.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-03-13 16:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 16:11 [igt-dev] [PATCH i-g-t 1/5] tests/kms_tiled_display: Get rid of DP stuff Ville Syrjala
2020-03-13 16:11 ` [igt-dev] [PATCH i-g-t 2/5] tests/kms_tiled_display: Replace the igt_display pointer with a struct Ville Syrjala
2020-03-13 16:11 ` [igt-dev] [PATCH i-g-t 3/5] tests/kms_tiled_display: Limit the difference in the timestamps to one scanline Ville Syrjala
2020-03-13 16:11 ` Ville Syrjala [this message]
2020-03-13 16:11 ` [igt-dev] [PATCH i-g-t 5/5] tests/kms_tiled_display: Override the EDID to fake some tiles Ville Syrjala
2020-03-13 17:11 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/5] tests/kms_tiled_display: Get rid of DP stuff Patchwork
2020-03-13 23:10 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2021-10-19 20:19 [igt-dev] [PATCH i-g-t 0/5] kms: Run tiled display tests on any set of connectors Ville Syrjala
2021-10-19 20:19 ` [igt-dev] [PATCH i-g-t 4/5] lib/edid: Add support for making DisplayID tile blocks Ville Syrjala
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200313161133.2012-4-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox