summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo (Sunpeng) Li <sunpeng.li@amd.com>2018-03-27 16:41:17 -0400
committerLeo (Sunpeng) Li <sunpeng.li@amd.com>2018-05-02 10:13:31 -0400
commit438cfb1a26c4b74bf04835e941f2794015fa7091 (patch)
tree34f2381b0ae95cff51f1e4768da3fd4e7c389683
parentea836d27facfab5659dacd9b7a1ad5447dee6389 (diff)
Update comments in main()
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
-rw-r--r--Makefile3
-rw-r--r--demo.c22
2 files changed, 19 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 617f3b3..fc5e3bd 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ CFLAGS=-g -Wall
CC=gcc
LDFLAGS=$(shell pkg-config --cflags libdrm)
+
+# Required libs are libdrm, x11, and xrandr. The math library is used for
+# generating some example gamma LUTs.
LDLIBS = $(shell pkg-config --libs libdrm x11 xrandr) -lm
# All sources
diff --git a/demo.c b/demo.c
index 632e84e..1db6460 100644
--- a/demo.c
+++ b/demo.c
@@ -621,6 +621,10 @@ const char *HELP_STR =
int main(int argc, char *const argv[])
{
+ /* These coefficient arrays store an intermediary form of the DRM blob
+ * to be set. They will be translated into the format that DRM expects
+ * when they are given to libdrm to be created within the kernel.
+ */
struct color3d degamma_coeffs[LUT_SIZE];
double ctm_coeffs[9];
struct color3d regamma_coeffs[LUT_SIZE];
@@ -628,6 +632,7 @@ int main(int argc, char *const argv[])
int drm_fd;
int ret = 0;
+ /* Things needed by xrandr to change output properties */
Display *dpy;
Window root;
XRRScreenResources *res;
@@ -637,7 +642,6 @@ int main(int argc, char *const argv[])
/*
* Parse arguments
*/
-
int opt = -1;
char *degamma_opt = NULL;
char *ctm_opt = NULL;
@@ -664,21 +668,20 @@ int main(int argc, char *const argv[])
}
}
- /* Parse the input, and create an intermediate 'coefficient' form of
- * the blob. Further translation is needed before the blob can be
- * interpreted by DRM.
- */
+ /* Parse the input, and generate the intermediate coefficient arrays */
degamma_changed = parse_user_degamma(degamma_opt, degamma_coeffs,
&degamma_is_srgb);
ctm_changed = parse_user_ctm(ctm_opt, ctm_coeffs);
regamma_changed = parse_user_regamma(regamma_opt, regamma_coeffs,
&regamma_is_srgb);
+ /* Print help if input is not as expected */
if (!degamma_changed && !ctm_changed && !regamma_changed) {
printf("%s", SHORT_HELP_STR);
return 0;
}
+ /* Open DRM device, and obtain file descriptor */
drm_fd = open_drm_device();
if (drm_fd == -1) {
printf("No valid devices found\n");
@@ -686,17 +689,23 @@ int main(int argc, char *const argv[])
return -1;
}
- /* Open the default display and window*/
+ /* Open the default X display and window, then obtain the RandR screen
+ * resource. */
dpy = XOpenDisplay(NULL);
root = DefaultRootWindow(dpy);
res = XRRGetScreenResourcesCurrent(dpy, root);
+ /* RandR needs to know which output we're setting the property on.
+ * Since we only have a name to work with, find the RROutput using the
+ * name. */
output = find_output_by_name(dpy, res, "DisplayPort-0");
if (!output) {
printf("Cannot find output!\n");
goto done;
}
+ /* Set the properties as parsed. The set_* functions will also
+ * translate the coefficients. */
if (degamma_changed) {
ret = set_gamma(dpy, output, drm_fd,
degamma_coeffs, degamma_is_srgb, 1);
@@ -716,6 +725,7 @@ int main(int argc, char *const argv[])
}
done:
+ /* Ensure proper cleanup */
XRRFreeScreenResources(res);
XCloseDisplay(dpy);
close(drm_fd);