From: Simon Ser <simon.ser@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: martin.peres@intel.com
Subject: [igt-dev] [PATCH i-g-t v2 2/9] lib/igt_chamelium: fix chamelium_port_set_edid docs
Date: Wed, 19 Jun 2019 18:55:11 +0300 [thread overview]
Message-ID: <20190619155518.25129-3-simon.ser@intel.com> (raw)
In-Reply-To: <20190619155518.25129-1-simon.ser@intel.com>
There were two issues:
1. The documentation was wrong, the EDID ID 0 doesn't disable EDIDs, it just
resets the EDID to Chamelium's default one.
2. My previous patch updating these docs missed the second line of the argument
description. The result was that only reading the first line was fine, but
reading both lines felt weird.
Signed-off-by: Simon Ser <simon.ser@intel.com>
Fixes: 1f67ee0d09d6 ("lib/igt_chamelium: replace EDID IDs with opaque structs")
---
lib/igt_chamelium.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
index 966d78dce146..4a3f64b3585d 100644
--- a/lib/igt_chamelium.c
+++ b/lib/igt_chamelium.c
@@ -564,21 +564,22 @@ static void chamelium_destroy_edid(struct chamelium *chamelium, int edid_id)
* chamelium_port_set_edid:
* @chamelium: The Chamelium instance to use
* @port: The port on the Chamelium to set the EDID on
- * @edid: The Chamelium EDID to set
- * #chamelium_new_edid, or 0 to disable the EDID on the port
+ * @edid: The Chamelium EDID to set or NULL to use the default Chamelium EDID
*
* Sets a port on the chamelium to use the specified EDID. This does not fire a
* hotplug pulse on it's own, and merely changes what EDID the chamelium port
* will report to us the next time we probe it. Users will need to reprobe the
* connectors themselves if they want to see the EDID reported by the port
* change.
+ *
+ * To create an EDID, see #chamelium_new_edid.
*/
void chamelium_port_set_edid(struct chamelium *chamelium,
struct chamelium_port *port,
struct chamelium_edid *edid)
{
xmlrpc_DECREF(chamelium_rpc(chamelium, NULL, "ApplyEdid", "(ii)",
- port->id, edid->id));
+ port->id, edid ? edid->id : 0));
}
/**
--
2.22.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-06-19 15:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 15:55 [igt-dev] [PATCH i-g-t v2 0/9] Chamelium port mapping auto-discovery Simon Ser
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 1/9] lib/igt_edid: add edid_get_size Simon Ser
2019-06-19 15:55 ` Simon Ser [this message]
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 3/9] lib/igt_chamelium: allow EDIDs to be mutated for each port Simon Ser
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 4/9] lib/igt_chamelium: split chmelium_new_edid Simon Ser
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 5/9] lib/igt_chamelium: add CHAMELIUM_MAX_PORTS Simon Ser
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 6/9] lib/igt_chamelium: upload one EDID per port Simon Ser
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 7/9] lib/igt_chamelium: set EDID serial Simon Ser
2019-06-24 12:16 ` Arkadiusz Hiler
2019-06-25 8:06 ` Ser, Simon
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 8/9] lib/igt_edid: add edid_get_mfg Simon Ser
2019-06-19 15:55 ` [igt-dev] [PATCH i-g-t v2 9/9] lib/igt_chamelium: autodiscover Chamelium port mappings Simon Ser
2019-06-20 8:40 ` [igt-dev] [PATCH i-g-t v3] " Simon Ser
2019-06-24 13:22 ` [igt-dev] [PATCH i-g-t v2 9/9] " Arkadiusz Hiler
2019-06-24 14:15 ` Ser, Simon
2019-06-25 7:03 ` Arkadiusz Hiler
2019-06-25 7:23 ` Ser, Simon
2019-06-19 17:38 ` [igt-dev] ✗ Fi.CI.BAT: failure for Chamelium port mapping auto-discovery Patchwork
2019-06-20 10:53 ` [igt-dev] ✓ Fi.CI.BAT: success for Chamelium port mapping auto-discovery (rev2) Patchwork
2019-06-24 8:58 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2019-06-24 9:32 ` Ser, Simon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190619155518.25129-3-simon.ser@intel.com \
--to=simon.ser@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=martin.peres@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox