* [igt-dev] [PATCH i-g-t 1/5] tools: rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
@ 2020-09-04 0:54 ` Abhinav Kumar
2020-09-15 7:33 ` Petri Latvala
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 2/5] lib/igt_kms: move some of the useful dump functions to igt_kms Abhinav Kumar
` (6 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Abhinav Kumar @ 2020-09-04 0:54 UTC (permalink / raw)
To: igt-dev; +Cc: swboyd, khsieh, nganji, seanpaul, tanmay, aravindh
Rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug so that
other modules can use the APIs.
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
---
tools/Makefile.sources | 4 ++--
tools/{intel_dp_compliance.h => igt_dp_compliance.h} | 5 +++--
..._compliance_hotplug.c => igt_dp_compliance_hotplug.c} | 9 +++++----
tools/intel_dp_compliance.c | 7 ++++---
tools/meson.build | 2 +-
5 files changed, 15 insertions(+), 12 deletions(-)
rename tools/{intel_dp_compliance.h => igt_dp_compliance.h} (89%)
rename tools/{intel_dp_compliance_hotplug.c => igt_dp_compliance_hotplug.c} (93%)
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index b7a43d47..c28bef2f 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -63,8 +63,8 @@ intel_l3_parity_SOURCES = \
intel_dp_compliance_SOURCES = \
intel_dp_compliance.c \
- intel_dp_compliance.h \
- intel_dp_compliance_hotplug.c \
+ igt_dp_compliance.h \
+ igt_dp_compliance_hotplug.c \
$(NULL)
amd_hdmi_compliance_SOURCES = \
diff --git a/tools/intel_dp_compliance.h b/tools/igt_dp_compliance.h
similarity index 89%
rename from tools/intel_dp_compliance.h
rename to tools/igt_dp_compliance.h
index 50a9662e..bf2b0701 100644
--- a/tools/intel_dp_compliance.h
+++ b/tools/igt_dp_compliance.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright 2017 Intel Corporation
* Manasi Navare <manasi.d.navare@intel.com>
*
@@ -28,8 +29,8 @@
extern int drm_fd;
-gboolean intel_dp_compliance_setup_hotplug(void);
-void intel_dp_compliance_cleanup_hotplug(void);
+gboolean igt_dp_compliance_setup_hotplug(void);
+void igt_dp_compliance_cleanup_hotplug(void);
/* called by the hotplug code */
int update_display(int mode, bool is_compliance_test);
diff --git a/tools/intel_dp_compliance_hotplug.c b/tools/igt_dp_compliance_hotplug.c
similarity index 93%
rename from tools/intel_dp_compliance_hotplug.c
rename to tools/igt_dp_compliance_hotplug.c
index b57f8a27..d05e45ca 100644
--- a/tools/intel_dp_compliance_hotplug.c
+++ b/tools/igt_dp_compliance_hotplug.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright 2017 Intel Corporation
* Jesse Barnes <jesse.barnes@intel.com>
* Manasi Navare <manasi.d.navare@intel.com>
@@ -29,7 +30,7 @@
#include <sys/stat.h>
-#include "intel_dp_compliance.h"
+#include "igt_dp_compliance.h"
#include <libudev.h>
static struct udev_monitor *uevent_monitor;
static struct udev *udev;
@@ -62,7 +63,7 @@ out:
}
-gboolean intel_dp_compliance_setup_hotplug(void)
+gboolean igt_dp_compliance_setup_hotplug(void)
{
int ret;
@@ -109,11 +110,11 @@ gboolean intel_dp_compliance_setup_hotplug(void)
return TRUE;
out:
- intel_dp_compliance_cleanup_hotplug();
+ igt_dp_compliance_cleanup_hotplug();
return FALSE;
}
-void intel_dp_compliance_cleanup_hotplug(void)
+void igt_dp_compliance_cleanup_hotplug(void)
{
if (udevchannel)
g_io_channel_shutdown(udevchannel, TRUE, NULL);
diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
index f26108b5..5c423897 100644
--- a/tools/intel_dp_compliance.c
+++ b/tools/intel_dp_compliance.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright © 2017 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -125,7 +126,7 @@
#include <fcntl.h>
#include <time.h>
-#include "intel_dp_compliance.h"
+#include "igt_dp_compliance.h"
#include <stdlib.h>
#include <signal.h>
@@ -1067,7 +1068,7 @@ int main(int argc, char **argv)
goto out_close;
}
- if (!intel_dp_compliance_setup_hotplug()) {
+ if (!igt_dp_compliance_setup_hotplug()) {
igt_warn("Failed to initialize hotplug support\n");
goto out_mainloop;
}
@@ -1108,7 +1109,7 @@ int main(int argc, char **argv)
out_stdio:
g_io_channel_shutdown(stdinchannel, TRUE, NULL);
out_hotplug:
- intel_dp_compliance_cleanup_hotplug();
+ igt_dp_compliance_cleanup_hotplug();
out_mainloop:
g_main_loop_unref(mainloop);
out_close:
diff --git a/tools/meson.build b/tools/meson.build
index 34f95e79..05f2a172 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -60,7 +60,7 @@ endforeach
if libudev.found()
intel_dp_compliance_src = [
'intel_dp_compliance.c',
- 'intel_dp_compliance_hotplug.c'
+ 'igt_dp_compliance_hotplug.c'
]
executable('intel_dp_compliance', sources : intel_dp_compliance_src,
dependencies : [tool_deps, libudev],
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [igt-dev] [PATCH i-g-t 1/5] tools: rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 1/5] tools: rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug Abhinav Kumar
@ 2020-09-15 7:33 ` Petri Latvala
0 siblings, 0 replies; 16+ messages in thread
From: Petri Latvala @ 2020-09-15 7:33 UTC (permalink / raw)
To: Abhinav Kumar; +Cc: khsieh, tanmay, swboyd, igt-dev, nganji, seanpaul, aravindh
On Thu, Sep 03, 2020 at 05:54:35PM -0700, Abhinav Kumar wrote:
> Rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug so that
> other modules can use the APIs.
>
> Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> ---
> tools/Makefile.sources | 4 ++--
> tools/{intel_dp_compliance.h => igt_dp_compliance.h} | 5 +++--
> ..._compliance_hotplug.c => igt_dp_compliance_hotplug.c} | 9 +++++----
> tools/intel_dp_compliance.c | 7 ++++---
> tools/meson.build | 2 +-
> 5 files changed, 15 insertions(+), 12 deletions(-)
> rename tools/{intel_dp_compliance.h => igt_dp_compliance.h} (89%)
> rename tools/{intel_dp_compliance_hotplug.c => igt_dp_compliance_hotplug.c} (93%)
>
> diff --git a/tools/Makefile.sources b/tools/Makefile.sources
> index b7a43d47..c28bef2f 100644
> --- a/tools/Makefile.sources
> +++ b/tools/Makefile.sources
> @@ -63,8 +63,8 @@ intel_l3_parity_SOURCES = \
>
> intel_dp_compliance_SOURCES = \
> intel_dp_compliance.c \
> - intel_dp_compliance.h \
> - intel_dp_compliance_hotplug.c \
> + igt_dp_compliance.h \
> + igt_dp_compliance_hotplug.c \
> $(NULL)
>
> amd_hdmi_compliance_SOURCES = \
> diff --git a/tools/intel_dp_compliance.h b/tools/igt_dp_compliance.h
> similarity index 89%
> rename from tools/intel_dp_compliance.h
> rename to tools/igt_dp_compliance.h
> index 50a9662e..bf2b0701 100644
> --- a/tools/intel_dp_compliance.h
> +++ b/tools/igt_dp_compliance.h
> @@ -1,4 +1,5 @@
> /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> * Copyright 2017 Intel Corporation
> * Manasi Navare <manasi.d.navare@intel.com>
> *
> @@ -28,8 +29,8 @@
>
> extern int drm_fd;
>
> -gboolean intel_dp_compliance_setup_hotplug(void);
> -void intel_dp_compliance_cleanup_hotplug(void);
> +gboolean igt_dp_compliance_setup_hotplug(void);
> +void igt_dp_compliance_cleanup_hotplug(void);
>
> /* called by the hotplug code */
> int update_display(int mode, bool is_compliance_test);
> diff --git a/tools/intel_dp_compliance_hotplug.c b/tools/igt_dp_compliance_hotplug.c
> similarity index 93%
> rename from tools/intel_dp_compliance_hotplug.c
> rename to tools/igt_dp_compliance_hotplug.c
> index b57f8a27..d05e45ca 100644
> --- a/tools/intel_dp_compliance_hotplug.c
> +++ b/tools/igt_dp_compliance_hotplug.c
> @@ -1,4 +1,5 @@
> /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> * Copyright 2017 Intel Corporation
> * Jesse Barnes <jesse.barnes@intel.com>
> * Manasi Navare <manasi.d.navare@intel.com>
> @@ -29,7 +30,7 @@
>
> #include <sys/stat.h>
>
> -#include "intel_dp_compliance.h"
> +#include "igt_dp_compliance.h"
> #include <libudev.h>
> static struct udev_monitor *uevent_monitor;
> static struct udev *udev;
> @@ -62,7 +63,7 @@ out:
> }
>
>
> -gboolean intel_dp_compliance_setup_hotplug(void)
> +gboolean igt_dp_compliance_setup_hotplug(void)
> {
> int ret;
>
> @@ -109,11 +110,11 @@ gboolean intel_dp_compliance_setup_hotplug(void)
> return TRUE;
>
> out:
> - intel_dp_compliance_cleanup_hotplug();
> + igt_dp_compliance_cleanup_hotplug();
> return FALSE;
> }
>
> -void intel_dp_compliance_cleanup_hotplug(void)
> +void igt_dp_compliance_cleanup_hotplug(void)
> {
> if (udevchannel)
> g_io_channel_shutdown(udevchannel, TRUE, NULL);
> diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
> index f26108b5..5c423897 100644
> --- a/tools/intel_dp_compliance.c
> +++ b/tools/intel_dp_compliance.c
> @@ -1,4 +1,5 @@
> /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> * Copyright © 2017 Intel Corporation
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> @@ -125,7 +126,7 @@
> #include <fcntl.h>
> #include <time.h>
>
> -#include "intel_dp_compliance.h"
> +#include "igt_dp_compliance.h"
>
> #include <stdlib.h>
> #include <signal.h>
> @@ -1067,7 +1068,7 @@ int main(int argc, char **argv)
> goto out_close;
> }
>
> - if (!intel_dp_compliance_setup_hotplug()) {
> + if (!igt_dp_compliance_setup_hotplug()) {
> igt_warn("Failed to initialize hotplug support\n");
> goto out_mainloop;
> }
> @@ -1108,7 +1109,7 @@ int main(int argc, char **argv)
> out_stdio:
> g_io_channel_shutdown(stdinchannel, TRUE, NULL);
> out_hotplug:
> - intel_dp_compliance_cleanup_hotplug();
> + igt_dp_compliance_cleanup_hotplug();
> out_mainloop:
> g_main_loop_unref(mainloop);
> out_close:
> diff --git a/tools/meson.build b/tools/meson.build
> index 34f95e79..05f2a172 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -60,7 +60,7 @@ endforeach
> if libudev.found()
> intel_dp_compliance_src = [
> 'intel_dp_compliance.c',
> - 'intel_dp_compliance_hotplug.c'
> + 'igt_dp_compliance_hotplug.c'
> ]
> executable('intel_dp_compliance', sources : intel_dp_compliance_src,
> dependencies : [tool_deps, libudev],
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* [igt-dev] [PATCH i-g-t 2/5] lib/igt_kms: move some of the useful dump functions to igt_kms
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 1/5] tools: rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug Abhinav Kumar
@ 2020-09-04 0:54 ` Abhinav Kumar
2020-09-15 7:35 ` Petri Latvala
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 3/5] lib/igt_fb: move the CTS fill framebuffer to igt_fb lib Abhinav Kumar
` (5 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Abhinav Kumar @ 2020-09-04 0:54 UTC (permalink / raw)
To: igt-dev; +Cc: swboyd, khsieh, nganji, seanpaul, tanmay, aravindh
Some of the functions inside the intel_dp_compliance are
generic and can be used by other modules as well. Move these
to the igt_kms lib.
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
---
lib/igt_kms.c | 92 +++++++++++++++++++++++++++++++++++++
lib/igt_kms.h | 5 ++
tools/intel_dp_compliance.c | 92 +------------------------------------
3 files changed, 99 insertions(+), 90 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index f57972f1..1399d0bf 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright © 2013 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -4726,3 +4727,94 @@ uint32_t igt_reduce_format(uint32_t format)
return format;
}
}
+
+void igt_dump_connectors_fd(int drmfd)
+{
+ int i, j;
+
+ drmModeRes *mode_resources = drmModeGetResources(drmfd);
+
+ if (!mode_resources) {
+ igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
+ return;
+ }
+
+ igt_info("Connectors:\n");
+ igt_info("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\n");
+ for (i = 0; i < mode_resources->count_connectors; i++) {
+ drmModeConnector *connector;
+
+ connector = drmModeGetConnectorCurrent(drmfd,
+ mode_resources->connectors[i]);
+ if (!connector) {
+ igt_warn("Could not get connector %i: %s\n",
+ mode_resources->connectors[i],
+ strerror(errno));
+ continue;
+ }
+
+ igt_info("%d\t%d\t%s\t%s\t%dx%d\t\t%d\n",
+ connector->connector_id,
+ connector->encoder_id,
+ kmstest_connector_status_str(connector->connection),
+ kmstest_connector_type_str(connector->connector_type),
+ connector->mmWidth,
+ connector->mmHeight,
+ connector->count_modes);
+
+ if (!connector->count_modes)
+ continue;
+
+ igt_info(" Modes:\n");
+ igt_info(" name refresh (Hz) hdisp hss hse htot vdisp ""vss vse vtot flags type clock\n");
+ for (j = 0; j < connector->count_modes; j++) {
+ igt_info("[%d]", j);
+ kmstest_dump_mode(&connector->modes[j]);
+ }
+
+ drmModeFreeConnector(connector);
+ }
+ igt_info("\n");
+
+ drmModeFreeResources(mode_resources);
+}
+
+void igt_dump_crtcs_fd(int drmfd)
+{
+ int i;
+ drmModeRes *mode_resources;
+
+ mode_resources = drmModeGetResources(drmfd);
+ if (!mode_resources) {
+ igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
+ return;
+ }
+
+ igt_info("CRTCs:\n");
+ igt_info("id\tfb\tpos\tsize\n");
+ for (i = 0; i < mode_resources->count_crtcs; i++) {
+ drmModeCrtc *crtc;
+
+ crtc = drmModeGetCrtc(drmfd, mode_resources->crtcs[i]);
+ if (!crtc) {
+ igt_warn("Could not get crtc %i: %s\n",
+ mode_resources->crtcs[i],
+ strerror(errno));
+ continue;
+ }
+ igt_info("%d\t%d\t(%d,%d)\t(%dx%d)\n",
+ crtc->crtc_id,
+ crtc->buffer_id,
+ crtc->x,
+ crtc->y,
+ crtc->width,
+ crtc->height);
+
+ kmstest_dump_mode(&crtc->mode);
+
+ drmModeFreeCrtc(crtc);
+ }
+ igt_info("\n");
+
+ drmModeFreeResources(mode_resources);
+}
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 26dc9f5f..0468314f 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright © 2013 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -868,6 +869,7 @@ int igt_connector_sysfs_open(int drm_fd,
drmModeConnector *connector);
uint32_t igt_reduce_format(uint32_t format);
+
/*
* igt_require_pipe:
* @display: pointer to igt_display_t
@@ -881,4 +883,7 @@ uint32_t igt_reduce_format(uint32_t format);
void igt_require_pipe(igt_display_t *display,
enum pipe pipe);
+void igt_dump_connectors_fd(int drmfd);
+void igt_dump_crtcs_fd(int drmfd);
+
#endif /* __IGT_KMS_H__ */
diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
index 5c423897..fc512711 100644
--- a/tools/intel_dp_compliance.c
+++ b/tools/intel_dp_compliance.c
@@ -347,98 +347,10 @@ static int process_test_request(int test_type)
return -1;
}
-static void dump_connectors_fd(int drmfd)
-{
- int i, j;
-
- drmModeRes *mode_resources = drmModeGetResources(drmfd);
-
- if (!mode_resources) {
- igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
- return;
- }
-
- igt_info("Connectors:\n");
- igt_info("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\n");
- for (i = 0; i < mode_resources->count_connectors; i++) {
- drmModeConnector *connector;
-
- connector = drmModeGetConnectorCurrent(drmfd,
- mode_resources->connectors[i]);
- if (!connector) {
- igt_warn("Could not get connector %i: %s\n",
- mode_resources->connectors[i], strerror(errno));
- continue;
- }
-
- igt_info("%d\t%d\t%s\t%s\t%dx%d\t\t%d\n",
- connector->connector_id,
- connector->encoder_id,
- kmstest_connector_status_str(connector->connection),
- kmstest_connector_type_str(connector->connector_type),
- connector->mmWidth,
- connector->mmHeight,
- connector->count_modes);
-
- if (!connector->count_modes)
- continue;
-
- igt_info(" Modes:\n");
- igt_info(" name refresh (Hz) hdisp hss hse htot vdisp ""vss vse vtot flags type clock\n");
- for (j = 0; j < connector->count_modes; j++) {
- igt_info("[%d]", j);
- kmstest_dump_mode(&connector->modes[j]);
- }
-
- drmModeFreeConnector(connector);
- }
- igt_info("\n");
-
- drmModeFreeResources(mode_resources);
-}
-
-static void dump_crtcs_fd(int drmfd)
-{
- int i;
- drmModeRes *mode_resources;
-
- mode_resources = drmModeGetResources(drmfd);
- if (!mode_resources) {
- igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
- return;
- }
-
- igt_info("CRTCs:\n");
- igt_info("id\tfb\tpos\tsize\n");
- for (i = 0; i < mode_resources->count_crtcs; i++) {
- drmModeCrtc *crtc;
-
- crtc = drmModeGetCrtc(drmfd, mode_resources->crtcs[i]);
- if (!crtc) {
- igt_warn("Could not get crtc %i: %s\n", mode_resources->crtcs[i], strerror(errno));
- continue;
- }
- igt_info("%d\t%d\t(%d,%d)\t(%dx%d)\n",
- crtc->crtc_id,
- crtc->buffer_id,
- crtc->x,
- crtc->y,
- crtc->width,
- crtc->height);
-
- kmstest_dump_mode(&crtc->mode);
-
- drmModeFreeCrtc(crtc);
- }
- igt_info("\n");
-
- drmModeFreeResources(mode_resources);
-}
-
static void dump_info(void)
{
- dump_connectors_fd(drm_fd);
- dump_crtcs_fd(drm_fd);
+ igt_dump_connectors_fd(drm_fd);
+ igt_dump_crtcs_fd(drm_fd);
}
static int setup_framebuffers(struct connector *dp_conn)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [igt-dev] [PATCH i-g-t 2/5] lib/igt_kms: move some of the useful dump functions to igt_kms
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 2/5] lib/igt_kms: move some of the useful dump functions to igt_kms Abhinav Kumar
@ 2020-09-15 7:35 ` Petri Latvala
2020-09-15 16:30 ` abhinavk
0 siblings, 1 reply; 16+ messages in thread
From: Petri Latvala @ 2020-09-15 7:35 UTC (permalink / raw)
To: Abhinav Kumar; +Cc: khsieh, tanmay, swboyd, igt-dev, nganji, seanpaul, aravindh
On Thu, Sep 03, 2020 at 05:54:36PM -0700, Abhinav Kumar wrote:
> Some of the functions inside the intel_dp_compliance are
> generic and can be used by other modules as well. Move these
> to the igt_kms lib.
Please add documentation to the functions now that they go to lib.
--
Petri Latvala
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/5] lib/igt_kms: move some of the useful dump functions to igt_kms
2020-09-15 7:35 ` Petri Latvala
@ 2020-09-15 16:30 ` abhinavk
0 siblings, 0 replies; 16+ messages in thread
From: abhinavk @ 2020-09-15 16:30 UTC (permalink / raw)
To: Petri Latvala; +Cc: khsieh, tanmay, swboyd, igt-dev, nganji, seanpaul, aravindh
Hi,
On 2020-09-15 00:35, Petri Latvala wrote:
> On Thu, Sep 03, 2020 at 05:54:36PM -0700, Abhinav Kumar wrote:
>> Some of the functions inside the intel_dp_compliance are
>> generic and can be used by other modules as well. Move these
>> to the igt_kms lib.
>
> Please add documentation to the functions now that they go to lib.
Thanks so much for the review. Will add the documentation to the
functions.
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* [igt-dev] [PATCH i-g-t 3/5] lib/igt_fb: move the CTS fill framebuffer to igt_fb lib
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 1/5] tools: rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug Abhinav Kumar
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 2/5] lib/igt_kms: move some of the useful dump functions to igt_kms Abhinav Kumar
@ 2020-09-04 0:54 ` Abhinav Kumar
2020-09-15 7:37 ` Petri Latvala
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 4/5] tools: move terminal utility functions to a separate file Abhinav Kumar
` (4 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Abhinav Kumar @ 2020-09-04 0:54 UTC (permalink / raw)
To: igt-dev; +Cc: swboyd, khsieh, nganji, seanpaul, tanmay, aravindh
The function to fill the framebuffer with the CTS pattern
is generic. Move it to the igt_fb layer so that it can be used by
other modules.
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
---
lib/igt_fb.c | 65 ++++++++++++++++++++++++++++++++++
lib/igt_fb.h | 3 ++
tools/intel_dp_compliance.c | 70 ++++++-------------------------------
3 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 3864b7a1..d6f0b9ed 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright © 2013,2014 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -1280,6 +1281,70 @@ void igt_paint_color(cairo_t *cr, int x, int y, int w, int h,
cairo_fill(cr);
}
+/**
+ * igt_fill_cts_framebuffer:
+ * @pixmap: handle to the mapped buffer
+ * @video_width: required width for the CTS pattern
+ * @video_height: required height for the CTS pattern
+ * @bitdepth: required bitdepth for the CTS pattern
+ * @alpha: required alpha for the CTS pattern
+ * This functions draws the CTS test pattern for a given width, height.
+ */
+int igt_fill_cts_framebuffer(uint32_t *pixmap, uint32_t video_width,
+ uint32_t video_height, uint32_t bitdepth, int alpha)
+{
+ uint32_t tile_height, tile_width;
+ uint32_t *red_ptr, *green_ptr, *blue_ptr;
+ uint32_t *white_ptr, *src_ptr, *dst_ptr;
+ int x, y;
+ int32_t pixel_val;
+
+ tile_height = 64;
+ tile_width = 1 << bitdepth;
+
+ red_ptr = pixmap;
+ green_ptr = red_ptr + (video_width * tile_height);
+ blue_ptr = green_ptr + (video_width * tile_height);
+ white_ptr = blue_ptr + (video_width * tile_height);
+ x = 0;
+
+ /* Fill the frame buffer with video pattern from CTS 3.1.5 */
+ while (x < video_width) {
+ for (pixel_val = 0; pixel_val < 256;
+ pixel_val = pixel_val + (256 / tile_width)) {
+ red_ptr[x] = alpha << 24 | pixel_val << 16;
+ green_ptr[x] = alpha << 24 | pixel_val << 8;
+ blue_ptr[x] = alpha << 24 | pixel_val << 0;
+ white_ptr[x] = alpha << 24 | red_ptr[x] | green_ptr[x] |
+ blue_ptr[x];
+ if (++x >= video_width)
+ break;
+ }
+ }
+ for (y = 0; y < video_height; y++) {
+ if (y == 0 || y == 64 || y == 128 || y == 192)
+ continue;
+ switch ((y / tile_height) % 4) {
+ case 0:
+ src_ptr = red_ptr;
+ break;
+ case 1:
+ src_ptr = green_ptr;
+ break;
+ case 2:
+ src_ptr = blue_ptr;
+ break;
+ case 3:
+ src_ptr = white_ptr;
+ break;
+ }
+ dst_ptr = pixmap + (y * video_width);
+ memcpy(dst_ptr, src_ptr, (video_width * 4));
+ }
+
+ return 0;
+}
+
/**
* igt_paint_color_alpha:
* @cr: cairo drawing context
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index 5ec906b7..a1f94503 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright © 2013,2014 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -206,6 +207,8 @@ bool igt_format_is_fp16(uint32_t drm_format);
int igt_format_plane_bpp(uint32_t drm_format, int plane);
void igt_format_array_fill(uint32_t **formats_array, unsigned int *count,
bool allow_yuv);
+int igt_fill_cts_framebuffer(uint32_t *pixmap, uint32_t video_width,
+ uint32_t video_height, uint32_t bitdepth, int alpha);
#endif /* __IGT_FB_H__ */
diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
index fc512711..c8c5c841 100644
--- a/tools/intel_dp_compliance.c
+++ b/tools/intel_dp_compliance.c
@@ -448,70 +448,12 @@ static int setup_video_pattern_framebuffer(struct connector *dp_conn)
}
-static int fill_framebuffer(struct connector *dp_conn)
-{
- uint32_t tile_height, tile_width, video_width, video_height;
- uint32_t *red_ptr, *green_ptr, *blue_ptr, *white_ptr, *src_ptr, *dst_ptr;
- int x, y;
- int32_t pixel_val;
- uint8_t alpha;
-
- video_width = dp_conn->test_pattern.hdisplay;
- video_height = dp_conn->test_pattern.vdisplay;
-
- tile_height = 64;
- tile_width = 1 << (dp_conn->test_pattern.bitdepth);
-
- red_ptr = dp_conn->test_pattern.pixmap;
- green_ptr = red_ptr + (video_width * tile_height);
- blue_ptr = green_ptr + (video_width * tile_height);
- white_ptr = blue_ptr + (video_width * tile_height);
- x = 0;
-
- /* Fill the frame buffer with video pattern from CTS 3.1.5 */
- while (x < video_width) {
- for (pixel_val = 0; pixel_val < 256;
- pixel_val = pixel_val + (256 / tile_width)) {
- alpha = gen == 10 ? 0xff : 0;
- red_ptr[x] = alpha << 24 | pixel_val << 16;
- green_ptr[x] = alpha << 24 | pixel_val << 8;
- blue_ptr[x] = alpha << 24 | pixel_val << 0;
- white_ptr[x] = alpha << 24 | red_ptr[x] | green_ptr[x] |
- blue_ptr[x];
- if (++x >= video_width)
- break;
- }
- }
- for (y = 0; y < video_height; y++) {
- if (y == 0 || y == 64 || y == 128 || y == 192)
- continue;
- switch ((y / tile_height) % 4) {
- case 0:
- src_ptr = red_ptr;
- break;
- case 1:
- src_ptr = green_ptr;
- break;
- case 2:
- src_ptr = blue_ptr;
- break;
- case 3:
- src_ptr = white_ptr;
- break;
- }
- dst_ptr = dp_conn->test_pattern.pixmap + (y * video_width);
- memcpy(dst_ptr, src_ptr, (video_width * 4));
- }
- munmap(dp_conn->test_pattern.pixmap,
- dp_conn->test_pattern.size);
- return 0;
-}
-
static int set_test_mode(struct connector *dp_conn)
{
int ret = 0;
int i;
bool found_std = false, found_fs = false;
+ uint32_t alpha;
drmModeConnector *c = dp_conn->connector;
/* Ignore any disconnected devices */
@@ -584,6 +526,7 @@ static int set_test_mode(struct connector *dp_conn)
dp_conn->test_pattern.hdisplay = hdisplay;
dp_conn->test_pattern.vdisplay = vdisplay;
dp_conn->test_pattern.bitdepth = bitdepth;
+ alpha = gen == 10 ? 0xff : 0;
ret = setup_video_pattern_framebuffer(dp_conn);
if (ret) {
@@ -592,12 +535,19 @@ static int set_test_mode(struct connector *dp_conn)
return ret;
}
- ret = fill_framebuffer(dp_conn);
+ ret = igt_fill_cts_framebuffer(dp_conn->test_pattern.pixmap,
+ dp_conn->test_pattern.hdisplay,
+ dp_conn->test_pattern.vdisplay,
+ dp_conn->test_pattern.bitdepth,
+ alpha);
if (ret) {
igt_warn("Filling framebuffer for connector %u failed (%d)\n",
c->connector_id, ret);
return ret;
}
+ /* unmapping the buffer previously mapped during setup */
+ munmap(dp_conn->test_pattern.pixmap,
+ dp_conn->test_pattern.size);
}
return ret;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [igt-dev] [PATCH i-g-t 3/5] lib/igt_fb: move the CTS fill framebuffer to igt_fb lib
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 3/5] lib/igt_fb: move the CTS fill framebuffer to igt_fb lib Abhinav Kumar
@ 2020-09-15 7:37 ` Petri Latvala
0 siblings, 0 replies; 16+ messages in thread
From: Petri Latvala @ 2020-09-15 7:37 UTC (permalink / raw)
To: Abhinav Kumar; +Cc: khsieh, tanmay, swboyd, igt-dev, nganji, seanpaul, aravindh
On Thu, Sep 03, 2020 at 05:54:37PM -0700, Abhinav Kumar wrote:
> The function to fill the framebuffer with the CTS pattern
> is generic. Move it to the igt_fb layer so that it can be used by
> other modules.
>
> Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> ---
> lib/igt_fb.c | 65 ++++++++++++++++++++++++++++++++++
> lib/igt_fb.h | 3 ++
> tools/intel_dp_compliance.c | 70 ++++++-------------------------------
> 3 files changed, 78 insertions(+), 60 deletions(-)
>
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index 3864b7a1..d6f0b9ed 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -1,4 +1,5 @@
> /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> * Copyright © 2013,2014 Intel Corporation
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> @@ -1280,6 +1281,70 @@ void igt_paint_color(cairo_t *cr, int x, int y, int w, int h,
> cairo_fill(cr);
> }
>
> +/**
> + * igt_fill_cts_framebuffer:
> + * @pixmap: handle to the mapped buffer
> + * @video_width: required width for the CTS pattern
> + * @video_height: required height for the CTS pattern
> + * @bitdepth: required bitdepth for the CTS pattern
> + * @alpha: required alpha for the CTS pattern
> + * This functions draws the CTS test pattern for a given width, height.
> + */
> +int igt_fill_cts_framebuffer(uint32_t *pixmap, uint32_t video_width,
> + uint32_t video_height, uint32_t bitdepth, int alpha)
> +{
> + uint32_t tile_height, tile_width;
> + uint32_t *red_ptr, *green_ptr, *blue_ptr;
> + uint32_t *white_ptr, *src_ptr, *dst_ptr;
> + int x, y;
> + int32_t pixel_val;
> +
> + tile_height = 64;
> + tile_width = 1 << bitdepth;
> +
> + red_ptr = pixmap;
> + green_ptr = red_ptr + (video_width * tile_height);
> + blue_ptr = green_ptr + (video_width * tile_height);
> + white_ptr = blue_ptr + (video_width * tile_height);
> + x = 0;
> +
> + /* Fill the frame buffer with video pattern from CTS 3.1.5 */
> + while (x < video_width) {
> + for (pixel_val = 0; pixel_val < 256;
> + pixel_val = pixel_val + (256 / tile_width)) {
> + red_ptr[x] = alpha << 24 | pixel_val << 16;
> + green_ptr[x] = alpha << 24 | pixel_val << 8;
> + blue_ptr[x] = alpha << 24 | pixel_val << 0;
> + white_ptr[x] = alpha << 24 | red_ptr[x] | green_ptr[x] |
> + blue_ptr[x];
> + if (++x >= video_width)
> + break;
> + }
> + }
> + for (y = 0; y < video_height; y++) {
> + if (y == 0 || y == 64 || y == 128 || y == 192)
> + continue;
> + switch ((y / tile_height) % 4) {
> + case 0:
> + src_ptr = red_ptr;
> + break;
> + case 1:
> + src_ptr = green_ptr;
> + break;
> + case 2:
> + src_ptr = blue_ptr;
> + break;
> + case 3:
> + src_ptr = white_ptr;
> + break;
> + }
> + dst_ptr = pixmap + (y * video_width);
> + memcpy(dst_ptr, src_ptr, (video_width * 4));
> + }
> +
> + return 0;
> +}
> +
> /**
> * igt_paint_color_alpha:
> * @cr: cairo drawing context
> diff --git a/lib/igt_fb.h b/lib/igt_fb.h
> index 5ec906b7..a1f94503 100644
> --- a/lib/igt_fb.h
> +++ b/lib/igt_fb.h
> @@ -1,4 +1,5 @@
> /*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> * Copyright © 2013,2014 Intel Corporation
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> @@ -206,6 +207,8 @@ bool igt_format_is_fp16(uint32_t drm_format);
> int igt_format_plane_bpp(uint32_t drm_format, int plane);
> void igt_format_array_fill(uint32_t **formats_array, unsigned int *count,
> bool allow_yuv);
> +int igt_fill_cts_framebuffer(uint32_t *pixmap, uint32_t video_width,
> + uint32_t video_height, uint32_t bitdepth, int alpha);
>
> #endif /* __IGT_FB_H__ */
>
> diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
> index fc512711..c8c5c841 100644
> --- a/tools/intel_dp_compliance.c
> +++ b/tools/intel_dp_compliance.c
> @@ -448,70 +448,12 @@ static int setup_video_pattern_framebuffer(struct connector *dp_conn)
>
> }
>
> -static int fill_framebuffer(struct connector *dp_conn)
> -{
> - uint32_t tile_height, tile_width, video_width, video_height;
> - uint32_t *red_ptr, *green_ptr, *blue_ptr, *white_ptr, *src_ptr, *dst_ptr;
> - int x, y;
> - int32_t pixel_val;
> - uint8_t alpha;
> -
> - video_width = dp_conn->test_pattern.hdisplay;
> - video_height = dp_conn->test_pattern.vdisplay;
> -
> - tile_height = 64;
> - tile_width = 1 << (dp_conn->test_pattern.bitdepth);
> -
> - red_ptr = dp_conn->test_pattern.pixmap;
> - green_ptr = red_ptr + (video_width * tile_height);
> - blue_ptr = green_ptr + (video_width * tile_height);
> - white_ptr = blue_ptr + (video_width * tile_height);
> - x = 0;
> -
> - /* Fill the frame buffer with video pattern from CTS 3.1.5 */
> - while (x < video_width) {
> - for (pixel_val = 0; pixel_val < 256;
> - pixel_val = pixel_val + (256 / tile_width)) {
> - alpha = gen == 10 ? 0xff : 0;
> - red_ptr[x] = alpha << 24 | pixel_val << 16;
> - green_ptr[x] = alpha << 24 | pixel_val << 8;
> - blue_ptr[x] = alpha << 24 | pixel_val << 0;
> - white_ptr[x] = alpha << 24 | red_ptr[x] | green_ptr[x] |
> - blue_ptr[x];
> - if (++x >= video_width)
> - break;
> - }
> - }
> - for (y = 0; y < video_height; y++) {
> - if (y == 0 || y == 64 || y == 128 || y == 192)
> - continue;
> - switch ((y / tile_height) % 4) {
> - case 0:
> - src_ptr = red_ptr;
> - break;
> - case 1:
> - src_ptr = green_ptr;
> - break;
> - case 2:
> - src_ptr = blue_ptr;
> - break;
> - case 3:
> - src_ptr = white_ptr;
> - break;
> - }
> - dst_ptr = dp_conn->test_pattern.pixmap + (y * video_width);
> - memcpy(dst_ptr, src_ptr, (video_width * 4));
> - }
> - munmap(dp_conn->test_pattern.pixmap,
> - dp_conn->test_pattern.size);
> - return 0;
> -}
> -
> static int set_test_mode(struct connector *dp_conn)
> {
> int ret = 0;
> int i;
> bool found_std = false, found_fs = false;
> + uint32_t alpha;
> drmModeConnector *c = dp_conn->connector;
>
> /* Ignore any disconnected devices */
> @@ -584,6 +526,7 @@ static int set_test_mode(struct connector *dp_conn)
> dp_conn->test_pattern.hdisplay = hdisplay;
> dp_conn->test_pattern.vdisplay = vdisplay;
> dp_conn->test_pattern.bitdepth = bitdepth;
> + alpha = gen == 10 ? 0xff : 0;
>
> ret = setup_video_pattern_framebuffer(dp_conn);
> if (ret) {
> @@ -592,12 +535,19 @@ static int set_test_mode(struct connector *dp_conn)
> return ret;
> }
>
> - ret = fill_framebuffer(dp_conn);
> + ret = igt_fill_cts_framebuffer(dp_conn->test_pattern.pixmap,
> + dp_conn->test_pattern.hdisplay,
> + dp_conn->test_pattern.vdisplay,
> + dp_conn->test_pattern.bitdepth,
> + alpha);
> if (ret) {
> igt_warn("Filling framebuffer for connector %u failed (%d)\n",
> c->connector_id, ret);
> return ret;
> }
> + /* unmapping the buffer previously mapped during setup */
> + munmap(dp_conn->test_pattern.pixmap,
> + dp_conn->test_pattern.size);
> }
>
> return ret;
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* [igt-dev] [PATCH i-g-t 4/5] tools: move terminal utility functions to a separate file
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
` (2 preceding siblings ...)
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 3/5] lib/igt_fb: move the CTS fill framebuffer to igt_fb lib Abhinav Kumar
@ 2020-09-04 0:54 ` Abhinav Kumar
2020-09-15 7:39 ` Petri Latvala
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 5/5] tools: add support for msm_dp_compliance to IGT Abhinav Kumar
` (3 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Abhinav Kumar @ 2020-09-04 0:54 UTC (permalink / raw)
To: igt-dev; +Cc: swboyd, khsieh, nganji, seanpaul, tanmay, aravindh
Move the terminal utility functions to a separate file so
that other modules can use it as well.
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
---
tools/Makefile.sources | 1 +
tools/igt_compliance_utils.c | 82 ++++++++++++++++++++++++++++++++++++
tools/igt_dp_compliance.h | 8 ++++
tools/intel_dp_compliance.c | 47 ---------------------
tools/meson.build | 3 +-
5 files changed, 93 insertions(+), 48 deletions(-)
create mode 100644 tools/igt_compliance_utils.c
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index c28bef2f..47171490 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -65,6 +65,7 @@ intel_dp_compliance_SOURCES = \
intel_dp_compliance.c \
igt_dp_compliance.h \
igt_dp_compliance_hotplug.c \
+ igt_compliance_utils.c \
$(NULL)
amd_hdmi_compliance_SOURCES = \
diff --git a/tools/igt_compliance_utils.c b/tools/igt_compliance_utils.c
new file mode 100644
index 00000000..d6a2e4e5
--- /dev/null
+++ b/tools/igt_compliance_utils.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright 2017 Intel Corporation
+ * Jesse Barnes <jesse.barnes@intel.com>
+ * Manasi Navare <manasi.d.navare@intel.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "igt.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <termios.h>
+
+#include <sys/stat.h>
+
+#include "igt_dp_compliance.h"
+
+static int tio_fd;
+struct termios saved_tio;
+
+void enter_exec_path(char **argv)
+{
+ char *exec_path = NULL;
+ char *pos = NULL;
+ short len_path = 0;
+ int ret;
+
+ len_path = strlen(argv[0]);
+ exec_path = (char *) malloc(len_path);
+
+ memcpy(exec_path, argv[0], len_path);
+ pos = strrchr(exec_path, '/');
+ if (pos != NULL)
+ *(pos+1) = '\0';
+
+ ret = chdir(exec_path);
+ igt_assert_eq(ret, 0);
+ free(exec_path);
+}
+
+static void restore_termio_mode(int sig)
+{
+ tcsetattr(tio_fd, TCSANOW, &saved_tio);
+ close(tio_fd);
+}
+
+void set_termio_mode(void)
+{
+ struct termios tio;
+
+ /* don't attempt to set terminal attributes if not in the foreground
+ * process group
+ */
+ if (getpgrp() != tcgetpgrp(STDOUT_FILENO))
+ return;
+
+ tio_fd = dup(STDIN_FILENO);
+ tcgetattr(tio_fd, &saved_tio);
+ igt_install_exit_handler(restore_termio_mode);
+ tio = saved_tio;
+ tio.c_lflag &= ~(ICANON | ECHO);
+ tcsetattr(tio_fd, TCSANOW, &tio);
+}
diff --git a/tools/igt_dp_compliance.h b/tools/igt_dp_compliance.h
index bf2b0701..5b168803 100644
--- a/tools/igt_dp_compliance.h
+++ b/tools/igt_dp_compliance.h
@@ -22,6 +22,9 @@
* IN THE SOFTWARE.
*/
+#ifndef __IGT_DP_COMPLIANCE_H__
+#define __IGT_DP_COMPLIANCE_H__
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -32,5 +35,10 @@ extern int drm_fd;
gboolean igt_dp_compliance_setup_hotplug(void);
void igt_dp_compliance_cleanup_hotplug(void);
+void enter_exec_path(char **argv);
+void set_termio_mode(void);
+
/* called by the hotplug code */
int update_display(int mode, bool is_compliance_test);
+
+#endif /* __IGT_DP_COMPLIANCE_H__ */
diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
index c8c5c841..217a1247 100644
--- a/tools/intel_dp_compliance.c
+++ b/tools/intel_dp_compliance.c
@@ -172,9 +172,6 @@ uint16_t hdisplay;
uint16_t vdisplay;
uint8_t bitdepth;
-static int tio_fd;
-struct termios saved_tio;
-
drmModeRes *resources;
int drm_fd, modes, gen;
uint64_t tiling = LOCAL_DRM_FORMAT_MOD_NONE;
@@ -825,50 +822,6 @@ static gboolean input_event(GIOChannel *source, GIOCondition condition,
return TRUE;
}
-static void enter_exec_path(char **argv)
-{
- char *exec_path = NULL;
- char *pos = NULL;
- short len_path = 0;
- int ret;
-
- len_path = strlen(argv[0]);
- exec_path = (char *) malloc(len_path);
-
- memcpy(exec_path, argv[0], len_path);
- pos = strrchr(exec_path, '/');
- if (pos != NULL)
- *(pos+1) = '\0';
-
- ret = chdir(exec_path);
- igt_assert_eq(ret, 0);
- free(exec_path);
-}
-
-static void restore_termio_mode(int sig)
-{
- tcsetattr(tio_fd, TCSANOW, &saved_tio);
- close(tio_fd);
-}
-
-static void set_termio_mode(void)
-{
- struct termios tio;
-
- /* don't attempt to set terminal attributes if not in the foreground
- * process group
- */
- if (getpgrp() != tcgetpgrp(STDOUT_FILENO))
- return;
-
- tio_fd = dup(STDIN_FILENO);
- tcgetattr(tio_fd, &saved_tio);
- igt_install_exit_handler(restore_termio_mode);
- tio = saved_tio;
- tio.c_lflag &= ~(ICANON | ECHO);
- tcsetattr(tio_fd, TCSANOW, &tio);
-}
-
int main(int argc, char **argv)
{
int c;
diff --git a/tools/meson.build b/tools/meson.build
index 05f2a172..56877fb3 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -60,7 +60,8 @@ endforeach
if libudev.found()
intel_dp_compliance_src = [
'intel_dp_compliance.c',
- 'igt_dp_compliance_hotplug.c'
+ 'igt_dp_compliance_hotplug.c',
+ 'igt_compliance_utils.c'
]
executable('intel_dp_compliance', sources : intel_dp_compliance_src,
dependencies : [tool_deps, libudev],
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [igt-dev] [PATCH i-g-t 4/5] tools: move terminal utility functions to a separate file
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 4/5] tools: move terminal utility functions to a separate file Abhinav Kumar
@ 2020-09-15 7:39 ` Petri Latvala
0 siblings, 0 replies; 16+ messages in thread
From: Petri Latvala @ 2020-09-15 7:39 UTC (permalink / raw)
To: Abhinav Kumar; +Cc: khsieh, tanmay, swboyd, igt-dev, nganji, seanpaul, aravindh
On Thu, Sep 03, 2020 at 05:54:38PM -0700, Abhinav Kumar wrote:
> Move the terminal utility functions to a separate file so
> that other modules can use it as well.
>
> Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> ---
> tools/Makefile.sources | 1 +
> tools/igt_compliance_utils.c | 82 ++++++++++++++++++++++++++++++++++++
> tools/igt_dp_compliance.h | 8 ++++
> tools/intel_dp_compliance.c | 47 ---------------------
> tools/meson.build | 3 +-
> 5 files changed, 93 insertions(+), 48 deletions(-)
> create mode 100644 tools/igt_compliance_utils.c
>
> diff --git a/tools/Makefile.sources b/tools/Makefile.sources
> index c28bef2f..47171490 100644
> --- a/tools/Makefile.sources
> +++ b/tools/Makefile.sources
> @@ -65,6 +65,7 @@ intel_dp_compliance_SOURCES = \
> intel_dp_compliance.c \
> igt_dp_compliance.h \
> igt_dp_compliance_hotplug.c \
> + igt_compliance_utils.c \
> $(NULL)
>
> amd_hdmi_compliance_SOURCES = \
> diff --git a/tools/igt_compliance_utils.c b/tools/igt_compliance_utils.c
> new file mode 100644
> index 00000000..d6a2e4e5
> --- /dev/null
> +++ b/tools/igt_compliance_utils.c
> @@ -0,0 +1,82 @@
> +/*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> + * Copyright 2017 Intel Corporation
> + * Jesse Barnes <jesse.barnes@intel.com>
> + * Manasi Navare <manasi.d.navare@intel.com>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +#include "igt.h"
> +#include <stdio.h>
> +#include <string.h>
> +#include <stdlib.h>
> +#include <signal.h>
> +#include <termios.h>
> +
> +#include <sys/stat.h>
> +
> +#include "igt_dp_compliance.h"
> +
> +static int tio_fd;
> +struct termios saved_tio;
> +
> +void enter_exec_path(char **argv)
> +{
> + char *exec_path = NULL;
> + char *pos = NULL;
> + short len_path = 0;
> + int ret;
> +
> + len_path = strlen(argv[0]);
> + exec_path = (char *) malloc(len_path);
> +
> + memcpy(exec_path, argv[0], len_path);
> + pos = strrchr(exec_path, '/');
> + if (pos != NULL)
> + *(pos+1) = '\0';
> +
> + ret = chdir(exec_path);
> + igt_assert_eq(ret, 0);
> + free(exec_path);
> +}
> +
> +static void restore_termio_mode(int sig)
> +{
> + tcsetattr(tio_fd, TCSANOW, &saved_tio);
> + close(tio_fd);
> +}
> +
> +void set_termio_mode(void)
> +{
> + struct termios tio;
> +
> + /* don't attempt to set terminal attributes if not in the foreground
> + * process group
> + */
> + if (getpgrp() != tcgetpgrp(STDOUT_FILENO))
> + return;
> +
> + tio_fd = dup(STDIN_FILENO);
> + tcgetattr(tio_fd, &saved_tio);
> + igt_install_exit_handler(restore_termio_mode);
> + tio = saved_tio;
> + tio.c_lflag &= ~(ICANON | ECHO);
> + tcsetattr(tio_fd, TCSANOW, &tio);
> +}
> diff --git a/tools/igt_dp_compliance.h b/tools/igt_dp_compliance.h
> index bf2b0701..5b168803 100644
> --- a/tools/igt_dp_compliance.h
> +++ b/tools/igt_dp_compliance.h
> @@ -22,6 +22,9 @@
> * IN THE SOFTWARE.
> */
>
> +#ifndef __IGT_DP_COMPLIANCE_H__
> +#define __IGT_DP_COMPLIANCE_H__
> +
> #include <stdio.h>
> #include <string.h>
> #include <stdlib.h>
> @@ -32,5 +35,10 @@ extern int drm_fd;
> gboolean igt_dp_compliance_setup_hotplug(void);
> void igt_dp_compliance_cleanup_hotplug(void);
>
> +void enter_exec_path(char **argv);
> +void set_termio_mode(void);
> +
> /* called by the hotplug code */
> int update_display(int mode, bool is_compliance_test);
> +
> +#endif /* __IGT_DP_COMPLIANCE_H__ */
> diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
> index c8c5c841..217a1247 100644
> --- a/tools/intel_dp_compliance.c
> +++ b/tools/intel_dp_compliance.c
> @@ -172,9 +172,6 @@ uint16_t hdisplay;
> uint16_t vdisplay;
> uint8_t bitdepth;
>
> -static int tio_fd;
> -struct termios saved_tio;
> -
> drmModeRes *resources;
> int drm_fd, modes, gen;
> uint64_t tiling = LOCAL_DRM_FORMAT_MOD_NONE;
> @@ -825,50 +822,6 @@ static gboolean input_event(GIOChannel *source, GIOCondition condition,
> return TRUE;
> }
>
> -static void enter_exec_path(char **argv)
> -{
> - char *exec_path = NULL;
> - char *pos = NULL;
> - short len_path = 0;
> - int ret;
> -
> - len_path = strlen(argv[0]);
> - exec_path = (char *) malloc(len_path);
> -
> - memcpy(exec_path, argv[0], len_path);
> - pos = strrchr(exec_path, '/');
> - if (pos != NULL)
> - *(pos+1) = '\0';
> -
> - ret = chdir(exec_path);
> - igt_assert_eq(ret, 0);
> - free(exec_path);
> -}
> -
> -static void restore_termio_mode(int sig)
> -{
> - tcsetattr(tio_fd, TCSANOW, &saved_tio);
> - close(tio_fd);
> -}
> -
> -static void set_termio_mode(void)
> -{
> - struct termios tio;
> -
> - /* don't attempt to set terminal attributes if not in the foreground
> - * process group
> - */
> - if (getpgrp() != tcgetpgrp(STDOUT_FILENO))
> - return;
> -
> - tio_fd = dup(STDIN_FILENO);
> - tcgetattr(tio_fd, &saved_tio);
> - igt_install_exit_handler(restore_termio_mode);
> - tio = saved_tio;
> - tio.c_lflag &= ~(ICANON | ECHO);
> - tcsetattr(tio_fd, TCSANOW, &tio);
> -}
> -
> int main(int argc, char **argv)
> {
> int c;
> diff --git a/tools/meson.build b/tools/meson.build
> index 05f2a172..56877fb3 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -60,7 +60,8 @@ endforeach
> if libudev.found()
> intel_dp_compliance_src = [
> 'intel_dp_compliance.c',
> - 'igt_dp_compliance_hotplug.c'
> + 'igt_dp_compliance_hotplug.c',
> + 'igt_compliance_utils.c'
> ]
> executable('intel_dp_compliance', sources : intel_dp_compliance_src,
> dependencies : [tool_deps, libudev],
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* [igt-dev] [PATCH i-g-t 5/5] tools: add support for msm_dp_compliance to IGT
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
` (3 preceding siblings ...)
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 4/5] tools: move terminal utility functions to a separate file Abhinav Kumar
@ 2020-09-04 0:54 ` Abhinav Kumar
2020-09-15 7:46 ` Petri Latvala
2020-09-04 1:20 ` [igt-dev] ✓ Fi.CI.BAT: success for Add support for video pattern DP CTS for MSM chipsets Patchwork
` (2 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Abhinav Kumar @ 2020-09-04 0:54 UTC (permalink / raw)
To: igt-dev; +Cc: swboyd, khsieh, nganji, seanpaul, tanmay, aravindh
Add support for msm_dp_compliance to igt tools to validate
video pattern DP compliance tests on MSM chipsets.
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
---
tools/Makefile.am | 4 +
tools/Makefile.sources | 6 +
tools/meson.build | 12 +
tools/msm_dp_compliance.c | 812 ++++++++++++++++++++++++++++++++++++++
4 files changed, 834 insertions(+)
create mode 100644 tools/msm_dp_compliance.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f97f9e08..eac52be8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -14,6 +14,10 @@ intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
bin_PROGRAMS += amd_hdmi_compliance
amd_hdmi_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
+bin_PROGRAMS += msm_dp_compliance
+msm_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
+msm_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
+
SUBDIRS = i915-perf null_state_gen registers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi -I$(top_srcdir)/lib \
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 47171490..c93bfe7d 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -72,3 +72,9 @@ amd_hdmi_compliance_SOURCES = \
amd_hdmi_compliance.c \
$(NULL)
+msm_dp_compliance_SOURCES = \
+ msm_dp_compliance.c \
+ igt_dp_compliance.h \
+ igt_dp_compliance_hotplug.c \
+ igt_compliance_utils.c \
+ $(NULL)
diff --git a/tools/meson.build b/tools/meson.build
index 56877fb3..65f78938 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -101,5 +101,17 @@ executable('amd_hdmi_compliance', 'amd_hdmi_compliance.c',
install_rpath : bindir_rpathdir,
install : true)
+if libudev.found()
+ msm_dp_compliance_src = [
+ 'msm_dp_compliance.c',
+ 'igt_dp_compliance_hotplug.c',
+ 'igt_compliance_utils.c'
+ ]
+ executable('msm_dp_compliance', sources : msm_dp_compliance_src,
+ dependencies : [tool_deps, libudev],
+ install_rpath : bindir_rpathdir,
+ install : true)
+endif
+
subdir('i915-perf')
subdir('null_state_gen')
diff --git a/tools/msm_dp_compliance.c b/tools/msm_dp_compliance.c
new file mode 100644
index 00000000..7bc2bfa8
--- /dev/null
+++ b/tools/msm_dp_compliance.c
@@ -0,0 +1,812 @@
+/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright © 2017 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Displayport Compliance Testing Application
+ *
+ * This is the userspace component of the Displayport Compliance testing
+ * software required for compliance testing of the MSM Display Port driver.
+ * This must be running in order to successfully complete Display Port
+ * compliance testing. This app and the kernel code that accompanies it has been
+ * written to satify the requirements of the Displayport Link CTS 1.2 rev1.1
+ * specification from VESA. Note that this application does not support eDP
+ * compliance testing.
+ *
+ * Compliance Testing requires several components:
+ * - A kernel build that contains the patch set for DP compliance support
+ * - A Displayport Compliance Testing appliance such as Qdbox 980
+ * - This user application
+ * - A windows host machine to run the Qdbox 980 test software
+ * - Root access on the DUT due to the use of sysfs utility
+ *
+ * Test Setup:
+ * It is strongly recommended that the windows host, test appliance and DUT
+ * be freshly restarted before any testing begins to ensure that any previous
+ * configurations and settings will not interfere with test process. Refer to
+ * the test appliance documentation for setup, software installation and
+ * operation specific to that device.
+ *
+ * The Linux DUT must be in text (console) mode and cannot have any other
+ * display manager running. You must be logged in as root to run this user app.
+ * Once the user application is up and running, waiting for test requests, the
+ * software on the windows host can now be used to execute the compliance tests.
+ *
+ * This userspace application supports following tests from the DP CTS Spec
+ * Rev 1.1:
+ * - Video Pattern generation tests: This supports only the 24 and
+ * 18bpp color
+ * ramp test pattern (4.3.3.1).
+ *
+ * Connections (required):
+ * - Test Appliance connected to the external Displayport connector on the DUT
+ * - Test Appliance Monitor Out connected to Displayport connector on the
+ * monitor
+ * - Test appliance connected to the Windows Host via USB
+ *
+ * Debugfs Files:
+ * The file root for all the debugfs file:
+ * /sys/kernel/debug/dri/0/
+ *
+ * The specific files are as follows:
+ *
+ * msm_dp_test_active
+ * A simple flag that indicates whether or not compliance testing is currently
+ * active in the kernel. This flag is polled by userspace and once set, invokes
+ * the test handler in the user app. This flag is set by the test handler in the
+ * kernel after reading the registers requested by the test appliance.
+ *
+ * msm_dp_test_data
+ * Test data is used by the kernel to pass parameters to the user app. Eg: In
+ * case of EDID tests, the data that is delivered to the userspace is the video
+ * mode to be set for the test.
+ * In case of video pattern test, the data that is delivered to the userspace is
+ * the width and height of the test pattern and the bits per color value.
+ *
+ * msm_dp_test_type
+ * The test type variable instructs the user app as to what the requested test
+ * was from the sink device. These values defined at the top of the
+ * application's main implementation file must be kept in sync with the
+ * values defined in the kernel's drm_dp_helper.h file.
+ * This app is based on some prior work submitted in April 2015 by Todd Previte
+ * (<tprevite@gmail.com>).
+ *
+ * This work is based upon the intel_dp_compliance.c authored by
+ * Manasi Navare <manasi.d.navare@intel.com>
+ *
+ *
+ * This tool can be run as:
+ * ./msm_dp_compliance It will wait till you start compliance suite from
+ * Qdbox 980.
+ * ./msm_dp_compliance -h This will open the help
+ * ./msm_dp_compliance -i This will provide information about current
+ * connectors/CRTCs. This can be used for debugging purpose.
+ *
+ * Authors:
+ * Abhinav Kumar <abhinavk@codeaurora.org>
+ *
+ * Elements of the modeset code adapted from David Herrmann's
+ * DRM modeset example
+ *
+ */
+#include "igt.h"
+#include <errno.h>
+#include <getopt.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <strings.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/poll.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/select.h>
+#include <assert.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <time.h>
+
+#include "igt_dp_compliance.h"
+
+#include <stdlib.h>
+#include <signal.h>
+
+/* User Input definitions */
+#define HELP_DESCRIPTION 1
+
+/* Debugfs file definitions */
+#define MSM_DP_TEST_TYPE_FILE "msm_dp_test_type"
+#define MSM_DP_TEST_ACTIVE_FILE "msm_dp_test_active"
+#define MSM_DP_TEST_DATA_FILE "msm_dp_test_data"
+
+/* DRM definitions - must be kept in sync with the DRM header */
+#define DP_TEST_LINK_VIDEO_PATTERN (1 << 1)
+
+/* Global file pointers for the sysfs files */
+FILE *test_active_fp, *test_data_fp, *test_type_fp;
+
+bool video_pattern_flag;
+
+/* Video pattern test globals */
+uint16_t hdisplay;
+uint16_t vdisplay;
+uint8_t bitdepth;
+
+drmModeRes *resources;
+int drm_fd, modes, gen;
+uint64_t tiling = LOCAL_DRM_FORMAT_MOD_NONE;
+uint32_t depth = 24, stride, bpp;
+int specified_mode_num = -1, specified_disp_id = -1;
+int width, height;
+uint32_t test_crtc;
+uint32_t active_crtc;
+uint32_t test_connector_id;
+enum {
+ MSM_MODE_INVALID = -1,
+ MSM_MODE_NONE = 0,
+ MSM_MODE_VIDEO_PATTERN_TEST
+} msm_display_mode;
+
+struct test_video_pattern {
+ uint16_t hdisplay;
+ uint16_t vdisplay;
+ uint8_t bitdepth;
+ uint32_t fb;
+ uint32_t size;
+ struct igt_fb fb_pattern;
+ drmModeModeInfo mode;
+ uint32_t *pixmap;
+};
+
+struct connector {
+ uint32_t id;
+ int mode_valid;
+ drmModeModeInfo mode, mode_failsafe;
+ drmModeConnector *connector;
+ int crtc;
+ /* Standard and preferred frame buffer*/
+ uint8_t *pixmap;
+
+ struct test_video_pattern test_pattern;
+};
+
+static void clear_test_active(void)
+{
+ rewind(test_active_fp);
+ fprintf(test_active_fp, "%d", 0);
+ fflush(test_active_fp);
+}
+
+static FILE *fopenat(int dir, const char *name, const char *mode)
+{
+ int fd = openat(dir, name, O_RDWR);
+
+ return fdopen(fd, mode);
+}
+
+static void setup_debugfs_files(void)
+{
+ int dir = igt_debugfs_dir(drm_fd);
+
+ test_type_fp = fopenat(dir, MSM_DP_TEST_TYPE_FILE, "r");
+ igt_require(test_type_fp);
+
+ test_data_fp = fopenat(dir, MSM_DP_TEST_DATA_FILE, "r");
+ igt_require(test_data_fp);
+ test_active_fp = fopenat(dir, MSM_DP_TEST_ACTIVE_FILE, "w+");
+
+ igt_require(test_active_fp);
+
+ close(dir);
+
+ /* Reset the active flag for safety */
+ clear_test_active();
+}
+
+static unsigned long get_test_type(void)
+{
+ unsigned long test_type;
+ int ret;
+
+ if (!test_type_fp)
+ fprintf(stderr, "Invalid test_type file\n");
+ rewind(test_type_fp);
+ ret = fscanf(test_type_fp, "%lx", &test_type);
+ if (ret < 1 || test_type <= 0) {
+ igt_warn("test_type read failed - %lx\n", test_type);
+ return 0;
+ }
+
+ return test_type;
+}
+
+static void get_test_videopattern_data(void)
+{
+ int count = 0;
+ uint16_t video_pattern_value[3];
+ char video_pattern_attribute[15];
+ int ret;
+
+ if (!test_data_fp)
+ fprintf(stderr, "Invalid test_data file\n");
+
+ rewind(test_data_fp);
+ while (!feof(test_data_fp) && count < 3) {
+ ret = fscanf(test_data_fp, "%s %u\n", video_pattern_attribute,
+ (unsigned int *)&video_pattern_value[count++]);
+ if (ret < 2) {
+ igt_warn("test_data read failed\n");
+ return;
+ }
+ }
+
+ hdisplay = video_pattern_value[0];
+ vdisplay = video_pattern_value[1];
+ bitdepth = video_pattern_value[2];
+ igt_info("Hdisplay = %d\n", hdisplay);
+ igt_info("Vdisplay = %d\n", vdisplay);
+ igt_info("BitDepth = %u\n", bitdepth);
+
+}
+
+static int process_test_request(int test_type)
+{
+ int mode;
+ bool valid = false;
+
+ switch (test_type) {
+ case DP_TEST_LINK_VIDEO_PATTERN:
+ video_pattern_flag = true;
+ get_test_videopattern_data();
+ mode = MSM_MODE_VIDEO_PATTERN_TEST;
+ valid = true;
+ break;
+ default:
+ /* Unknown test type */
+ fprintf(stderr, "Invalid test request, ignored.\n");
+ break;
+ }
+
+ if (valid)
+ return update_display(mode, true);
+
+ return -1;
+}
+
+static void dump_info(void)
+{
+ igt_dump_connectors_fd(drm_fd);
+ igt_dump_crtcs_fd(drm_fd);
+}
+
+static int setup_video_pattern_framebuffer(struct connector *dp_conn)
+{
+ uint32_t video_width, video_height;
+
+ video_width = dp_conn->test_pattern.hdisplay;
+ video_height = dp_conn->test_pattern.vdisplay;
+
+ dp_conn->test_pattern.fb = igt_create_fb(drm_fd,
+ video_width, video_height,
+ DRM_FORMAT_XRGB8888,
+ LOCAL_DRM_FORMAT_MOD_NONE,
+ &dp_conn->test_pattern.fb_pattern);
+ igt_assert(dp_conn->test_pattern.fb);
+
+
+ dp_conn->test_pattern.pixmap = kmstest_dumb_map_buffer(drm_fd,
+ dp_conn->test_pattern.fb_pattern.gem_handle,
+ dp_conn->test_pattern.fb_pattern.size,
+ PROT_READ | PROT_WRITE);
+
+ if (dp_conn->test_pattern.pixmap == NULL)
+ return -1;
+
+ dp_conn->test_pattern.size = dp_conn->test_pattern.fb_pattern.size;
+ memset(dp_conn->test_pattern.pixmap, 0, dp_conn->test_pattern.size);
+ return 0;
+
+}
+
+static int set_test_mode(struct connector *dp_conn)
+{
+ int ret = 0;
+ int i;
+ drmModeConnector *c = dp_conn->connector;
+
+ /* Ignore any disconnected devices */
+ if (c->connection != DRM_MODE_CONNECTED) {
+ igt_warn("Connector %u disconnected\n", c->connector_id);
+ return -ENOENT;
+ }
+ igt_info("Connector setup:\n");
+
+ /*
+ * to-do: for cases where driver doesn't support 4K but
+ * its the preferred mode of the sink, use 640x480 as
+ * default resolution
+ */
+
+ for (i = 0; i < c->count_modes; i++) {
+ if (c->modes[i].hdisplay == 640 &&
+ c->modes[i].vdisplay == 480 &&
+ c->modes[i].vrefresh == 60) {
+ igt_info("found idx of failsafe mode = %d\n", i);
+ break;
+ }
+ }
+
+ if (i == c->count_modes) {
+ igt_info("didn't find failsafe using default\n");
+ i = 0;
+ }
+
+ dp_conn->test_pattern.mode = c->modes[i];
+ dp_conn->test_pattern.mode.hdisplay = c->modes[i].hdisplay;
+ dp_conn->test_pattern.mode.vdisplay = c->modes[i].vdisplay;
+
+ igt_info("failsafe (mode %d) for connector %u is %ux%u\n", i,
+ dp_conn->id, c->modes[i].hdisplay, c->modes[i].vdisplay);
+ fflush(stdin);
+
+ if (video_pattern_flag) {
+ dp_conn->test_pattern.hdisplay = hdisplay;
+ dp_conn->test_pattern.vdisplay = vdisplay;
+ dp_conn->test_pattern.bitdepth = bitdepth;
+
+ ret = setup_video_pattern_framebuffer(dp_conn);
+ if (ret) {
+ igt_warn("Creating framebuffer for connector %u failed (%d)\n",
+ c->connector_id, ret);
+ return ret;
+ }
+
+ ret = igt_fill_cts_framebuffer(dp_conn->test_pattern.pixmap,
+ dp_conn->test_pattern.hdisplay,
+ dp_conn->test_pattern.vdisplay,
+ dp_conn->test_pattern.bitdepth,
+ 0);
+ if (ret) {
+ igt_warn("Filling framebuffer for connector %u failed (%d)\n",
+ c->connector_id, ret);
+ return ret;
+ }
+ /* unmapping the buffer previously mapped during setup */
+ munmap(dp_conn->test_pattern.pixmap,
+ dp_conn->test_pattern.size);
+ }
+
+ return ret;
+}
+
+static int set_video(int mode, struct connector *test_connector)
+{
+ drmModeModeInfo *requested_mode;
+ uint32_t required_fb_id;
+ struct igt_fb required_fb;
+ int ret = 0;
+
+ switch (mode) {
+ case MSM_MODE_NONE:
+ igt_info("NONE\n");
+ ret = drmModeSetCrtc(drm_fd, test_connector->crtc,
+ -1, 0, 0, NULL, 0, NULL);
+ goto out;
+ case MSM_MODE_VIDEO_PATTERN_TEST:
+ igt_info("VIDEO PATTERN TEST\n");
+ requested_mode = &test_connector->test_pattern.mode;
+ required_fb_id = test_connector->test_pattern.fb;
+ required_fb = test_connector->test_pattern.fb_pattern;
+ break;
+ case MSM_MODE_INVALID:
+ default:
+ igt_warn("INVALID! (%08x) Mode set aborted!\n", mode);
+ return -1;
+ }
+
+ igt_info("CRTC(%u):", test_connector->crtc);
+ kmstest_dump_mode(requested_mode);
+ ret = drmModeSetCrtc(drm_fd, test_connector->crtc, required_fb_id, 0, 0,
+ &test_connector->id, 1, requested_mode);
+ if (ret) {
+ igt_warn("Failed to set mode (%dx%d@%dHz): %s\n",
+ requested_mode->hdisplay, requested_mode->vdisplay,
+ requested_mode->vrefresh, strerror(errno));
+ igt_remove_fb(drm_fd, &required_fb);
+
+ }
+ /* Keep the pattern for 1 sec for Qdbox 980 to detect it */
+ sleep(1);
+
+out:
+ if (ret) {
+ igt_warn("Failed to set CRTC for connector %u\n",
+ test_connector->id);
+ }
+
+ return ret;
+}
+
+static int
+set_default_mode(struct connector *c, bool set_mode)
+{
+ unsigned int fb_id = 0;
+ struct igt_fb fb_info;
+ int ret = 0;
+ int i;
+ drmModeConnector *conn = c->connector;
+
+ if (!set_mode) {
+ igt_info("not resetting the mode\n");
+ ret = drmModeSetCrtc(drm_fd, c->crtc, 0, 0, 0,
+ NULL, 0, NULL);
+ if (ret)
+ igt_warn("Failed to unset mode");
+ return ret;
+ }
+
+ for (i = 0; i < conn->count_modes; i++) {
+ if (conn->modes[i].hdisplay == 640 &&
+ conn->modes[i].vdisplay == 480 &&
+ conn->modes[i].vrefresh == 60) {
+ igt_info("found idx of failsafe mode = %d\n", i);
+ break;
+ }
+ }
+
+ if (i == conn->count_modes) {
+ igt_info("didn't find failsafe using default\n");
+ i = 0;
+ }
+
+ c->mode = c->connector->modes[i];
+
+ width = c->mode.hdisplay;
+ height = c->mode.vdisplay;
+
+ fb_id = igt_create_pattern_fb(drm_fd, width, height,
+ DRM_FORMAT_XRGB8888,
+ tiling, &fb_info);
+
+ kmstest_dump_mode(&c->mode);
+ drmModeSetCrtc(drm_fd, c->crtc, -1, 0, 0, NULL, 0, NULL);
+ ret = drmModeSetCrtc(drm_fd, c->crtc, fb_id, 0, 0,
+ &c->id, 1, &c->mode);
+ if (ret) {
+ igt_warn("Failed to set mode (%dx%d@%dHz): %s\n",
+ width, height, c->mode.vrefresh, strerror(errno));
+ igt_remove_fb(drm_fd, &fb_info);
+
+ }
+
+ return ret;
+}
+
+static uint32_t find_crtc_for_connector(drmModeConnector *c)
+{
+ drmModeEncoder *e;
+ drmModeCrtcPtr crtc_ptr;
+ int i;
+
+ active_crtc = 0;
+
+ for (i = 0; i < c->count_encoders; i++) {
+ e = drmModeGetEncoder(drm_fd, c->encoders[i]);
+
+ /* if there is an active crtc use it */
+ if (e->crtc_id) {
+ active_crtc = e->crtc_id;
+ drmModeFreeEncoder(e);
+ break;
+ }
+ drmModeFreeEncoder(e);
+ }
+
+ /* no need to search further if active crtc is found */
+ if (active_crtc)
+ return active_crtc;
+
+ /*
+ * if there is no active crtc find one from the list of
+ * unused ones. Cannot use anything from possible_crtc of
+ * of encoder because it then tries to steal the crtc of the
+ * primary display. DPU driver does not support switching CRTCs
+ * across displays in the same commit. Hence need to find some
+ * other unused crtc.
+ */
+ for (i = 0; i < resources->count_crtcs; i++) {
+ crtc_ptr = drmModeGetCrtc(drm_fd, resources->crtcs[i]);
+ /* if a crtc which is unused is found , use it */
+ if (!crtc_ptr->mode_valid) {
+ active_crtc = crtc_ptr->crtc_id;
+ drmModeFreeCrtc(crtc_ptr);
+ break;
+ }
+ drmModeFreeCrtc(crtc_ptr);
+ }
+
+ return active_crtc;
+}
+
+/*
+ * Re-probe connectors and do a modeset based on test request or
+ * in case of a hotplug uevent.
+ *
+ * @mode: Video mode requested by the test
+ * @is_compliance_test: 1: If it is a compliance test
+ * 0: If it is a hotplug event
+ *
+ * Returns:
+ * 0: On Success
+ * -1: On failure
+ */
+int update_display(int mode, bool is_compliance_test)
+{
+ struct connector *connectors, *conn;
+ int cnt, ret = 0;
+ bool set_mode;
+ //int crtc;
+
+ resources = drmModeGetResources(drm_fd);
+ if (!resources) {
+ igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
+ return -1;
+ }
+
+ connectors = calloc(resources->count_connectors,
+ sizeof(struct connector));
+ if (!connectors)
+ return -1;
+
+ /* Find any connected displays */
+ for (cnt = 0; cnt < resources->count_connectors; cnt++) {
+ drmModeConnector *c;
+
+ conn = &connectors[cnt];
+ conn->id = resources->connectors[cnt];
+ c = drmModeGetConnector(drm_fd, conn->id);
+ if (c->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
+ c->connection == DRM_MODE_CONNECTED) {
+ test_connector_id = c->connector_id;
+ conn->connector = c;
+ conn->crtc = find_crtc_for_connector(c);
+ test_crtc = conn->crtc;
+ set_mode = true;
+ break;
+ } else if (c->connector_id == test_connector_id &&
+ c->connection == DRM_MODE_DISCONNECTED) {
+ conn->connector = c;
+ conn->crtc = test_crtc;
+ set_mode = false;
+ break;
+ }
+ }
+
+ if (cnt == resources->count_connectors) {
+ ret = -1;
+ goto err;
+ }
+
+ if (is_compliance_test) {
+ set_test_mode(conn);
+ ret = set_video(MSM_MODE_NONE, conn);
+ ret = set_video(mode, conn);
+
+ } else
+ ret = set_default_mode(conn, set_mode);
+
+ err:
+ drmModeFreeConnector(conn->connector);
+ /* Error condition if no connected displays */
+ free(connectors);
+ drmModeFreeResources(resources);
+ return ret;
+}
+
+static const char optstr[] = "hi";
+
+static void __attribute__((noreturn)) usage(char *name, char opt)
+{
+ igt_info("usage: %s [-hi]\n", name);
+ igt_info("\t-i\tdump info\n");
+ igt_info("\tDefault is to respond to Qd980 tests\n");
+ exit((opt != 'h') ? -1 : 0);
+}
+
+static void cleanup_debugfs(void)
+{
+ fclose(test_active_fp);
+ fclose(test_data_fp);
+ fclose(test_type_fp);
+}
+
+static void __attribute__((noreturn)) cleanup_and_exit(int ret)
+{
+ cleanup_debugfs();
+ close(drm_fd);
+ igt_info("Compliance testing application exiting\n");
+ exit(ret);
+}
+
+static void cleanup_test(void)
+{
+ video_pattern_flag = false;
+ hdisplay = 0;
+ vdisplay = 0;
+ bitdepth = 0;
+}
+
+static void read_test_request(void)
+{
+ unsigned long test_type;
+
+ test_type = get_test_type();
+
+ process_test_request(test_type);
+ cleanup_test();
+ clear_test_active();
+}
+
+static gboolean test_handler(GIOChannel *source, GIOCondition condition,
+ gpointer data)
+{
+ unsigned long test_active;
+ int ret;
+
+ rewind(test_active_fp);
+
+ ret = fscanf(test_active_fp, "%lx", &test_active);
+ if (ret < 1)
+ return FALSE;
+
+ if (test_active)
+ read_test_request();
+
+ return TRUE;
+}
+
+static gboolean input_event(GIOChannel *source, GIOCondition condition,
+ gpointer data)
+{
+ gchar buf[2];
+ gsize count;
+
+ count = read(g_io_channel_unix_get_fd(source), buf, sizeof(buf));
+ if (buf[0] == 'q' && (count == 1 || buf[1] == '\n'))
+ cleanup_and_exit(0);
+
+ return TRUE;
+}
+
+int main(int argc, char **argv)
+{
+ int c;
+ int ret = 0;
+ GIOChannel *stdinchannel, *testactive_channel;
+ GMainLoop *mainloop;
+ bool opt_dump_info = false;
+ struct option long_opts[] = {
+ {"help-description", 0, 0, HELP_DESCRIPTION},
+ {"help", 0, 0, 'h'},
+ };
+
+ enter_exec_path(argv);
+
+ while ((c = getopt_long(argc, argv, optstr, long_opts, NULL)) != -1) {
+ switch (c) {
+ case 'i':
+ opt_dump_info = true;
+ break;
+ case HELP_DESCRIPTION:
+ igt_info("DP Compliance Test Suite using Qd 980\n");
+ igt_info("Video Pattern Generation tests\n");
+ exit(0);
+ break;
+ default:
+ /* fall through */
+ case 'h':
+ usage(argv[0], c);
+ break;
+ }
+ }
+
+ set_termio_mode();
+
+ drm_fd = drm_open_driver(DRIVER_ANY);
+
+ kmstest_set_vt_graphics_mode();
+ setup_debugfs_files();
+ cleanup_test();
+ if (opt_dump_info) {
+ dump_info();
+ goto out_close;
+ }
+
+ /* Get the DP connector ID and CRTC */
+ if (update_display(0, false)) {
+ igt_warn("Failed to set default mode\n");
+ ret = -1;
+ goto out_close;
+ }
+
+ mainloop = g_main_loop_new(NULL, FALSE);
+ if (!mainloop) {
+ igt_warn("Failed to create GMainLoop\n");
+ ret = -1;
+ goto out_close;
+ }
+
+ if (!igt_dp_compliance_setup_hotplug()) {
+ igt_warn("Failed to initialize hotplug support\n");
+ goto out_mainloop;
+ }
+
+ testactive_channel = g_io_channel_unix_new(fileno(test_active_fp));
+ if (!testactive_channel) {
+ igt_warn("Failed to create test_active GIOChannel\n");
+ goto out_close;
+ }
+
+ ret = g_io_add_watch(testactive_channel, G_IO_IN | G_IO_ERR,
+ test_handler, NULL);
+ if (ret < 0) {
+ igt_warn("Failed to add watch on udev GIOChannel\n");
+ goto out_close;
+ }
+
+ stdinchannel = g_io_channel_unix_new(0);
+ if (!stdinchannel) {
+ igt_warn("Failed to create stdin GIOChannel\n");
+ goto out_hotplug;
+ }
+
+ ret = g_io_add_watch(stdinchannel, G_IO_IN | G_IO_ERR, input_event,
+ NULL);
+ if (ret < 0) {
+ igt_warn("Failed to add watch on stdin GIOChannel\n");
+ goto out_stdio;
+ }
+
+ ret = 0;
+
+ igt_info("*************DP Compliance Testing using Qdbox 980*************\n");
+ igt_info("Waiting for test request......\n");
+
+ g_main_loop_run(mainloop);
+
+out_stdio:
+ g_io_channel_shutdown(stdinchannel, TRUE, NULL);
+out_hotplug:
+ igt_dp_compliance_cleanup_hotplug();
+out_mainloop:
+ g_main_loop_unref(mainloop);
+out_close:
+ cleanup_debugfs();
+ close(drm_fd);
+
+ igt_assert_eq(ret, 0);
+
+ igt_info("Compliance testing application exiting\n");
+ igt_exit();
+}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [igt-dev] [PATCH i-g-t 5/5] tools: add support for msm_dp_compliance to IGT
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 5/5] tools: add support for msm_dp_compliance to IGT Abhinav Kumar
@ 2020-09-15 7:46 ` Petri Latvala
2020-09-15 16:33 ` abhinavk
0 siblings, 1 reply; 16+ messages in thread
From: Petri Latvala @ 2020-09-15 7:46 UTC (permalink / raw)
To: Abhinav Kumar; +Cc: khsieh, tanmay, swboyd, igt-dev, nganji, seanpaul, aravindh
On Thu, Sep 03, 2020 at 05:54:39PM -0700, Abhinav Kumar wrote:
> Add support for msm_dp_compliance to igt tools to validate
> video pattern DP compliance tests on MSM chipsets.
>
> Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
> tools/Makefile.am | 4 +
> tools/Makefile.sources | 6 +
> tools/meson.build | 12 +
> tools/msm_dp_compliance.c | 812 ++++++++++++++++++++++++++++++++++++++
> 4 files changed, 834 insertions(+)
> create mode 100644 tools/msm_dp_compliance.c
>
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index f97f9e08..eac52be8 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -14,6 +14,10 @@ intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
> bin_PROGRAMS += amd_hdmi_compliance
> amd_hdmi_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
>
> +bin_PROGRAMS += msm_dp_compliance
> +msm_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
> +msm_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
> +
> SUBDIRS = i915-perf null_state_gen registers
>
> AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi -I$(top_srcdir)/lib \
> diff --git a/tools/Makefile.sources b/tools/Makefile.sources
> index 47171490..c93bfe7d 100644
> --- a/tools/Makefile.sources
> +++ b/tools/Makefile.sources
> @@ -72,3 +72,9 @@ amd_hdmi_compliance_SOURCES = \
> amd_hdmi_compliance.c \
> $(NULL)
>
> +msm_dp_compliance_SOURCES = \
> + msm_dp_compliance.c \
> + igt_dp_compliance.h \
> + igt_dp_compliance_hotplug.c \
> + igt_compliance_utils.c \
> + $(NULL)
> diff --git a/tools/meson.build b/tools/meson.build
> index 56877fb3..65f78938 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -101,5 +101,17 @@ executable('amd_hdmi_compliance', 'amd_hdmi_compliance.c',
> install_rpath : bindir_rpathdir,
> install : true)
>
> +if libudev.found()
> + msm_dp_compliance_src = [
> + 'msm_dp_compliance.c',
> + 'igt_dp_compliance_hotplug.c',
> + 'igt_compliance_utils.c'
> + ]
Check indentation here for the msm_dp_compliance_src = [ line.
Otherwise looks good,
Acked-by: Petri Latvala <petri.latvala@intel.com>
For future changes that affect this tool, do you want to be the main
contact person to ask for acks/tests/opinions?
--
Petri Latvala
> + executable('msm_dp_compliance', sources : msm_dp_compliance_src,
> + dependencies : [tool_deps, libudev],
> + install_rpath : bindir_rpathdir,
> + install : true)
> +endif
> +
> subdir('i915-perf')
> subdir('null_state_gen')
> diff --git a/tools/msm_dp_compliance.c b/tools/msm_dp_compliance.c
> new file mode 100644
> index 00000000..7bc2bfa8
> --- /dev/null
> +++ b/tools/msm_dp_compliance.c
> @@ -0,0 +1,812 @@
> +/*
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> + * Copyright © 2017 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + * Displayport Compliance Testing Application
> + *
> + * This is the userspace component of the Displayport Compliance testing
> + * software required for compliance testing of the MSM Display Port driver.
> + * This must be running in order to successfully complete Display Port
> + * compliance testing. This app and the kernel code that accompanies it has been
> + * written to satify the requirements of the Displayport Link CTS 1.2 rev1.1
> + * specification from VESA. Note that this application does not support eDP
> + * compliance testing.
> + *
> + * Compliance Testing requires several components:
> + * - A kernel build that contains the patch set for DP compliance support
> + * - A Displayport Compliance Testing appliance such as Qdbox 980
> + * - This user application
> + * - A windows host machine to run the Qdbox 980 test software
> + * - Root access on the DUT due to the use of sysfs utility
> + *
> + * Test Setup:
> + * It is strongly recommended that the windows host, test appliance and DUT
> + * be freshly restarted before any testing begins to ensure that any previous
> + * configurations and settings will not interfere with test process. Refer to
> + * the test appliance documentation for setup, software installation and
> + * operation specific to that device.
> + *
> + * The Linux DUT must be in text (console) mode and cannot have any other
> + * display manager running. You must be logged in as root to run this user app.
> + * Once the user application is up and running, waiting for test requests, the
> + * software on the windows host can now be used to execute the compliance tests.
> + *
> + * This userspace application supports following tests from the DP CTS Spec
> + * Rev 1.1:
> + * - Video Pattern generation tests: This supports only the 24 and
> + * 18bpp color
> + * ramp test pattern (4.3.3.1).
> + *
> + * Connections (required):
> + * - Test Appliance connected to the external Displayport connector on the DUT
> + * - Test Appliance Monitor Out connected to Displayport connector on the
> + * monitor
> + * - Test appliance connected to the Windows Host via USB
> + *
> + * Debugfs Files:
> + * The file root for all the debugfs file:
> + * /sys/kernel/debug/dri/0/
> + *
> + * The specific files are as follows:
> + *
> + * msm_dp_test_active
> + * A simple flag that indicates whether or not compliance testing is currently
> + * active in the kernel. This flag is polled by userspace and once set, invokes
> + * the test handler in the user app. This flag is set by the test handler in the
> + * kernel after reading the registers requested by the test appliance.
> + *
> + * msm_dp_test_data
> + * Test data is used by the kernel to pass parameters to the user app. Eg: In
> + * case of EDID tests, the data that is delivered to the userspace is the video
> + * mode to be set for the test.
> + * In case of video pattern test, the data that is delivered to the userspace is
> + * the width and height of the test pattern and the bits per color value.
> + *
> + * msm_dp_test_type
> + * The test type variable instructs the user app as to what the requested test
> + * was from the sink device. These values defined at the top of the
> + * application's main implementation file must be kept in sync with the
> + * values defined in the kernel's drm_dp_helper.h file.
> + * This app is based on some prior work submitted in April 2015 by Todd Previte
> + * (<tprevite@gmail.com>).
> + *
> + * This work is based upon the intel_dp_compliance.c authored by
> + * Manasi Navare <manasi.d.navare@intel.com>
> + *
> + *
> + * This tool can be run as:
> + * ./msm_dp_compliance It will wait till you start compliance suite from
> + * Qdbox 980.
> + * ./msm_dp_compliance -h This will open the help
> + * ./msm_dp_compliance -i This will provide information about current
> + * connectors/CRTCs. This can be used for debugging purpose.
> + *
> + * Authors:
> + * Abhinav Kumar <abhinavk@codeaurora.org>
> + *
> + * Elements of the modeset code adapted from David Herrmann's
> + * DRM modeset example
> + *
> + */
> +#include "igt.h"
> +#include <errno.h>
> +#include <getopt.h>
> +#include <math.h>
> +#include <stdint.h>
> +#include <stdbool.h>
> +#include <strings.h>
> +#include <unistd.h>
> +#include <termios.h>
> +#include <sys/poll.h>
> +#include <sys/time.h>
> +#include <sys/ioctl.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <sys/select.h>
> +#include <assert.h>
> +#include <signal.h>
> +#include <fcntl.h>
> +#include <time.h>
> +
> +#include "igt_dp_compliance.h"
> +
> +#include <stdlib.h>
> +#include <signal.h>
> +
> +/* User Input definitions */
> +#define HELP_DESCRIPTION 1
> +
> +/* Debugfs file definitions */
> +#define MSM_DP_TEST_TYPE_FILE "msm_dp_test_type"
> +#define MSM_DP_TEST_ACTIVE_FILE "msm_dp_test_active"
> +#define MSM_DP_TEST_DATA_FILE "msm_dp_test_data"
> +
> +/* DRM definitions - must be kept in sync with the DRM header */
> +#define DP_TEST_LINK_VIDEO_PATTERN (1 << 1)
> +
> +/* Global file pointers for the sysfs files */
> +FILE *test_active_fp, *test_data_fp, *test_type_fp;
> +
> +bool video_pattern_flag;
> +
> +/* Video pattern test globals */
> +uint16_t hdisplay;
> +uint16_t vdisplay;
> +uint8_t bitdepth;
> +
> +drmModeRes *resources;
> +int drm_fd, modes, gen;
> +uint64_t tiling = LOCAL_DRM_FORMAT_MOD_NONE;
> +uint32_t depth = 24, stride, bpp;
> +int specified_mode_num = -1, specified_disp_id = -1;
> +int width, height;
> +uint32_t test_crtc;
> +uint32_t active_crtc;
> +uint32_t test_connector_id;
> +enum {
> + MSM_MODE_INVALID = -1,
> + MSM_MODE_NONE = 0,
> + MSM_MODE_VIDEO_PATTERN_TEST
> +} msm_display_mode;
> +
> +struct test_video_pattern {
> + uint16_t hdisplay;
> + uint16_t vdisplay;
> + uint8_t bitdepth;
> + uint32_t fb;
> + uint32_t size;
> + struct igt_fb fb_pattern;
> + drmModeModeInfo mode;
> + uint32_t *pixmap;
> +};
> +
> +struct connector {
> + uint32_t id;
> + int mode_valid;
> + drmModeModeInfo mode, mode_failsafe;
> + drmModeConnector *connector;
> + int crtc;
> + /* Standard and preferred frame buffer*/
> + uint8_t *pixmap;
> +
> + struct test_video_pattern test_pattern;
> +};
> +
> +static void clear_test_active(void)
> +{
> + rewind(test_active_fp);
> + fprintf(test_active_fp, "%d", 0);
> + fflush(test_active_fp);
> +}
> +
> +static FILE *fopenat(int dir, const char *name, const char *mode)
> +{
> + int fd = openat(dir, name, O_RDWR);
> +
> + return fdopen(fd, mode);
> +}
> +
> +static void setup_debugfs_files(void)
> +{
> + int dir = igt_debugfs_dir(drm_fd);
> +
> + test_type_fp = fopenat(dir, MSM_DP_TEST_TYPE_FILE, "r");
> + igt_require(test_type_fp);
> +
> + test_data_fp = fopenat(dir, MSM_DP_TEST_DATA_FILE, "r");
> + igt_require(test_data_fp);
> + test_active_fp = fopenat(dir, MSM_DP_TEST_ACTIVE_FILE, "w+");
> +
> + igt_require(test_active_fp);
> +
> + close(dir);
> +
> + /* Reset the active flag for safety */
> + clear_test_active();
> +}
> +
> +static unsigned long get_test_type(void)
> +{
> + unsigned long test_type;
> + int ret;
> +
> + if (!test_type_fp)
> + fprintf(stderr, "Invalid test_type file\n");
> + rewind(test_type_fp);
> + ret = fscanf(test_type_fp, "%lx", &test_type);
> + if (ret < 1 || test_type <= 0) {
> + igt_warn("test_type read failed - %lx\n", test_type);
> + return 0;
> + }
> +
> + return test_type;
> +}
> +
> +static void get_test_videopattern_data(void)
> +{
> + int count = 0;
> + uint16_t video_pattern_value[3];
> + char video_pattern_attribute[15];
> + int ret;
> +
> + if (!test_data_fp)
> + fprintf(stderr, "Invalid test_data file\n");
> +
> + rewind(test_data_fp);
> + while (!feof(test_data_fp) && count < 3) {
> + ret = fscanf(test_data_fp, "%s %u\n", video_pattern_attribute,
> + (unsigned int *)&video_pattern_value[count++]);
> + if (ret < 2) {
> + igt_warn("test_data read failed\n");
> + return;
> + }
> + }
> +
> + hdisplay = video_pattern_value[0];
> + vdisplay = video_pattern_value[1];
> + bitdepth = video_pattern_value[2];
> + igt_info("Hdisplay = %d\n", hdisplay);
> + igt_info("Vdisplay = %d\n", vdisplay);
> + igt_info("BitDepth = %u\n", bitdepth);
> +
> +}
> +
> +static int process_test_request(int test_type)
> +{
> + int mode;
> + bool valid = false;
> +
> + switch (test_type) {
> + case DP_TEST_LINK_VIDEO_PATTERN:
> + video_pattern_flag = true;
> + get_test_videopattern_data();
> + mode = MSM_MODE_VIDEO_PATTERN_TEST;
> + valid = true;
> + break;
> + default:
> + /* Unknown test type */
> + fprintf(stderr, "Invalid test request, ignored.\n");
> + break;
> + }
> +
> + if (valid)
> + return update_display(mode, true);
> +
> + return -1;
> +}
> +
> +static void dump_info(void)
> +{
> + igt_dump_connectors_fd(drm_fd);
> + igt_dump_crtcs_fd(drm_fd);
> +}
> +
> +static int setup_video_pattern_framebuffer(struct connector *dp_conn)
> +{
> + uint32_t video_width, video_height;
> +
> + video_width = dp_conn->test_pattern.hdisplay;
> + video_height = dp_conn->test_pattern.vdisplay;
> +
> + dp_conn->test_pattern.fb = igt_create_fb(drm_fd,
> + video_width, video_height,
> + DRM_FORMAT_XRGB8888,
> + LOCAL_DRM_FORMAT_MOD_NONE,
> + &dp_conn->test_pattern.fb_pattern);
> + igt_assert(dp_conn->test_pattern.fb);
> +
> +
> + dp_conn->test_pattern.pixmap = kmstest_dumb_map_buffer(drm_fd,
> + dp_conn->test_pattern.fb_pattern.gem_handle,
> + dp_conn->test_pattern.fb_pattern.size,
> + PROT_READ | PROT_WRITE);
> +
> + if (dp_conn->test_pattern.pixmap == NULL)
> + return -1;
> +
> + dp_conn->test_pattern.size = dp_conn->test_pattern.fb_pattern.size;
> + memset(dp_conn->test_pattern.pixmap, 0, dp_conn->test_pattern.size);
> + return 0;
> +
> +}
> +
> +static int set_test_mode(struct connector *dp_conn)
> +{
> + int ret = 0;
> + int i;
> + drmModeConnector *c = dp_conn->connector;
> +
> + /* Ignore any disconnected devices */
> + if (c->connection != DRM_MODE_CONNECTED) {
> + igt_warn("Connector %u disconnected\n", c->connector_id);
> + return -ENOENT;
> + }
> + igt_info("Connector setup:\n");
> +
> + /*
> + * to-do: for cases where driver doesn't support 4K but
> + * its the preferred mode of the sink, use 640x480 as
> + * default resolution
> + */
> +
> + for (i = 0; i < c->count_modes; i++) {
> + if (c->modes[i].hdisplay == 640 &&
> + c->modes[i].vdisplay == 480 &&
> + c->modes[i].vrefresh == 60) {
> + igt_info("found idx of failsafe mode = %d\n", i);
> + break;
> + }
> + }
> +
> + if (i == c->count_modes) {
> + igt_info("didn't find failsafe using default\n");
> + i = 0;
> + }
> +
> + dp_conn->test_pattern.mode = c->modes[i];
> + dp_conn->test_pattern.mode.hdisplay = c->modes[i].hdisplay;
> + dp_conn->test_pattern.mode.vdisplay = c->modes[i].vdisplay;
> +
> + igt_info("failsafe (mode %d) for connector %u is %ux%u\n", i,
> + dp_conn->id, c->modes[i].hdisplay, c->modes[i].vdisplay);
> + fflush(stdin);
> +
> + if (video_pattern_flag) {
> + dp_conn->test_pattern.hdisplay = hdisplay;
> + dp_conn->test_pattern.vdisplay = vdisplay;
> + dp_conn->test_pattern.bitdepth = bitdepth;
> +
> + ret = setup_video_pattern_framebuffer(dp_conn);
> + if (ret) {
> + igt_warn("Creating framebuffer for connector %u failed (%d)\n",
> + c->connector_id, ret);
> + return ret;
> + }
> +
> + ret = igt_fill_cts_framebuffer(dp_conn->test_pattern.pixmap,
> + dp_conn->test_pattern.hdisplay,
> + dp_conn->test_pattern.vdisplay,
> + dp_conn->test_pattern.bitdepth,
> + 0);
> + if (ret) {
> + igt_warn("Filling framebuffer for connector %u failed (%d)\n",
> + c->connector_id, ret);
> + return ret;
> + }
> + /* unmapping the buffer previously mapped during setup */
> + munmap(dp_conn->test_pattern.pixmap,
> + dp_conn->test_pattern.size);
> + }
> +
> + return ret;
> +}
> +
> +static int set_video(int mode, struct connector *test_connector)
> +{
> + drmModeModeInfo *requested_mode;
> + uint32_t required_fb_id;
> + struct igt_fb required_fb;
> + int ret = 0;
> +
> + switch (mode) {
> + case MSM_MODE_NONE:
> + igt_info("NONE\n");
> + ret = drmModeSetCrtc(drm_fd, test_connector->crtc,
> + -1, 0, 0, NULL, 0, NULL);
> + goto out;
> + case MSM_MODE_VIDEO_PATTERN_TEST:
> + igt_info("VIDEO PATTERN TEST\n");
> + requested_mode = &test_connector->test_pattern.mode;
> + required_fb_id = test_connector->test_pattern.fb;
> + required_fb = test_connector->test_pattern.fb_pattern;
> + break;
> + case MSM_MODE_INVALID:
> + default:
> + igt_warn("INVALID! (%08x) Mode set aborted!\n", mode);
> + return -1;
> + }
> +
> + igt_info("CRTC(%u):", test_connector->crtc);
> + kmstest_dump_mode(requested_mode);
> + ret = drmModeSetCrtc(drm_fd, test_connector->crtc, required_fb_id, 0, 0,
> + &test_connector->id, 1, requested_mode);
> + if (ret) {
> + igt_warn("Failed to set mode (%dx%d@%dHz): %s\n",
> + requested_mode->hdisplay, requested_mode->vdisplay,
> + requested_mode->vrefresh, strerror(errno));
> + igt_remove_fb(drm_fd, &required_fb);
> +
> + }
> + /* Keep the pattern for 1 sec for Qdbox 980 to detect it */
> + sleep(1);
> +
> +out:
> + if (ret) {
> + igt_warn("Failed to set CRTC for connector %u\n",
> + test_connector->id);
> + }
> +
> + return ret;
> +}
> +
> +static int
> +set_default_mode(struct connector *c, bool set_mode)
> +{
> + unsigned int fb_id = 0;
> + struct igt_fb fb_info;
> + int ret = 0;
> + int i;
> + drmModeConnector *conn = c->connector;
> +
> + if (!set_mode) {
> + igt_info("not resetting the mode\n");
> + ret = drmModeSetCrtc(drm_fd, c->crtc, 0, 0, 0,
> + NULL, 0, NULL);
> + if (ret)
> + igt_warn("Failed to unset mode");
> + return ret;
> + }
> +
> + for (i = 0; i < conn->count_modes; i++) {
> + if (conn->modes[i].hdisplay == 640 &&
> + conn->modes[i].vdisplay == 480 &&
> + conn->modes[i].vrefresh == 60) {
> + igt_info("found idx of failsafe mode = %d\n", i);
> + break;
> + }
> + }
> +
> + if (i == conn->count_modes) {
> + igt_info("didn't find failsafe using default\n");
> + i = 0;
> + }
> +
> + c->mode = c->connector->modes[i];
> +
> + width = c->mode.hdisplay;
> + height = c->mode.vdisplay;
> +
> + fb_id = igt_create_pattern_fb(drm_fd, width, height,
> + DRM_FORMAT_XRGB8888,
> + tiling, &fb_info);
> +
> + kmstest_dump_mode(&c->mode);
> + drmModeSetCrtc(drm_fd, c->crtc, -1, 0, 0, NULL, 0, NULL);
> + ret = drmModeSetCrtc(drm_fd, c->crtc, fb_id, 0, 0,
> + &c->id, 1, &c->mode);
> + if (ret) {
> + igt_warn("Failed to set mode (%dx%d@%dHz): %s\n",
> + width, height, c->mode.vrefresh, strerror(errno));
> + igt_remove_fb(drm_fd, &fb_info);
> +
> + }
> +
> + return ret;
> +}
> +
> +static uint32_t find_crtc_for_connector(drmModeConnector *c)
> +{
> + drmModeEncoder *e;
> + drmModeCrtcPtr crtc_ptr;
> + int i;
> +
> + active_crtc = 0;
> +
> + for (i = 0; i < c->count_encoders; i++) {
> + e = drmModeGetEncoder(drm_fd, c->encoders[i]);
> +
> + /* if there is an active crtc use it */
> + if (e->crtc_id) {
> + active_crtc = e->crtc_id;
> + drmModeFreeEncoder(e);
> + break;
> + }
> + drmModeFreeEncoder(e);
> + }
> +
> + /* no need to search further if active crtc is found */
> + if (active_crtc)
> + return active_crtc;
> +
> + /*
> + * if there is no active crtc find one from the list of
> + * unused ones. Cannot use anything from possible_crtc of
> + * of encoder because it then tries to steal the crtc of the
> + * primary display. DPU driver does not support switching CRTCs
> + * across displays in the same commit. Hence need to find some
> + * other unused crtc.
> + */
> + for (i = 0; i < resources->count_crtcs; i++) {
> + crtc_ptr = drmModeGetCrtc(drm_fd, resources->crtcs[i]);
> + /* if a crtc which is unused is found , use it */
> + if (!crtc_ptr->mode_valid) {
> + active_crtc = crtc_ptr->crtc_id;
> + drmModeFreeCrtc(crtc_ptr);
> + break;
> + }
> + drmModeFreeCrtc(crtc_ptr);
> + }
> +
> + return active_crtc;
> +}
> +
> +/*
> + * Re-probe connectors and do a modeset based on test request or
> + * in case of a hotplug uevent.
> + *
> + * @mode: Video mode requested by the test
> + * @is_compliance_test: 1: If it is a compliance test
> + * 0: If it is a hotplug event
> + *
> + * Returns:
> + * 0: On Success
> + * -1: On failure
> + */
> +int update_display(int mode, bool is_compliance_test)
> +{
> + struct connector *connectors, *conn;
> + int cnt, ret = 0;
> + bool set_mode;
> + //int crtc;
> +
> + resources = drmModeGetResources(drm_fd);
> + if (!resources) {
> + igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
> + return -1;
> + }
> +
> + connectors = calloc(resources->count_connectors,
> + sizeof(struct connector));
> + if (!connectors)
> + return -1;
> +
> + /* Find any connected displays */
> + for (cnt = 0; cnt < resources->count_connectors; cnt++) {
> + drmModeConnector *c;
> +
> + conn = &connectors[cnt];
> + conn->id = resources->connectors[cnt];
> + c = drmModeGetConnector(drm_fd, conn->id);
> + if (c->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> + c->connection == DRM_MODE_CONNECTED) {
> + test_connector_id = c->connector_id;
> + conn->connector = c;
> + conn->crtc = find_crtc_for_connector(c);
> + test_crtc = conn->crtc;
> + set_mode = true;
> + break;
> + } else if (c->connector_id == test_connector_id &&
> + c->connection == DRM_MODE_DISCONNECTED) {
> + conn->connector = c;
> + conn->crtc = test_crtc;
> + set_mode = false;
> + break;
> + }
> + }
> +
> + if (cnt == resources->count_connectors) {
> + ret = -1;
> + goto err;
> + }
> +
> + if (is_compliance_test) {
> + set_test_mode(conn);
> + ret = set_video(MSM_MODE_NONE, conn);
> + ret = set_video(mode, conn);
> +
> + } else
> + ret = set_default_mode(conn, set_mode);
> +
> + err:
> + drmModeFreeConnector(conn->connector);
> + /* Error condition if no connected displays */
> + free(connectors);
> + drmModeFreeResources(resources);
> + return ret;
> +}
> +
> +static const char optstr[] = "hi";
> +
> +static void __attribute__((noreturn)) usage(char *name, char opt)
> +{
> + igt_info("usage: %s [-hi]\n", name);
> + igt_info("\t-i\tdump info\n");
> + igt_info("\tDefault is to respond to Qd980 tests\n");
> + exit((opt != 'h') ? -1 : 0);
> +}
> +
> +static void cleanup_debugfs(void)
> +{
> + fclose(test_active_fp);
> + fclose(test_data_fp);
> + fclose(test_type_fp);
> +}
> +
> +static void __attribute__((noreturn)) cleanup_and_exit(int ret)
> +{
> + cleanup_debugfs();
> + close(drm_fd);
> + igt_info("Compliance testing application exiting\n");
> + exit(ret);
> +}
> +
> +static void cleanup_test(void)
> +{
> + video_pattern_flag = false;
> + hdisplay = 0;
> + vdisplay = 0;
> + bitdepth = 0;
> +}
> +
> +static void read_test_request(void)
> +{
> + unsigned long test_type;
> +
> + test_type = get_test_type();
> +
> + process_test_request(test_type);
> + cleanup_test();
> + clear_test_active();
> +}
> +
> +static gboolean test_handler(GIOChannel *source, GIOCondition condition,
> + gpointer data)
> +{
> + unsigned long test_active;
> + int ret;
> +
> + rewind(test_active_fp);
> +
> + ret = fscanf(test_active_fp, "%lx", &test_active);
> + if (ret < 1)
> + return FALSE;
> +
> + if (test_active)
> + read_test_request();
> +
> + return TRUE;
> +}
> +
> +static gboolean input_event(GIOChannel *source, GIOCondition condition,
> + gpointer data)
> +{
> + gchar buf[2];
> + gsize count;
> +
> + count = read(g_io_channel_unix_get_fd(source), buf, sizeof(buf));
> + if (buf[0] == 'q' && (count == 1 || buf[1] == '\n'))
> + cleanup_and_exit(0);
> +
> + return TRUE;
> +}
> +
> +int main(int argc, char **argv)
> +{
> + int c;
> + int ret = 0;
> + GIOChannel *stdinchannel, *testactive_channel;
> + GMainLoop *mainloop;
> + bool opt_dump_info = false;
> + struct option long_opts[] = {
> + {"help-description", 0, 0, HELP_DESCRIPTION},
> + {"help", 0, 0, 'h'},
> + };
> +
> + enter_exec_path(argv);
> +
> + while ((c = getopt_long(argc, argv, optstr, long_opts, NULL)) != -1) {
> + switch (c) {
> + case 'i':
> + opt_dump_info = true;
> + break;
> + case HELP_DESCRIPTION:
> + igt_info("DP Compliance Test Suite using Qd 980\n");
> + igt_info("Video Pattern Generation tests\n");
> + exit(0);
> + break;
> + default:
> + /* fall through */
> + case 'h':
> + usage(argv[0], c);
> + break;
> + }
> + }
> +
> + set_termio_mode();
> +
> + drm_fd = drm_open_driver(DRIVER_ANY);
> +
> + kmstest_set_vt_graphics_mode();
> + setup_debugfs_files();
> + cleanup_test();
> + if (opt_dump_info) {
> + dump_info();
> + goto out_close;
> + }
> +
> + /* Get the DP connector ID and CRTC */
> + if (update_display(0, false)) {
> + igt_warn("Failed to set default mode\n");
> + ret = -1;
> + goto out_close;
> + }
> +
> + mainloop = g_main_loop_new(NULL, FALSE);
> + if (!mainloop) {
> + igt_warn("Failed to create GMainLoop\n");
> + ret = -1;
> + goto out_close;
> + }
> +
> + if (!igt_dp_compliance_setup_hotplug()) {
> + igt_warn("Failed to initialize hotplug support\n");
> + goto out_mainloop;
> + }
> +
> + testactive_channel = g_io_channel_unix_new(fileno(test_active_fp));
> + if (!testactive_channel) {
> + igt_warn("Failed to create test_active GIOChannel\n");
> + goto out_close;
> + }
> +
> + ret = g_io_add_watch(testactive_channel, G_IO_IN | G_IO_ERR,
> + test_handler, NULL);
> + if (ret < 0) {
> + igt_warn("Failed to add watch on udev GIOChannel\n");
> + goto out_close;
> + }
> +
> + stdinchannel = g_io_channel_unix_new(0);
> + if (!stdinchannel) {
> + igt_warn("Failed to create stdin GIOChannel\n");
> + goto out_hotplug;
> + }
> +
> + ret = g_io_add_watch(stdinchannel, G_IO_IN | G_IO_ERR, input_event,
> + NULL);
> + if (ret < 0) {
> + igt_warn("Failed to add watch on stdin GIOChannel\n");
> + goto out_stdio;
> + }
> +
> + ret = 0;
> +
> + igt_info("*************DP Compliance Testing using Qdbox 980*************\n");
> + igt_info("Waiting for test request......\n");
> +
> + g_main_loop_run(mainloop);
> +
> +out_stdio:
> + g_io_channel_shutdown(stdinchannel, TRUE, NULL);
> +out_hotplug:
> + igt_dp_compliance_cleanup_hotplug();
> +out_mainloop:
> + g_main_loop_unref(mainloop);
> +out_close:
> + cleanup_debugfs();
> + close(drm_fd);
> +
> + igt_assert_eq(ret, 0);
> +
> + igt_info("Compliance testing application exiting\n");
> + igt_exit();
> +}
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [igt-dev] [PATCH i-g-t 5/5] tools: add support for msm_dp_compliance to IGT
2020-09-15 7:46 ` Petri Latvala
@ 2020-09-15 16:33 ` abhinavk
0 siblings, 0 replies; 16+ messages in thread
From: abhinavk @ 2020-09-15 16:33 UTC (permalink / raw)
To: Petri Latvala; +Cc: khsieh, tanmay, swboyd, igt-dev, nganji, seanpaul, aravindh
Hi,
On 2020-09-15 00:46, Petri Latvala wrote:
> On Thu, Sep 03, 2020 at 05:54:39PM -0700, Abhinav Kumar wrote:
>> Add support for msm_dp_compliance to igt tools to validate
>> video pattern DP compliance tests on MSM chipsets.
>>
>> Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
>> ---
>> tools/Makefile.am | 4 +
>> tools/Makefile.sources | 6 +
>> tools/meson.build | 12 +
>> tools/msm_dp_compliance.c | 812
>> ++++++++++++++++++++++++++++++++++++++
>> 4 files changed, 834 insertions(+)
>> create mode 100644 tools/msm_dp_compliance.c
>>
>> diff --git a/tools/Makefile.am b/tools/Makefile.am
>> index f97f9e08..eac52be8 100644
>> --- a/tools/Makefile.am
>> +++ b/tools/Makefile.am
>> @@ -14,6 +14,10 @@ intel_dp_compliance_LDADD =
>> $(top_builddir)/lib/libintel_tools.la
>> bin_PROGRAMS += amd_hdmi_compliance
>> amd_hdmi_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
>>
>> +bin_PROGRAMS += msm_dp_compliance
>> +msm_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
>> +msm_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
>> +
>> SUBDIRS = i915-perf null_state_gen registers
>>
>> AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi
>> -I$(top_srcdir)/lib \
>> diff --git a/tools/Makefile.sources b/tools/Makefile.sources
>> index 47171490..c93bfe7d 100644
>> --- a/tools/Makefile.sources
>> +++ b/tools/Makefile.sources
>> @@ -72,3 +72,9 @@ amd_hdmi_compliance_SOURCES = \
>> amd_hdmi_compliance.c \
>> $(NULL)
>>
>> +msm_dp_compliance_SOURCES = \
>> + msm_dp_compliance.c \
>> + igt_dp_compliance.h \
>> + igt_dp_compliance_hotplug.c \
>> + igt_compliance_utils.c \
>> + $(NULL)
>> diff --git a/tools/meson.build b/tools/meson.build
>> index 56877fb3..65f78938 100644
>> --- a/tools/meson.build
>> +++ b/tools/meson.build
>> @@ -101,5 +101,17 @@ executable('amd_hdmi_compliance',
>> 'amd_hdmi_compliance.c',
>> install_rpath : bindir_rpathdir,
>> install : true)
>>
>> +if libudev.found()
>> + msm_dp_compliance_src = [
>> + 'msm_dp_compliance.c',
>> + 'igt_dp_compliance_hotplug.c',
>> + 'igt_compliance_utils.c'
>> + ]
>
> Check indentation here for the msm_dp_compliance_src = [ line.
>
> Otherwise looks good,
> Acked-by: Petri Latvala <petri.latvala@intel.com>
>
> For future changes that affect this tool, do you want to be the main
> contact person to ask for acks/tests/opinions?
>
>
> --
> Petri Latvala
Thanks so much for the review. Will check the indent.
Yes, I will be the main contact person to ask for acks/tests/opinions on
this tool.
>
>
>
>> + executable('msm_dp_compliance', sources : msm_dp_compliance_src,
>> + dependencies : [tool_deps, libudev],
>> + install_rpath : bindir_rpathdir,
>> + install : true)
>> +endif
>> +
>> subdir('i915-perf')
>> subdir('null_state_gen')
>> diff --git a/tools/msm_dp_compliance.c b/tools/msm_dp_compliance.c
>> new file mode 100644
>> index 00000000..7bc2bfa8
>> --- /dev/null
>> +++ b/tools/msm_dp_compliance.c
>> @@ -0,0 +1,812 @@
>> +/*
>> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
>> + * Copyright © 2017 Intel Corporation
>> + *
>> + * Permission is hereby granted, free of charge, to any person
>> obtaining a
>> + * copy of this software and associated documentation files (the
>> "Software"),
>> + * to deal in the Software without restriction, including without
>> limitation
>> + * the rights to use, copy, modify, merge, publish, distribute,
>> sublicense,
>> + * and/or sell copies of the Software, and to permit persons to whom
>> the
>> + * Software is furnished to do so, subject to the following
>> conditions:
>> + *
>> + * The above copyright notice and this permission notice (including
>> the next
>> + * paragraph) shall be included in all copies or substantial portions
>> of the
>> + * Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
>> SHALL
>> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
>> OR OTHER
>> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>> ARISING
>> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>> OTHER DEALINGS
>> + * IN THE SOFTWARE.
>> + *
>> + * Displayport Compliance Testing Application
>> + *
>> + * This is the userspace component of the Displayport Compliance
>> testing
>> + * software required for compliance testing of the MSM Display Port
>> driver.
>> + * This must be running in order to successfully complete Display
>> Port
>> + * compliance testing. This app and the kernel code that accompanies
>> it has been
>> + * written to satify the requirements of the Displayport Link CTS 1.2
>> rev1.1
>> + * specification from VESA. Note that this application does not
>> support eDP
>> + * compliance testing.
>> + *
>> + * Compliance Testing requires several components:
>> + * - A kernel build that contains the patch set for DP compliance
>> support
>> + * - A Displayport Compliance Testing appliance such as Qdbox 980
>> + * - This user application
>> + * - A windows host machine to run the Qdbox 980 test software
>> + * - Root access on the DUT due to the use of sysfs utility
>> + *
>> + * Test Setup:
>> + * It is strongly recommended that the windows host, test appliance
>> and DUT
>> + * be freshly restarted before any testing begins to ensure that any
>> previous
>> + * configurations and settings will not interfere with test process.
>> Refer to
>> + * the test appliance documentation for setup, software installation
>> and
>> + * operation specific to that device.
>> + *
>> + * The Linux DUT must be in text (console) mode and cannot have any
>> other
>> + * display manager running. You must be logged in as root to run this
>> user app.
>> + * Once the user application is up and running, waiting for test
>> requests, the
>> + * software on the windows host can now be used to execute the
>> compliance tests.
>> + *
>> + * This userspace application supports following tests from the DP
>> CTS Spec
>> + * Rev 1.1:
>> + * - Video Pattern generation tests: This supports only the 24 and
>> + * 18bpp color
>> + * ramp test pattern (4.3.3.1).
>> + *
>> + * Connections (required):
>> + * - Test Appliance connected to the external Displayport connector
>> on the DUT
>> + * - Test Appliance Monitor Out connected to Displayport connector
>> on the
>> + * monitor
>> + * - Test appliance connected to the Windows Host via USB
>> + *
>> + * Debugfs Files:
>> + * The file root for all the debugfs file:
>> + * /sys/kernel/debug/dri/0/
>> + *
>> + * The specific files are as follows:
>> + *
>> + * msm_dp_test_active
>> + * A simple flag that indicates whether or not compliance testing is
>> currently
>> + * active in the kernel. This flag is polled by userspace and once
>> set, invokes
>> + * the test handler in the user app. This flag is set by the test
>> handler in the
>> + * kernel after reading the registers requested by the test
>> appliance.
>> + *
>> + * msm_dp_test_data
>> + * Test data is used by the kernel to pass parameters to the user
>> app. Eg: In
>> + * case of EDID tests, the data that is delivered to the userspace is
>> the video
>> + * mode to be set for the test.
>> + * In case of video pattern test, the data that is delivered to the
>> userspace is
>> + * the width and height of the test pattern and the bits per color
>> value.
>> + *
>> + * msm_dp_test_type
>> + * The test type variable instructs the user app as to what the
>> requested test
>> + * was from the sink device. These values defined at the top of the
>> + * application's main implementation file must be kept in sync with
>> the
>> + * values defined in the kernel's drm_dp_helper.h file.
>> + * This app is based on some prior work submitted in April 2015 by
>> Todd Previte
>> + * (<tprevite@gmail.com>).
>> + *
>> + * This work is based upon the intel_dp_compliance.c authored by
>> + * Manasi Navare <manasi.d.navare@intel.com>
>> + *
>> + *
>> + * This tool can be run as:
>> + * ./msm_dp_compliance It will wait till you start compliance suite
>> from
>> + * Qdbox 980.
>> + * ./msm_dp_compliance -h This will open the help
>> + * ./msm_dp_compliance -i This will provide information about
>> current
>> + * connectors/CRTCs. This can be used for debugging purpose.
>> + *
>> + * Authors:
>> + * Abhinav Kumar <abhinavk@codeaurora.org>
>> + *
>> + * Elements of the modeset code adapted from David Herrmann's
>> + * DRM modeset example
>> + *
>> + */
>> +#include "igt.h"
>> +#include <errno.h>
>> +#include <getopt.h>
>> +#include <math.h>
>> +#include <stdint.h>
>> +#include <stdbool.h>
>> +#include <strings.h>
>> +#include <unistd.h>
>> +#include <termios.h>
>> +#include <sys/poll.h>
>> +#include <sys/time.h>
>> +#include <sys/ioctl.h>
>> +#include <sys/types.h>
>> +#include <sys/stat.h>
>> +#include <sys/select.h>
>> +#include <assert.h>
>> +#include <signal.h>
>> +#include <fcntl.h>
>> +#include <time.h>
>> +
>> +#include "igt_dp_compliance.h"
>> +
>> +#include <stdlib.h>
>> +#include <signal.h>
>> +
>> +/* User Input definitions */
>> +#define HELP_DESCRIPTION 1
>> +
>> +/* Debugfs file definitions */
>> +#define MSM_DP_TEST_TYPE_FILE "msm_dp_test_type"
>> +#define MSM_DP_TEST_ACTIVE_FILE "msm_dp_test_active"
>> +#define MSM_DP_TEST_DATA_FILE "msm_dp_test_data"
>> +
>> +/* DRM definitions - must be kept in sync with the DRM header */
>> +#define DP_TEST_LINK_VIDEO_PATTERN (1 << 1)
>> +
>> +/* Global file pointers for the sysfs files */
>> +FILE *test_active_fp, *test_data_fp, *test_type_fp;
>> +
>> +bool video_pattern_flag;
>> +
>> +/* Video pattern test globals */
>> +uint16_t hdisplay;
>> +uint16_t vdisplay;
>> +uint8_t bitdepth;
>> +
>> +drmModeRes *resources;
>> +int drm_fd, modes, gen;
>> +uint64_t tiling = LOCAL_DRM_FORMAT_MOD_NONE;
>> +uint32_t depth = 24, stride, bpp;
>> +int specified_mode_num = -1, specified_disp_id = -1;
>> +int width, height;
>> +uint32_t test_crtc;
>> +uint32_t active_crtc;
>> +uint32_t test_connector_id;
>> +enum {
>> + MSM_MODE_INVALID = -1,
>> + MSM_MODE_NONE = 0,
>> + MSM_MODE_VIDEO_PATTERN_TEST
>> +} msm_display_mode;
>> +
>> +struct test_video_pattern {
>> + uint16_t hdisplay;
>> + uint16_t vdisplay;
>> + uint8_t bitdepth;
>> + uint32_t fb;
>> + uint32_t size;
>> + struct igt_fb fb_pattern;
>> + drmModeModeInfo mode;
>> + uint32_t *pixmap;
>> +};
>> +
>> +struct connector {
>> + uint32_t id;
>> + int mode_valid;
>> + drmModeModeInfo mode, mode_failsafe;
>> + drmModeConnector *connector;
>> + int crtc;
>> + /* Standard and preferred frame buffer*/
>> + uint8_t *pixmap;
>> +
>> + struct test_video_pattern test_pattern;
>> +};
>> +
>> +static void clear_test_active(void)
>> +{
>> + rewind(test_active_fp);
>> + fprintf(test_active_fp, "%d", 0);
>> + fflush(test_active_fp);
>> +}
>> +
>> +static FILE *fopenat(int dir, const char *name, const char *mode)
>> +{
>> + int fd = openat(dir, name, O_RDWR);
>> +
>> + return fdopen(fd, mode);
>> +}
>> +
>> +static void setup_debugfs_files(void)
>> +{
>> + int dir = igt_debugfs_dir(drm_fd);
>> +
>> + test_type_fp = fopenat(dir, MSM_DP_TEST_TYPE_FILE, "r");
>> + igt_require(test_type_fp);
>> +
>> + test_data_fp = fopenat(dir, MSM_DP_TEST_DATA_FILE, "r");
>> + igt_require(test_data_fp);
>> + test_active_fp = fopenat(dir, MSM_DP_TEST_ACTIVE_FILE, "w+");
>> +
>> + igt_require(test_active_fp);
>> +
>> + close(dir);
>> +
>> + /* Reset the active flag for safety */
>> + clear_test_active();
>> +}
>> +
>> +static unsigned long get_test_type(void)
>> +{
>> + unsigned long test_type;
>> + int ret;
>> +
>> + if (!test_type_fp)
>> + fprintf(stderr, "Invalid test_type file\n");
>> + rewind(test_type_fp);
>> + ret = fscanf(test_type_fp, "%lx", &test_type);
>> + if (ret < 1 || test_type <= 0) {
>> + igt_warn("test_type read failed - %lx\n", test_type);
>> + return 0;
>> + }
>> +
>> + return test_type;
>> +}
>> +
>> +static void get_test_videopattern_data(void)
>> +{
>> + int count = 0;
>> + uint16_t video_pattern_value[3];
>> + char video_pattern_attribute[15];
>> + int ret;
>> +
>> + if (!test_data_fp)
>> + fprintf(stderr, "Invalid test_data file\n");
>> +
>> + rewind(test_data_fp);
>> + while (!feof(test_data_fp) && count < 3) {
>> + ret = fscanf(test_data_fp, "%s %u\n", video_pattern_attribute,
>> + (unsigned int *)&video_pattern_value[count++]);
>> + if (ret < 2) {
>> + igt_warn("test_data read failed\n");
>> + return;
>> + }
>> + }
>> +
>> + hdisplay = video_pattern_value[0];
>> + vdisplay = video_pattern_value[1];
>> + bitdepth = video_pattern_value[2];
>> + igt_info("Hdisplay = %d\n", hdisplay);
>> + igt_info("Vdisplay = %d\n", vdisplay);
>> + igt_info("BitDepth = %u\n", bitdepth);
>> +
>> +}
>> +
>> +static int process_test_request(int test_type)
>> +{
>> + int mode;
>> + bool valid = false;
>> +
>> + switch (test_type) {
>> + case DP_TEST_LINK_VIDEO_PATTERN:
>> + video_pattern_flag = true;
>> + get_test_videopattern_data();
>> + mode = MSM_MODE_VIDEO_PATTERN_TEST;
>> + valid = true;
>> + break;
>> + default:
>> + /* Unknown test type */
>> + fprintf(stderr, "Invalid test request, ignored.\n");
>> + break;
>> + }
>> +
>> + if (valid)
>> + return update_display(mode, true);
>> +
>> + return -1;
>> +}
>> +
>> +static void dump_info(void)
>> +{
>> + igt_dump_connectors_fd(drm_fd);
>> + igt_dump_crtcs_fd(drm_fd);
>> +}
>> +
>> +static int setup_video_pattern_framebuffer(struct connector *dp_conn)
>> +{
>> + uint32_t video_width, video_height;
>> +
>> + video_width = dp_conn->test_pattern.hdisplay;
>> + video_height = dp_conn->test_pattern.vdisplay;
>> +
>> + dp_conn->test_pattern.fb = igt_create_fb(drm_fd,
>> + video_width, video_height,
>> + DRM_FORMAT_XRGB8888,
>> + LOCAL_DRM_FORMAT_MOD_NONE,
>> + &dp_conn->test_pattern.fb_pattern);
>> + igt_assert(dp_conn->test_pattern.fb);
>> +
>> +
>> + dp_conn->test_pattern.pixmap = kmstest_dumb_map_buffer(drm_fd,
>> + dp_conn->test_pattern.fb_pattern.gem_handle,
>> + dp_conn->test_pattern.fb_pattern.size,
>> + PROT_READ | PROT_WRITE);
>> +
>> + if (dp_conn->test_pattern.pixmap == NULL)
>> + return -1;
>> +
>> + dp_conn->test_pattern.size = dp_conn->test_pattern.fb_pattern.size;
>> + memset(dp_conn->test_pattern.pixmap, 0, dp_conn->test_pattern.size);
>> + return 0;
>> +
>> +}
>> +
>> +static int set_test_mode(struct connector *dp_conn)
>> +{
>> + int ret = 0;
>> + int i;
>> + drmModeConnector *c = dp_conn->connector;
>> +
>> + /* Ignore any disconnected devices */
>> + if (c->connection != DRM_MODE_CONNECTED) {
>> + igt_warn("Connector %u disconnected\n", c->connector_id);
>> + return -ENOENT;
>> + }
>> + igt_info("Connector setup:\n");
>> +
>> + /*
>> + * to-do: for cases where driver doesn't support 4K but
>> + * its the preferred mode of the sink, use 640x480 as
>> + * default resolution
>> + */
>> +
>> + for (i = 0; i < c->count_modes; i++) {
>> + if (c->modes[i].hdisplay == 640 &&
>> + c->modes[i].vdisplay == 480 &&
>> + c->modes[i].vrefresh == 60) {
>> + igt_info("found idx of failsafe mode = %d\n", i);
>> + break;
>> + }
>> + }
>> +
>> + if (i == c->count_modes) {
>> + igt_info("didn't find failsafe using default\n");
>> + i = 0;
>> + }
>> +
>> + dp_conn->test_pattern.mode = c->modes[i];
>> + dp_conn->test_pattern.mode.hdisplay = c->modes[i].hdisplay;
>> + dp_conn->test_pattern.mode.vdisplay = c->modes[i].vdisplay;
>> +
>> + igt_info("failsafe (mode %d) for connector %u is %ux%u\n", i,
>> + dp_conn->id, c->modes[i].hdisplay, c->modes[i].vdisplay);
>> + fflush(stdin);
>> +
>> + if (video_pattern_flag) {
>> + dp_conn->test_pattern.hdisplay = hdisplay;
>> + dp_conn->test_pattern.vdisplay = vdisplay;
>> + dp_conn->test_pattern.bitdepth = bitdepth;
>> +
>> + ret = setup_video_pattern_framebuffer(dp_conn);
>> + if (ret) {
>> + igt_warn("Creating framebuffer for connector %u failed (%d)\n",
>> + c->connector_id, ret);
>> + return ret;
>> + }
>> +
>> + ret = igt_fill_cts_framebuffer(dp_conn->test_pattern.pixmap,
>> + dp_conn->test_pattern.hdisplay,
>> + dp_conn->test_pattern.vdisplay,
>> + dp_conn->test_pattern.bitdepth,
>> + 0);
>> + if (ret) {
>> + igt_warn("Filling framebuffer for connector %u failed (%d)\n",
>> + c->connector_id, ret);
>> + return ret;
>> + }
>> + /* unmapping the buffer previously mapped during setup */
>> + munmap(dp_conn->test_pattern.pixmap,
>> + dp_conn->test_pattern.size);
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +static int set_video(int mode, struct connector *test_connector)
>> +{
>> + drmModeModeInfo *requested_mode;
>> + uint32_t required_fb_id;
>> + struct igt_fb required_fb;
>> + int ret = 0;
>> +
>> + switch (mode) {
>> + case MSM_MODE_NONE:
>> + igt_info("NONE\n");
>> + ret = drmModeSetCrtc(drm_fd, test_connector->crtc,
>> + -1, 0, 0, NULL, 0, NULL);
>> + goto out;
>> + case MSM_MODE_VIDEO_PATTERN_TEST:
>> + igt_info("VIDEO PATTERN TEST\n");
>> + requested_mode = &test_connector->test_pattern.mode;
>> + required_fb_id = test_connector->test_pattern.fb;
>> + required_fb = test_connector->test_pattern.fb_pattern;
>> + break;
>> + case MSM_MODE_INVALID:
>> + default:
>> + igt_warn("INVALID! (%08x) Mode set aborted!\n", mode);
>> + return -1;
>> + }
>> +
>> + igt_info("CRTC(%u):", test_connector->crtc);
>> + kmstest_dump_mode(requested_mode);
>> + ret = drmModeSetCrtc(drm_fd, test_connector->crtc, required_fb_id,
>> 0, 0,
>> + &test_connector->id, 1, requested_mode);
>> + if (ret) {
>> + igt_warn("Failed to set mode (%dx%d@%dHz): %s\n",
>> + requested_mode->hdisplay, requested_mode->vdisplay,
>> + requested_mode->vrefresh, strerror(errno));
>> + igt_remove_fb(drm_fd, &required_fb);
>> +
>> + }
>> + /* Keep the pattern for 1 sec for Qdbox 980 to detect it */
>> + sleep(1);
>> +
>> +out:
>> + if (ret) {
>> + igt_warn("Failed to set CRTC for connector %u\n",
>> + test_connector->id);
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +static int
>> +set_default_mode(struct connector *c, bool set_mode)
>> +{
>> + unsigned int fb_id = 0;
>> + struct igt_fb fb_info;
>> + int ret = 0;
>> + int i;
>> + drmModeConnector *conn = c->connector;
>> +
>> + if (!set_mode) {
>> + igt_info("not resetting the mode\n");
>> + ret = drmModeSetCrtc(drm_fd, c->crtc, 0, 0, 0,
>> + NULL, 0, NULL);
>> + if (ret)
>> + igt_warn("Failed to unset mode");
>> + return ret;
>> + }
>> +
>> + for (i = 0; i < conn->count_modes; i++) {
>> + if (conn->modes[i].hdisplay == 640 &&
>> + conn->modes[i].vdisplay == 480 &&
>> + conn->modes[i].vrefresh == 60) {
>> + igt_info("found idx of failsafe mode = %d\n", i);
>> + break;
>> + }
>> + }
>> +
>> + if (i == conn->count_modes) {
>> + igt_info("didn't find failsafe using default\n");
>> + i = 0;
>> + }
>> +
>> + c->mode = c->connector->modes[i];
>> +
>> + width = c->mode.hdisplay;
>> + height = c->mode.vdisplay;
>> +
>> + fb_id = igt_create_pattern_fb(drm_fd, width, height,
>> + DRM_FORMAT_XRGB8888,
>> + tiling, &fb_info);
>> +
>> + kmstest_dump_mode(&c->mode);
>> + drmModeSetCrtc(drm_fd, c->crtc, -1, 0, 0, NULL, 0, NULL);
>> + ret = drmModeSetCrtc(drm_fd, c->crtc, fb_id, 0, 0,
>> + &c->id, 1, &c->mode);
>> + if (ret) {
>> + igt_warn("Failed to set mode (%dx%d@%dHz): %s\n",
>> + width, height, c->mode.vrefresh, strerror(errno));
>> + igt_remove_fb(drm_fd, &fb_info);
>> +
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +static uint32_t find_crtc_for_connector(drmModeConnector *c)
>> +{
>> + drmModeEncoder *e;
>> + drmModeCrtcPtr crtc_ptr;
>> + int i;
>> +
>> + active_crtc = 0;
>> +
>> + for (i = 0; i < c->count_encoders; i++) {
>> + e = drmModeGetEncoder(drm_fd, c->encoders[i]);
>> +
>> + /* if there is an active crtc use it */
>> + if (e->crtc_id) {
>> + active_crtc = e->crtc_id;
>> + drmModeFreeEncoder(e);
>> + break;
>> + }
>> + drmModeFreeEncoder(e);
>> + }
>> +
>> + /* no need to search further if active crtc is found */
>> + if (active_crtc)
>> + return active_crtc;
>> +
>> + /*
>> + * if there is no active crtc find one from the list of
>> + * unused ones. Cannot use anything from possible_crtc of
>> + * of encoder because it then tries to steal the crtc of the
>> + * primary display. DPU driver does not support switching CRTCs
>> + * across displays in the same commit. Hence need to find some
>> + * other unused crtc.
>> + */
>> + for (i = 0; i < resources->count_crtcs; i++) {
>> + crtc_ptr = drmModeGetCrtc(drm_fd, resources->crtcs[i]);
>> + /* if a crtc which is unused is found , use it */
>> + if (!crtc_ptr->mode_valid) {
>> + active_crtc = crtc_ptr->crtc_id;
>> + drmModeFreeCrtc(crtc_ptr);
>> + break;
>> + }
>> + drmModeFreeCrtc(crtc_ptr);
>> + }
>> +
>> + return active_crtc;
>> +}
>> +
>> +/*
>> + * Re-probe connectors and do a modeset based on test request or
>> + * in case of a hotplug uevent.
>> + *
>> + * @mode: Video mode requested by the test
>> + * @is_compliance_test: 1: If it is a compliance test
>> + * 0: If it is a hotplug event
>> + *
>> + * Returns:
>> + * 0: On Success
>> + * -1: On failure
>> + */
>> +int update_display(int mode, bool is_compliance_test)
>> +{
>> + struct connector *connectors, *conn;
>> + int cnt, ret = 0;
>> + bool set_mode;
>> + //int crtc;
>> +
>> + resources = drmModeGetResources(drm_fd);
>> + if (!resources) {
>> + igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
>> + return -1;
>> + }
>> +
>> + connectors = calloc(resources->count_connectors,
>> + sizeof(struct connector));
>> + if (!connectors)
>> + return -1;
>> +
>> + /* Find any connected displays */
>> + for (cnt = 0; cnt < resources->count_connectors; cnt++) {
>> + drmModeConnector *c;
>> +
>> + conn = &connectors[cnt];
>> + conn->id = resources->connectors[cnt];
>> + c = drmModeGetConnector(drm_fd, conn->id);
>> + if (c->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
>> + c->connection == DRM_MODE_CONNECTED) {
>> + test_connector_id = c->connector_id;
>> + conn->connector = c;
>> + conn->crtc = find_crtc_for_connector(c);
>> + test_crtc = conn->crtc;
>> + set_mode = true;
>> + break;
>> + } else if (c->connector_id == test_connector_id &&
>> + c->connection == DRM_MODE_DISCONNECTED) {
>> + conn->connector = c;
>> + conn->crtc = test_crtc;
>> + set_mode = false;
>> + break;
>> + }
>> + }
>> +
>> + if (cnt == resources->count_connectors) {
>> + ret = -1;
>> + goto err;
>> + }
>> +
>> + if (is_compliance_test) {
>> + set_test_mode(conn);
>> + ret = set_video(MSM_MODE_NONE, conn);
>> + ret = set_video(mode, conn);
>> +
>> + } else
>> + ret = set_default_mode(conn, set_mode);
>> +
>> + err:
>> + drmModeFreeConnector(conn->connector);
>> + /* Error condition if no connected displays */
>> + free(connectors);
>> + drmModeFreeResources(resources);
>> + return ret;
>> +}
>> +
>> +static const char optstr[] = "hi";
>> +
>> +static void __attribute__((noreturn)) usage(char *name, char opt)
>> +{
>> + igt_info("usage: %s [-hi]\n", name);
>> + igt_info("\t-i\tdump info\n");
>> + igt_info("\tDefault is to respond to Qd980 tests\n");
>> + exit((opt != 'h') ? -1 : 0);
>> +}
>> +
>> +static void cleanup_debugfs(void)
>> +{
>> + fclose(test_active_fp);
>> + fclose(test_data_fp);
>> + fclose(test_type_fp);
>> +}
>> +
>> +static void __attribute__((noreturn)) cleanup_and_exit(int ret)
>> +{
>> + cleanup_debugfs();
>> + close(drm_fd);
>> + igt_info("Compliance testing application exiting\n");
>> + exit(ret);
>> +}
>> +
>> +static void cleanup_test(void)
>> +{
>> + video_pattern_flag = false;
>> + hdisplay = 0;
>> + vdisplay = 0;
>> + bitdepth = 0;
>> +}
>> +
>> +static void read_test_request(void)
>> +{
>> + unsigned long test_type;
>> +
>> + test_type = get_test_type();
>> +
>> + process_test_request(test_type);
>> + cleanup_test();
>> + clear_test_active();
>> +}
>> +
>> +static gboolean test_handler(GIOChannel *source, GIOCondition
>> condition,
>> + gpointer data)
>> +{
>> + unsigned long test_active;
>> + int ret;
>> +
>> + rewind(test_active_fp);
>> +
>> + ret = fscanf(test_active_fp, "%lx", &test_active);
>> + if (ret < 1)
>> + return FALSE;
>> +
>> + if (test_active)
>> + read_test_request();
>> +
>> + return TRUE;
>> +}
>> +
>> +static gboolean input_event(GIOChannel *source, GIOCondition
>> condition,
>> + gpointer data)
>> +{
>> + gchar buf[2];
>> + gsize count;
>> +
>> + count = read(g_io_channel_unix_get_fd(source), buf, sizeof(buf));
>> + if (buf[0] == 'q' && (count == 1 || buf[1] == '\n'))
>> + cleanup_and_exit(0);
>> +
>> + return TRUE;
>> +}
>> +
>> +int main(int argc, char **argv)
>> +{
>> + int c;
>> + int ret = 0;
>> + GIOChannel *stdinchannel, *testactive_channel;
>> + GMainLoop *mainloop;
>> + bool opt_dump_info = false;
>> + struct option long_opts[] = {
>> + {"help-description", 0, 0, HELP_DESCRIPTION},
>> + {"help", 0, 0, 'h'},
>> + };
>> +
>> + enter_exec_path(argv);
>> +
>> + while ((c = getopt_long(argc, argv, optstr, long_opts, NULL)) != -1)
>> {
>> + switch (c) {
>> + case 'i':
>> + opt_dump_info = true;
>> + break;
>> + case HELP_DESCRIPTION:
>> + igt_info("DP Compliance Test Suite using Qd 980\n");
>> + igt_info("Video Pattern Generation tests\n");
>> + exit(0);
>> + break;
>> + default:
>> + /* fall through */
>> + case 'h':
>> + usage(argv[0], c);
>> + break;
>> + }
>> + }
>> +
>> + set_termio_mode();
>> +
>> + drm_fd = drm_open_driver(DRIVER_ANY);
>> +
>> + kmstest_set_vt_graphics_mode();
>> + setup_debugfs_files();
>> + cleanup_test();
>> + if (opt_dump_info) {
>> + dump_info();
>> + goto out_close;
>> + }
>> +
>> + /* Get the DP connector ID and CRTC */
>> + if (update_display(0, false)) {
>> + igt_warn("Failed to set default mode\n");
>> + ret = -1;
>> + goto out_close;
>> + }
>> +
>> + mainloop = g_main_loop_new(NULL, FALSE);
>> + if (!mainloop) {
>> + igt_warn("Failed to create GMainLoop\n");
>> + ret = -1;
>> + goto out_close;
>> + }
>> +
>> + if (!igt_dp_compliance_setup_hotplug()) {
>> + igt_warn("Failed to initialize hotplug support\n");
>> + goto out_mainloop;
>> + }
>> +
>> + testactive_channel = g_io_channel_unix_new(fileno(test_active_fp));
>> + if (!testactive_channel) {
>> + igt_warn("Failed to create test_active GIOChannel\n");
>> + goto out_close;
>> + }
>> +
>> + ret = g_io_add_watch(testactive_channel, G_IO_IN | G_IO_ERR,
>> + test_handler, NULL);
>> + if (ret < 0) {
>> + igt_warn("Failed to add watch on udev GIOChannel\n");
>> + goto out_close;
>> + }
>> +
>> + stdinchannel = g_io_channel_unix_new(0);
>> + if (!stdinchannel) {
>> + igt_warn("Failed to create stdin GIOChannel\n");
>> + goto out_hotplug;
>> + }
>> +
>> + ret = g_io_add_watch(stdinchannel, G_IO_IN | G_IO_ERR, input_event,
>> + NULL);
>> + if (ret < 0) {
>> + igt_warn("Failed to add watch on stdin GIOChannel\n");
>> + goto out_stdio;
>> + }
>> +
>> + ret = 0;
>> +
>> + igt_info("*************DP Compliance Testing using Qdbox
>> 980*************\n");
>> + igt_info("Waiting for test request......\n");
>> +
>> + g_main_loop_run(mainloop);
>> +
>> +out_stdio:
>> + g_io_channel_shutdown(stdinchannel, TRUE, NULL);
>> +out_hotplug:
>> + igt_dp_compliance_cleanup_hotplug();
>> +out_mainloop:
>> + g_main_loop_unref(mainloop);
>> +out_close:
>> + cleanup_debugfs();
>> + close(drm_fd);
>> +
>> + igt_assert_eq(ret, 0);
>> +
>> + igt_info("Compliance testing application exiting\n");
>> + igt_exit();
>> +}
>> --
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
>> Forum,
>> a Linux Foundation Collaborative Project
>>
>> _______________________________________________
>> igt-dev mailing list
>> igt-dev@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for Add support for video pattern DP CTS for MSM chipsets
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
` (4 preceding siblings ...)
2020-09-04 0:54 ` [igt-dev] [PATCH i-g-t 5/5] tools: add support for msm_dp_compliance to IGT Abhinav Kumar
@ 2020-09-04 1:20 ` Patchwork
2020-09-04 3:22 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2020-09-14 19:34 ` [igt-dev] [PATCH i-g-t 0/5] " abhinavk
7 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2020-09-04 1:20 UTC (permalink / raw)
To: Abhinav Kumar; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 3086 bytes --]
== Series Details ==
Series: Add support for video pattern DP CTS for MSM chipsets
URL : https://patchwork.freedesktop.org/series/81311/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8961 -> IGTPW_4950
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/index.html
Known issues
------------
Here are the changes found in IGTPW_4950 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/fi-bsw-kefka/igt@i915_pm_rpm@basic-pci-d3-state.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/fi-bsw-kefka/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_selftest@live@execlists:
- fi-icl-y: [PASS][3] -> [INCOMPLETE][4] ([i915#2276])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/fi-icl-y/igt@i915_selftest@live@execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/fi-icl-y/igt@i915_selftest@live@execlists.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- fi-icl-u2: [PASS][5] -> [DMESG-WARN][6] ([i915#1982]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html
#### Warnings ####
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-guc: [DMESG-FAIL][7] ([i915#2203]) -> [SKIP][8] ([fdo#109271])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#2417]: https://gitlab.freedesktop.org/drm/intel/issues/2417
Participating hosts (36 -> 33)
------------------------------
Missing (3): fi-byt-clapper fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5777 -> IGTPW_4950
CI-20190529: 20190529
CI_DRM_8961: a9f0150a8c09b7ea3802c923c599f3a1e4d27144 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4950: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/index.html
IGT_5777: c240b5c00d58860e376b012cc3c883c17ae63f37 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/index.html
[-- Attachment #1.2: Type: text/html, Size: 3769 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread* [igt-dev] ✓ Fi.CI.IGT: success for Add support for video pattern DP CTS for MSM chipsets
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
` (5 preceding siblings ...)
2020-09-04 1:20 ` [igt-dev] ✓ Fi.CI.BAT: success for Add support for video pattern DP CTS for MSM chipsets Patchwork
@ 2020-09-04 3:22 ` Patchwork
2020-09-14 19:34 ` [igt-dev] [PATCH i-g-t 0/5] " abhinavk
7 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2020-09-04 3:22 UTC (permalink / raw)
To: Abhinav Kumar; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 13740 bytes --]
== Series Details ==
Series: Add support for video pattern DP CTS for MSM chipsets
URL : https://patchwork.freedesktop.org/series/81311/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8961_full -> IGTPW_4950_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/index.html
Known issues
------------
Here are the changes found in IGTPW_4950_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-wc-read:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([i915#1635] / [i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-apl3/igt@gem_exec_reloc@basic-wc-read.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-apl7/igt@gem_exec_reloc@basic-wc-read.html
* igt@gem_exec_whisper@basic-contexts-all:
- shard-glk: [PASS][3] -> [DMESG-WARN][4] ([i915#118] / [i915#95])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk4/igt@gem_exec_whisper@basic-contexts-all.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk6/igt@gem_exec_whisper@basic-contexts-all.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][5] -> [DMESG-WARN][6] ([i915#180]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-kbl1/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-kbl7/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2346])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy:
- shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([i915#1982]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-kbl7/igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-kbl1/igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-cpu:
- shard-glk: [PASS][11] -> [FAIL][12] ([i915#49])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-cpu.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk8/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@psr-farfromfence:
- shard-tglb: [PASS][13] -> [DMESG-WARN][14] ([i915#1982]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-tglb2/igt@kms_frontbuffer_tracking@psr-farfromfence.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-tglb7/igt@kms_frontbuffer_tracking@psr-farfromfence.html
* igt@kms_panel_fitting@atomic-fastset:
- shard-tglb: [PASS][15] -> [FAIL][16] ([i915#83])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-tglb3/igt@kms_panel_fitting@atomic-fastset.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-tglb1/igt@kms_panel_fitting@atomic-fastset.html
- shard-iclb: [PASS][17] -> [FAIL][18] ([i915#83])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-iclb6/igt@kms_panel_fitting@atomic-fastset.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-iclb1/igt@kms_panel_fitting@atomic-fastset.html
* igt@kms_psr2_su@page_flip:
- shard-tglb: [PASS][19] -> [SKIP][20] ([i915#1911])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-tglb5/igt@kms_psr2_su@page_flip.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-tglb5/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_basic:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-iclb2/igt@kms_psr@psr2_basic.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-iclb3/igt@kms_psr@psr2_basic.html
* igt@perf@polling-parameterized:
- shard-glk: [PASS][23] -> [FAIL][24] ([i915#1542])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk6/igt@perf@polling-parameterized.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk2/igt@perf@polling-parameterized.html
- shard-iclb: [PASS][25] -> [FAIL][26] ([i915#1542])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-iclb6/igt@perf@polling-parameterized.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-iclb3/igt@perf@polling-parameterized.html
#### Possible fixes ####
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [FAIL][27] ([i915#2389]) -> [PASS][28] +2 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk1/igt@gem_exec_reloc@basic-many-active@vecs0.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk5/igt@gem_exec_reloc@basic-many-active@vecs0.html
* igt@gem_exec_whisper@basic-queues-forked:
- shard-glk: [DMESG-WARN][29] ([i915#118] / [i915#95]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk4/igt@gem_exec_whisper@basic-queues-forked.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk3/igt@gem_exec_whisper@basic-queues-forked.html
* igt@gen9_exec_parse@allowed-all:
- shard-kbl: [DMESG-WARN][31] ([i915#1436] / [i915#716]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-kbl1/igt@gen9_exec_parse@allowed-all.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-kbl7/igt@gen9_exec_parse@allowed-all.html
* igt@i915_selftest@mock@contexts:
- shard-apl: [INCOMPLETE][33] ([i915#1635] / [i915#2278]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-apl8/igt@i915_selftest@mock@contexts.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-apl2/igt@i915_selftest@mock@contexts.html
* igt@kms_big_fb@x-tiled-8bpp-rotate-0:
- shard-kbl: [DMESG-WARN][35] ([i915#1982]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-kbl4/igt@kms_big_fb@x-tiled-8bpp-rotate-0.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-kbl7/igt@kms_big_fb@x-tiled-8bpp-rotate-0.html
* igt@kms_flip@2x-modeset-vs-vblank-race@bc-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][37] ([i915#407]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk2/igt@kms_flip@2x-modeset-vs-vblank-race@bc-hdmi-a1-hdmi-a2.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk7/igt@kms_flip@2x-modeset-vs-vblank-race@bc-hdmi-a1-hdmi-a2.html
* igt@kms_flip@2x-plain-flip-ts-check@ab-vga1-hdmi-a1:
- shard-hsw: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-hsw6/igt@kms_flip@2x-plain-flip-ts-check@ab-vga1-hdmi-a1.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-hsw8/igt@kms_flip@2x-plain-flip-ts-check@ab-vga1-hdmi-a1.html
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][41] ([i915#180]) -> [PASS][42] +5 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-kbl4/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
* igt@kms_frontbuffer_tracking@fbc-1p-indfb-fliptrack:
- shard-glk: [FAIL][43] ([i915#49]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk6/igt@kms_frontbuffer_tracking@fbc-1p-indfb-fliptrack.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk4/igt@kms_frontbuffer_tracking@fbc-1p-indfb-fliptrack.html
* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-wc:
- shard-snb: [SKIP][45] ([fdo#109271]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-snb4/igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-wc.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-snb2/igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-render:
- shard-tglb: [DMESG-WARN][47] ([i915#1982]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-render.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-render.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50] +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_vblank@pipe-b-query-forked-hang:
- shard-glk: [INCOMPLETE][51] -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-glk5/igt@kms_vblank@pipe-b-query-forked-hang.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-glk5/igt@kms_vblank@pipe-b-query-forked-hang.html
* igt@kms_vblank@pipe-c-query-busy-hang:
- shard-apl: [DMESG-WARN][53] ([i915#1635] / [i915#1982]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-apl1/igt@kms_vblank@pipe-c-query-busy-hang.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-apl7/igt@kms_vblank@pipe-c-query-busy-hang.html
#### Warnings ####
* igt@kms_content_protection@atomic-dpms:
- shard-apl: [TIMEOUT][55] ([i915#1319] / [i915#1635]) -> [TIMEOUT][56] ([i915#1319] / [i915#1635] / [i915#1958])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-apl1/igt@kms_content_protection@atomic-dpms.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-apl4/igt@kms_content_protection@atomic-dpms.html
* igt@kms_content_protection@lic:
- shard-apl: [FAIL][57] ([fdo#110321] / [i915#1635]) -> [TIMEOUT][58] ([i915#1319] / [i915#1635] / [i915#1958])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-apl1/igt@kms_content_protection@lic.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-apl3/igt@kms_content_protection@lic.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-apl: [DMESG-FAIL][59] ([fdo#108145] / [i915#1635] / [i915#1982]) -> [FAIL][60] ([fdo#108145] / [i915#1635] / [i915#265]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8961/shard-apl6/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/shard-apl3/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.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#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1911]: https://gitlab.freedesktop.org/drm/intel/issues/1911
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2278]: https://gitlab.freedesktop.org/drm/intel/issues/2278
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#407]: https://gitlab.freedesktop.org/drm/intel/issues/407
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#83]: https://gitlab.freedesktop.org/drm/intel/issues/83
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 8)
------------------------------
Missing (2): pig-skl-6260u pig-glk-j5005
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5777 -> IGTPW_4950
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_8961: a9f0150a8c09b7ea3802c923c599f3a1e4d27144 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4950: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/index.html
IGT_5777: c240b5c00d58860e376b012cc3c883c17ae63f37 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4950/index.html
[-- Attachment #1.2: Type: text/html, Size: 16797 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets
2020-09-04 0:54 [igt-dev] [PATCH i-g-t 0/5] Add support for video pattern DP CTS for MSM chipsets Abhinav Kumar
` (6 preceding siblings ...)
2020-09-04 3:22 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2020-09-14 19:34 ` abhinavk
7 siblings, 0 replies; 16+ messages in thread
From: abhinavk @ 2020-09-14 19:34 UTC (permalink / raw)
To: igt-dev; +Cc: tanmay, swboyd, khsieh, nganji, seanpaul, aravindh
Hello
Can we get some reviews on this series please?
Thanks
Abhinav
On 2020-09-03 17:54, Abhinav Kumar wrote:
> This series adds support for video pattern DP compliance tests for
> MSM chipsets. The driver side changes for this have been pushed here
> [1].
> The changes mostly involve cleanup to move useful APIs to common libs
> so
> that other compliance modules can use them and also leveraging the
> design
> of intel_dp_compliance to add support for video pattern tests for MSM
> chipsets.
>
> [1] https://patchwork.kernel.org/project/dri-devel/list/?series=343255
>
> Abhinav Kumar (5):
> tools: rename intel_dp_compliance_hotplug to
> igt_dp_compliance_hotplug
> lib/igt_kms: move some of the useful dump functions to igt_kms
> lib/igt_fb: move the CTS fill framebuffer to igt_fb lib
> tools: move terminal utility functions to a separate file
> tools: add support for msm_dp_compliance to IGT
>
> lib/igt_fb.c | 65 ++
> lib/igt_fb.h | 3 +
> lib/igt_kms.c | 92 ++
> lib/igt_kms.h | 5 +
> tools/Makefile.am | 4 +
> tools/Makefile.sources | 11 +-
> tools/igt_compliance_utils.c | 82 ++
> ...el_dp_compliance.h => igt_dp_compliance.h} | 13 +-
> ..._hotplug.c => igt_dp_compliance_hotplug.c} | 9 +-
> tools/intel_dp_compliance.c | 216 +----
> tools/meson.build | 15 +-
> tools/msm_dp_compliance.c | 812 ++++++++++++++++++
> 12 files changed, 1118 insertions(+), 209 deletions(-)
> create mode 100644 tools/igt_compliance_utils.c
> rename tools/{intel_dp_compliance.h => igt_dp_compliance.h} (80%)
> rename tools/{intel_dp_compliance_hotplug.c =>
> igt_dp_compliance_hotplug.c} (93%)
> create mode 100644 tools/msm_dp_compliance.c
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread