Test tiled display with aid of chamelium.
v4 cover Test tiled display with aid of chamelium.
As of now we have kms_dp_tiled_display test which needs a physical panel. Added changes to have chamelium act as a tiled panel and then execute the test.
Kunal Joshi (4):
Make basic chamelium function accessible to other tests Added structures and functions to generate tiled edids Added a subtest where chamelium acts as a tiled panel
HAX: Run in BAT
lib/igt_chamelium.c | 253 +++++++++++++++++++++++ lib/igt_chamelium.h | 45 +++++ lib/igt_edid.c | 27 +++ lib/igt_edid.h | 20 ++ lib/igt_kms.c | 125 ++++++++++++ lib/igt_kms.h | 3 + tests/intel-ci/fast-feedback.testlist | 1 + tests/kms_chamelium.c | 281 ++++++++------------------ tests/kms_dp_tiled_display.c | 119 ++++++++--- 9 files changed, 648 insertions(+), 226 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v4 1/4 Make basic chamelium function accessible to other tests
There are many use case where we can integrate chamelium with other tests, Migrating some of basic chamelium functions to igt_chamelium lib to avoid Code rewriting.
v2: Moved one more function reset_state from tests/kms_chamelium to lib/igt_chamelium.
v3: - Shifted disabling of modeset to igt_kms
- Replace connection_str with kmstest_connector_status_str (Petri)
- Generalized require__connector_present (Petri)
- Avoided using data_chamelium_t struct (Petri)
v4: - Moved function to library (Petri)
- Renamed some functions and added documentation (Petri)
--- lib/igt_chamelium.c | 186 ++++++++++++++++++++++++++++ lib/igt_chamelium.h | 40 ++++++ lib/igt_kms.c | 23 ++++ lib/igt_kms.h | 1 + tests/kms_chamelium.c | 281 ++++++++++++------------------------------ 5 files changed, 329 insertions(+), 202 deletions(-)
lib/igt_chamelium.c +186 -0
@@ -218,6 +218,137 @@ const char *chamelium_port_get_name(struct chamelium_port *port)return port->name; } +/** +* chamelium_require_connector_present +* @ports: All connected ports +* @type: Required port type +* @port_count: Total port count +* @count: The required number of port count +* +* Check there are required ports connected of given type +*/ +void +chamelium_require_connector_present (struct chamelium_port **ports, +unsigned int type, +int port_count, +int count) +{ +int i; +int found =0 ; + +for (i =0 ; i < port_count; i++) { +if (chamelium_port_get_type (ports[i]) == type) + found++; + } + +igt_require_f (found == count, +"port of type %s found %d and required %d\n" , +kmstest_connector_type_str (type), found, count); +} + +/** +* chamelium_reprobe_connector +* @display: A pointer to an #igt_display_t structure +* @chamelium: The Chamelium instance to use +* @port: Chamelium port to reprobe +* +* Reprobe the given connector and fetch current status +* +* Returns: drmModeConnection +*/ +drmModeConnection +chamelium_reprobe_connector (igt_display_t *display, +struct chamelium *chamelium, +struct chamelium_port *port) +{ +drmModeConnector *connector; +drmModeConnection status; +igt_output_t *output; + +igt_debug ("Reprobing %s...\n" ,chamelium_port_get_name (port)); + connector =chamelium_port_get_connector (chamelium, port, true); +igt_assert (connector); + status = connector->connection; + +/* let's make sure that igt_display is up to date too */ + output =igt_output_from_connector (display, connector); + output->force_reprobe = true; +igt_output_refresh (output); + +drmModeFreeConnector (connector); +return status; +} + +/** +* chamelium_wait_for_conn_status_change +* @display: A pointer to an #igt_display_t structure +* @chamelium: The Chamelium instance to use +* @port: Chamelium port to check connector status update +* @status: Enum which describes connector states +* +* Wait for the connector to change the status +*/ +void +chamelium_wait_for_conn_status_change (igt_display_t *display, +struct chamelium *chamelium, +struct chamelium_port *port, +drmModeConnection status) +{ +igt_debug ("Waiting for %s to get %s...\n" , +chamelium_port_get_name (port), +kmstest_connector_status_str (status)); + +/* +* Rely on simple reprobing so we don't fail tests that don't require +* that hpd events work in the event that hpd doesn't work on the system +*/ +igt_until_timeout (HOTPLUG_TIMEOUT ) { +if (chamelium_reprobe_connector (display, + chamelium, port) == status) +return ; + +usleep (50000 ); + } + +igt_assert_f (false,"Timed out waiting for %s to get %s\n" , +chamelium_port_get_name (port), +kmstest_connector_status_str (status)); +} + +/** +* chamelium_reset_state +* +* @chamelium: The Chamelium instance to use +* @port: Chamelium port to reset +* @ports: All connected ports +* @port_count: Count of connected ports +* +* Reset chamelium ports +*/ +void +chamelium_reset_state (igt_display_t *display, +struct chamelium *chamelium, +struct chamelium_port *port, +struct chamelium_port **ports, +int port_count) +{ +int p; + +chamelium_reset (chamelium); + +if (port) { +chamelium_wait_for_conn_status_change (display, chamelium, + port, +DRM_MODE_DISCONNECTED ); + }else { +for (p =0 ; p < port_count; p++) { + port = ports[p]; +chamelium_wait_for_conn_status_change (display, chamelium, + port,DRM_MODE_DISCONNECTED ); + } + } +} +/** * chamelium_destroy_frame_dump: * @dump: The frame dump to destroy
@@ -627,6 +758,61 @@ void chamelium_schedule_hpd_toggle(struct chamelium *chamelium, "(iii)", port->id, delay_ms, rising_edge)); } +const struct edid *chamelium_get_aspect_ratio_edid (void ) +{ +static unsigned char raw_edid[2 *EDID_BLOCK_SIZE ] = {0 }; +struct edid *edid; +struct edid_ext *edid_ext; +struct edid_cea *edid_cea; +char *cea_data; +struct edid_cea_data_block *block; +size_t cea_data_size =0 , vsdb_size; +const struct cea_vsdb *vsdb; + + edid = (struct edid *) raw_edid; +memcpy (edid,igt_kms_get_base_edid (),sizeof (struct edid )); + edid->extensions_len =1 ; + edid_ext = &edid->extensions[0 ]; + edid_cea = &edid_ext->data.cea; + cea_data = edid_cea->data; + +/* The HDMI VSDB advertises support for InfoFrames */ + block = (struct edid_cea_data_block *) &cea_data[cea_data_size]; + vsdb =cea_vsdb_get_hdmi_default (&vsdb_size); + cea_data_size +=edid_cea_data_block_set_vsdb (block, vsdb, + vsdb_size); + +/* Short Video Descriptor */ + block = (struct edid_cea_data_block *) &cea_data[cea_data_size]; + cea_data_size +=edid_cea_data_block_set_svd (block, edid_ar_svds, +sizeof (edid_ar_svds)); + +assert (cea_data_size <=sizeof (edid_cea->data)); + +edid_ext_set_cea (edid_ext, cea_data_size,0 ,0 ); + +edid_update_checksum (edid); + +return edid; +} + +const struct edid *chamelium_get_edid (enum test_edid edid) +{ +switch (edid) { +case TEST_EDID_BASE : +return igt_kms_get_base_edid (); +case TEST_EDID_ALT : +return igt_kms_get_alt_edid (); +case TEST_EDID_HDMI_AUDIO : +return igt_kms_get_hdmi_audio_edid (); +case TEST_EDID_DP_AUDIO : +return igt_kms_get_dp_audio_edid (); +case TEST_EDID_ASPECT_RATIO : +return chamelium_get_aspect_ratio_edid (); + } +assert (0 );/* unreachable */ +} +static int chamelium_upload_edid (struct chamelium *chamelium,const struct edid *edid) {
lib/igt_chamelium.h +40 -0
@@ -32,6 +32,7 @@#include <xf86drmMode.h> #include "igt_debugfs.h" +#include "igt_kms.h" struct igt_fb ;struct edid ;
@@ -73,6 +74,16 @@ enum chamelium_infoframe_type { CHAMELIUM_INFOFRAME_VENDOR, }; +enum test_edid { +TEST_EDID_BASE , +TEST_EDID_ALT , +TEST_EDID_HDMI_AUDIO , +TEST_EDID_DP_AUDIO , +TEST_EDID_ASPECT_RATIO , +}; +#define TEST_EDID_COUNT 5 + +struct chamelium_infoframe {int version;size_t payload_size;
@@ -81,6 +92,11 @@ struct chamelium_infoframe {struct chamelium_edid ; +/* Set of Video Identification Codes advertised in the EDID */ +static const uint8_t edid_ar_svds[] = { +16 ,/* 1080p @ 60Hz, 16:9 */ +}; +/** * CHAMELIUM_MAX_PORTS: the maximum number of ports supported by igt_chamelium. *
@@ -100,6 +116,8 @@ struct chamelium_edid;*/ #define CHAMELIUM_MAX_AUDIO_CHANNELS 8 +#define HOTPLUG_TIMEOUT 20/* seconds */ +void chamelium_deinit_rpc_only (struct chamelium *chamelium);struct chamelium *chamelium_init_rpc_only (void );struct chamelium *chamelium_init (int drm_fd);
@@ -113,6 +131,26 @@ drmModeConnector *chamelium_port_get_connector(struct chamelium *chamelium,struct chamelium_port *port, bool reprobe);const char *chamelium_port_get_name (struct chamelium_port *port); +void +chamelium_require_connector_present (struct chamelium_port **ports, +unsigned int type, +int port_count, +int count); +drmModeConnection +chamelium_reprobe_connector (igt_display_t *display, +struct chamelium *chamelium, +struct chamelium_port *port); +void +chamelium_wait_for_conn_status_change (igt_display_t *display, +struct chamelium *chamelium, +struct chamelium_port *port, +drmModeConnection status); +void +chamelium_reset_state (igt_display_t *display, +struct chamelium *chamelium, +struct chamelium_port *port, +struct chamelium_port **ports, +int port_count);bool chamelium_wait_reachable (struct chamelium *chamelium,int timeout);void chamelium_assert_reachable (struct chamelium *chamelium,int timeout);
@@ -135,6 +173,8 @@ struct chamelium_edid *chamelium_new_edid(struct chamelium *chamelium, const struct edid *edid);const struct edid *chamelium_edid_get_raw (struct chamelium_edid *edid,struct chamelium_port *port); +const struct edid *chamelium_get_aspect_ratio_edid (void ); +const struct edid *chamelium_get_edid (enum test_edid edid);void chamelium_port_set_edid (struct chamelium *chamelium,struct chamelium_port *port,struct chamelium_edid *edid);
lib/igt_kms.c +23 -0
@@ -2254,6 +2254,29 @@ const drmModeModeInfo *igt_std_1024_mode_get(void)return &std_1024_mode; } +/* +* igt_modeset_disable_all_outputs +* @diplay: igt display structure +* +* Modeset to disable all output +* +* We need to do a modeset disabling all output to get the next +* HPD event on TypeC port +*/ +void igt_modeset_disable_all_outputs (igt_display_t *display) +{ +int i; + +for (i =0 ; i < display->n_outputs; i++) { +igt_output_t *output = &display->outputs[i]; + +igt_output_set_pipe (output,PIPE_NONE ); + } + +igt_display_commit2 (display,COMMIT_ATOMIC ); + +} +static void igt_pipe_fini (igt_pipe_t *pipe) {free (pipe->planes);
lib/igt_kms.h +1 -0
@@ -438,6 +438,7 @@ igt_output_t *igt_output_from_connector(igt_display_t *display, drmModeConnector *connector);void igt_output_refresh (igt_output_t *output);const drmModeModeInfo *igt_std_1024_mode_get (void ); +void igt_modeset_disable_all_outputs (igt_display_t *display);igt_plane_t *igt_pipe_get_plane_type (igt_pipe_t *pipe,int plane_type);int igt_pipe_count_plane_type (igt_pipe_t *pipe,int plane_type);
tests/kms_chamelium.c +79 -202
500 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v4 2/4 Added structures and functions to generate tiled edids
In reply to Kunal JoshiGenerating the tiled edid which can be flashed on chamelium and added some functions to support the same.
v2: No change.
v3: No change.
v4: No change.
--- lib/igt_chamelium.c | 67 +++++++++++++++++++++++++++++ lib/igt_chamelium.h | 5 +++ lib/igt_edid.c | 27 ++++++++++++ lib/igt_edid.h | 20 +++++++++ lib/igt_kms.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ lib/igt_kms.h | 2 + 6 files changed, 223 insertions(+)
lib/igt_chamelium.c +67 -0
@@ -909,6 +909,33 @@ const struct edid *chamelium_edid_get_raw(struct chamelium_edid *edid,return edid->raw[port_index]; } +/** +* chamelium_edid_get_editable_raw: get the raw EDID which can be edited later. +* @edid: the Chamelium EDID +* @port: the Chamelium port +* +* The EDID provided to #chamelium_new_edid may be mutated for identification +* purposes. This function allows to retrieve the exact EDID that will be set +* for a given port. +* +* The returned raw EDID is only valid until the next call to this function. +*/ +struct edid *chamelium_edid_get_editable_raw (struct chamelium_edid *edid, +struct chamelium_port *port) +{ +size_t port_index = port - edid->chamelium->ports; +size_t edid_size; + +if (!edid->raw[port_index]) { + edid_size =edid_get_size (edid->base); + edid->raw[port_index] =malloc (edid_size); +memcpy (edid->raw[port_index], edid->base, edid_size); +chamelium_port_tag_edid (port, edid->raw[port_index]); + } + +return edid->raw[port_index]; +} +/** * chamelium_port_set_edid: * @chamelium: The Chamelium instance to use
@@ -947,6 +974,46 @@ void chamelium_port_set_edid(struct chamelium *chamelium, port->id, edid_id)); } +/** +* chamelium_port_set_tiled_edid: +* @chamelium: The Chamelium instance to use +* @port: The port on the Chamelium to set the EDID on +* @edid: The Chamelium EDID to set or NULL to use the default Chamelium EDID +* +* Sets unique serial for tiled edid. +* Sets a port on the chamelium to use the specified EDID. This does not fire a +* hotplug pulse on it's own, and merely changes what EDID the chamelium port +* will report to us the next time we probe it. Users will need to reprobe the +* connectors themselves if they want to see the EDID reported by the port +* change. +* +* To create an EDID, see #chamelium_new_edid. +*/ +void chamelium_port_set_tiled_edid (struct chamelium *chamelium, +struct chamelium_port *port, +struct chamelium_edid *edid) +{ +int edid_id; +size_t port_index; +struct edid *raw_edid; + +if (edid) { + port_index = port - chamelium->ports; + edid_id = edid->ids[port_index]; +if (edid_id ==0 ) { + raw_edid =chamelium_edid_get_editable_raw (edid, port); + raw_edid->serial[0 ] =0x02 ; +base_edid_update_checksum (raw_edid); + edid_id =chamelium_upload_edid (chamelium, raw_edid); + edid->ids[port_index] = edid_id; + } + }else { + edid_id =0 ; + } +xmlrpc_DECREF (chamelium_rpc (chamelium,NULL ,"ApplyEdid" ,"(ii)" , + port->id, edid_id)); +} +/** * chamelium_port_set_ddc_state: * @chamelium: The Chamelium instance to use
lib/igt_chamelium.h +5 -0
@@ -175,9 +175,14 @@ const struct edid *chamelium_edid_get_raw(struct chamelium_edid *edid, struct chamelium_port *port);const struct edid *chamelium_get_aspect_ratio_edid (void );const struct edid *chamelium_get_edid (enum test_edid edid); +struct edid *chamelium_edid_get_editable_raw (struct chamelium_edid *edid, +struct chamelium_port *port);void chamelium_port_set_edid (struct chamelium *chamelium,struct chamelium_port *port,struct chamelium_edid *edid); +void chamelium_port_set_tiled_edid (struct chamelium *chamelium, +struct chamelium_port *port, +struct chamelium_edid *edid);bool chamelium_port_get_ddc_state (struct chamelium *chamelium,struct chamelium_port *port); void chamelium_port_set_ddc_state(struct chamelium *chamelium,
lib/igt_edid.c +27 -0
@@ -313,9 +313,27 @@ void edid_update_checksum(struct edid *edid) ext->data.cea.checksum =compute_checksum ((uint8_t *) ext,sizeof (struct edid_ext )); + else if (ext->tag == EDID_EXT_DISPLAYID) { + ext->data.tile.extension_checksum = +compute_checksum ((uint8_t *) &ext->data.tile, +sizeof (struct edid_ext )); + ext->data.tile.checksum = +compute_checksum ((uint8_t *) ext, +sizeof (struct edid_ext )); + } } } +/** +* base_edid_update_checksum: compute and update the checksum of the main EDID +* block +*/ +void base_edid_update_checksum (struct edid *edid) +{ + edid->checksum =compute_checksum ((uint8_t *) edid, +sizeof (struct edid )); +} +/** * edid_get_size: return the size of the EDID block in bytes including EDID * extensions, if any.
@@ -458,6 +476,15 @@ size_t edid_cea_data_block_set_speaker_alloc(struct edid_cea_data_block *block,return sizeof (struct edid_cea_data_block ) + size; } +/** +* edid_ext_set_tile initialize an EDID extension block to be identified +* as a tiled display topology block +*/ +void edid_ext_set_displayid (struct edid_ext *ext) +{ + ext->tag =EDID_EXT_DISPLAYID ; +} +/** * edid_ext_set_cea: initialize an EDID extension block to contain a CEA * extension. CEA extensions contain a Data Block Collection (with multiple
lib/igt_edid.h +20 -0
@@ -304,12 +304,30 @@ struct edid_cea {enum edid_ext_tag {EDID_EXT_CEA =0x02 , +EDID_EXT_DISPLAYID =0x70 , +}; + +struct edid_tile { +uint8_t header[7 ]; +uint8_t tile_cap; +uint8_t topo[3 ]; +uint8_t tile_size[4 ]; +uint8_t tile_pixel_bezel[5 ]; +uint8_t topology_id[9 ]; +uint8_t data[96 ]; +uint8_t extension_checksum; +uint8_t checksum; +} __attribute__((packed)); + +enum edid_tile_cap { +SCALE_TO_FIT =0x82 , };struct edid_ext {uint8_t tag;/* enum edid_ext_tag */ union {struct edid_cea cea; +struct edid_tile tile; } data; } __attribute__((packed));
@@ -356,6 +374,7 @@ struct edid {void edid_init (struct edid *edid);void edid_init_with_mode (struct edid *edid,drmModeModeInfo *mode);void edid_update_checksum (struct edid *edid); +void base_edid_update_checksum (struct edid *edid);size_t edid_get_size (const struct edid *edid);void edid_get_mfg (const struct edid *edid,char out[static 3 ]); void detailed_timing_set_mode(struct detailed_timing *dt, drmModeModeInfo *mode,
@@ -383,4 +402,5 @@ 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_set_displayid (struct edid_ext *ext);#endif
lib/igt_kms.c +102 -0
120 lines not on this page · raw message
lib/igt_kms.h +2 -0
@@ -788,6 +788,8 @@ const struct edid *igt_kms_get_hdmi_audio_edid(void);const struct edid *igt_kms_get_dp_audio_edid (void );const struct edid *igt_kms_get_4k_edid (void );const struct edid *igt_kms_get_3d_edid (void ); +const struct edid *igt_kms_get_base_tile_edid (void ); +struct edid **igt_kms_get_tiled_edid (uint8_t htile,uint8_t vtile);struct udev_monitor *igt_watch_uevents (void ); bool igt_hotplug_detected(struct udev_monitor *mon,
Signature · 6 lines
2.25.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v4 3/4 Added a subtest where chamelium acts as a tiled panel
In reply to Kunal JoshiSplit kms_dp_tiled_display into to two subtest.First to execute the basic test with physical tiled panel and second with chamelium.
v2: Revised to just have basic test if chamelium dependencies are not present.
Reset ports after the test executes.Changed subtest name from with-chamelium to basic-test-pattern-with-chamelium
v3: Changes required to adapt to changes done in first patch.
v4: Changes required to adapt to changes done in first patch.
--- tests/kms_dp_tiled_display.c | 119 ++++++++++++++++++++++++++++------- 1 file changed, 95 insertions(+), 24 deletions(-)
tests/kms_dp_tiled_display.c +95 -24
@@ -40,6 +40,7 @@#include "poll.h" #include "drm_mode.h" #include "drm_fourcc.h" +#include "igt_edid.h" IGT_TEST_DESCRIPTION ("Test for Transcoder Port Sync for Display Port Tiled Displays" );
@@ -59,8 +60,22 @@ typedef struct {data_connector_t *conns;enum igt_commit_style commit;struct timeval first_ts; + +#ifdef HAVE_CHAMELIUM +struct chamelium *chamelium; +struct chamelium_port **ports; +int port_count; +struct chamelium_edid *edids[TEST_EDID_COUNT ]; +#endif + } data_t; +void basic_test (data_t *data,drmEventContext *drm_event,struct pollfd *pfd); + +#ifdef HAVE_CHAMELIUM +static void test_with_chamelium (data_t *data); +#endif +static int drm_property_is_tile (drmModePropertyPtr prop) { return (strcmp(prop->name, "TILE") ? 0 : 1) &&
@@ -206,7 +221,6 @@ static void test_cleanup(data_t *data)igt_display_commit2 (data->display, data->commit);memset (conns,0 ,sizeof (data_connector_t) * data->num_h_tiles); } -static void setup_mode (data_t *data) {int count =0 , prev =0 , i =0 ;
@@ -380,21 +394,83 @@ static bool got_all_page_flips(data_t *data)return true; } +#ifdef HAVE_CHAMELIUM +static void test_with_chamelium (data_t *data) +{ +int i, count =0 ; +uint8_t htile =2 , vtile =1 ; +struct edid **edid; + + data->chamelium =chamelium_init (data->drm_fd); +igt_assert (data->chamelium); + data->ports =chamelium_get_ports + (data->chamelium, &data->port_count); +chamelium_require_connector_present (data->ports, + DRM_MODE_CONNECTOR_DisplayPort, + data->port_count,2 ); + edid =igt_kms_get_tiled_edid (htile-1 , vtile-1 ); + +for (i =0 ; i <2 ; i++) + data->edids[i] = +chamelium_new_edid (data->chamelium, edid[i]); + +for (i =0 ; i < data->port_count; i++) { +if (chamelium_port_get_type (data->ports[i]) == + DRM_MODE_CONNECTOR_DisplayPort) { + +chamelium_port_set_tiled_edid (data->chamelium, + data->ports[i], data->edids[i]); +chamelium_plug (data->chamelium, + data->ports[i]); +chamelium_wait_for_conn_status_change (data->display, + data->chamelium, + data->ports[i], +DRM_MODE_CONNECTED ); + count++; + } +if (count ==2 ) +break ; + } +} +#endif + +void basic_test (data_t *data,drmEventContext *drm_event,struct pollfd *pfd) +{ +int ret; + +get_number_of_h_tiles (data); +igt_debug ("Number of Horizontal Tiles: %d\n" , + data->num_h_tiles); +igt_require (data->num_h_tiles >0 ); + data->conns =calloc (data->num_h_tiles, +sizeof (data_connector_t)); +igt_assert (data->conns); + +get_connectors (data); +setup_mode (data); +setup_framebuffer (data); +timerclear (&data->first_ts); +igt_display_commit_atomic (data->display, +DRM_MODE_ATOMIC_NONBLOCK | +DRM_MODE_PAGE_FLIP_EVENT , data); +while (!got_all_page_flips (data)) { + ret =poll (pfd,1 ,1000 ); +igt_assert (ret ==1 ); +drmHandleEvent (data->drm_fd, drm_event); + } +} + igt_main {igt_display_t display;data_t data = {0 };struct pollfd pfd = {0 };drmEventContext drm_event = {0 }; -int ret; - igt_fixture { data.drm_fd =drm_open_driver_master (DRIVER_ANY ); -kmstest_set_vt_graphics_mode ();igt_display_require (&display, data.drm_fd);igt_display_reset (&display); - data.display = &display; pfd.fd = data.drm_fd; pfd.events =POLLIN ;
@@ -402,33 +478,28 @@ igt_main drm_event.page_flip_handler2 = page_flip_handler; data.commit = data.display->is_atomic ?COMMIT_ATOMIC :COMMIT_LEGACY ;igt_require (data.commit ==COMMIT_ATOMIC ); - -get_number_of_h_tiles (&data); -igt_debug ("Number of Horizontal Tiles: %d\n" , data.num_h_tiles); -igt_require (data.num_h_tiles >0 ); - data.conns =calloc (data.num_h_tiles,sizeof (data_connector_t)); }igt_describe ("Make sure the Tiled CRTCs are synchronized and we get " "page flips for all tiled CRTCs in one vblank." ); igt_subtest("basic-test-pattern") { -igt_assert (data.conns); - -get_connectors (&data); -setup_mode (&data); -setup_framebuffer (&data); -timerclear (&data.first_ts); -igt_display_commit_atomic (data.display,DRM_MODE_ATOMIC_NONBLOCK | -DRM_MODE_PAGE_FLIP_EVENT , &data); -while (!got_all_page_flips (&data)) { - ret =poll (&pfd,1 ,1000 ); -igt_assert (ret ==1 ); -drmHandleEvent (data.drm_fd, &drm_event); - } - +basic_test (&data, &drm_event, &pfd);test_cleanup (&data); } +#ifdef HAVE_CHAMELIUM + igt_subtest_f("basic-test-pattern-with-chamelium") { +int i; + +test_with_chamelium (&data); +basic_test (&data, &drm_event, &pfd); +test_cleanup (&data); +for (i =0 ; i < data.port_count; i++) +chamelium_reset_state (data.display, data.chamelium, + data.ports[i], data.ports, + data.port_count); + } +#endif igt_fixture {free (data.conns);close (data.drm_fd);
Signature · 6 lines
2.25.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v4 4/4 HAX: Run in BAT
In reply to Kunal JoshiBAT run to test the patch, not for merge
--- tests/intel-ci/fast-feedback.testlist | 1 + 1 file changed, 1 insertion(+)
tests/intel-ci/fast-feedback.testlist +1 -0
@@ -83,6 +83,7 @@ igt@kms_addfb_basic@unused-modifier igt@kms_addfb_basic@unused-offsets igt@kms_addfb_basic@unused-pitches igt@kms_busy@basic +igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium igt@kms_chamelium@dp-hpd-fast igt@kms_chamelium@dp-edid-read igt@kms_chamelium@dp-crc-fast
Signature · 6 lines
2.25.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.BUILD: failure for Test tiled display with aid of chamelium. (rev4)
In reply to Kunal Joshi== Series Details ==
== Series Details ==
Series: Test tiled display with aid of chamelium. (rev4)
URL : https://patchwork.freedesktop.org/series/71393/
State : failure
== Summary ==
Applying: Make basic chamelium function accessible to other tests Using index info to reconstruct a base tree...
M lib/igt_kms.c
M lib/igt_kms.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_kms.h
CONFLICT (content): Merge conflict in lib/igt_kms.h
Auto-merging lib/igt_kms.c
Patch failed at 0001 Make basic chamelium function accessible to other tests 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev