From a149c2370afa995968fde78721c36bb59e8e4b59 Mon Sep 17 00:00:00 2001 From: emersion Date: Sun, 22 Jul 2018 13:23:32 +0100 Subject: Implement wlr-gamma-control-unstable-v1 --- backend/drm/atomic.c | 12 +++++++++--- backend/drm/drm.c | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'backend/drm') diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index 61d2f6e1..40a272a1 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -199,14 +199,18 @@ static bool atomic_crtc_move_cursor(struct wlr_drm_backend *drm, static bool atomic_crtc_set_gamma(struct wlr_drm_backend *drm, struct wlr_drm_crtc *crtc, uint16_t *r, uint16_t *g, uint16_t *b, uint32_t size) { - struct drm_color_lut gamma[size]; - // Fallback to legacy gamma interface when gamma properties are not available // (can happen on older intel gpu's that support gamma but not degamma) if (crtc->props.gamma_lut == 0) { return legacy_iface.crtc_set_gamma(drm, crtc, r, g, b, size); } + struct drm_color_lut *gamma = malloc(size * sizeof(struct drm_color_lut)); + if (gamma == NULL) { + wlr_log(WLR_ERROR, "Failed to allocate gamma table"); + return false; + } + for (uint32_t i = 0; i < size; i++) { gamma[i].red = r[i]; gamma[i].green = g[i]; @@ -218,10 +222,12 @@ static bool atomic_crtc_set_gamma(struct wlr_drm_backend *drm, } if (drmModeCreatePropertyBlob(drm->fd, gamma, - sizeof(struct drm_color_lut) * size, &crtc->gamma_lut)) { + size * sizeof(struct drm_color_lut), &crtc->gamma_lut)) { + free(gamma); wlr_log_errno(WLR_ERROR, "Unable to create property blob"); return false; } + free(gamma); struct atomic atom; atomic_begin(crtc, &atom); diff --git a/backend/drm/drm.c b/backend/drm/drm.c index c4674235..3e6659f1 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -228,19 +228,19 @@ static bool drm_connector_swap_buffers(struct wlr_output *output, return true; } -static void drm_connector_set_gamma(struct wlr_output *output, +static bool drm_connector_set_gamma(struct wlr_output *output, uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) { struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend; - bool ok; + bool ok = false; if (conn->crtc) { ok = drm->iface->crtc_set_gamma(drm, conn->crtc, r, g, b, size); if (ok) { wlr_output_update_needs_swap(output); } } - + return ok; } static uint32_t drm_connector_get_gamma_size(struct wlr_output *output) { -- cgit v1.2.3 From 2ebecb6727b55dbdfe067d27bdb1679014e66879 Mon Sep 17 00:00:00 2001 From: emersion Date: Sun, 22 Jul 2018 17:37:01 +0100 Subject: backend/drm: allow to pass empty gamma ramp to reset it --- backend/drm/drm.c | 48 +++++++++++++++++++++++++++++++----------- include/wlr/types/wlr_output.h | 2 ++ 2 files changed, 38 insertions(+), 12 deletions(-) (limited to 'backend/drm') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 3e6659f1..ce5a1640 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -228,19 +228,12 @@ static bool drm_connector_swap_buffers(struct wlr_output *output, return true; } -static bool drm_connector_set_gamma(struct wlr_output *output, - uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) { - struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; - struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend; - - bool ok = false; - if (conn->crtc) { - ok = drm->iface->crtc_set_gamma(drm, conn->crtc, r, g, b, size); - if (ok) { - wlr_output_update_needs_swap(output); - } +static void fill_empty_gamma_table(uint32_t size, + uint16_t *r, uint16_t *g, uint16_t *b) { + for (uint32_t i = 0; i < size; ++i) { + uint16_t val = (uint32_t)0xffff * (uint32_t)i / (uint32_t)(size - 1); + r[i] = g[i] = b[i] = val; } - return ok; } static uint32_t drm_connector_get_gamma_size(struct wlr_output *output) { @@ -254,6 +247,37 @@ static uint32_t drm_connector_get_gamma_size(struct wlr_output *output) { return 0; } +static bool drm_connector_set_gamma(struct wlr_output *output, + uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) { + struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; + struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend; + + if (!conn->crtc) { + return false; + } + + uint16_t *reset_table = NULL; + if (size == 0) { + size = drm_connector_get_gamma_size(output); + reset_table = malloc(3 * size * sizeof(uint16_t)); + if (reset_table == NULL) { + wlr_log(WLR_ERROR, "Failed to allocate gamma table"); + return false; + } + r = reset_table; + g = reset_table + size; + b = reset_table + 2 * size; + fill_empty_gamma_table(size, r, g, b); + } + + bool ok = drm->iface->crtc_set_gamma(drm, conn->crtc, r, g, b, size); + if (ok) { + wlr_output_update_needs_swap(output); + } + free(reset_table); + return ok; +} + static bool drm_connector_export_dmabuf(struct wlr_output *output, struct wlr_dmabuf_attributes *attribs) { struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index e9f3ae3b..3a9f3c41 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -182,6 +182,8 @@ uint32_t wlr_output_get_gamma_size(struct wlr_output *output); * Sets the gamma table for this output. `r`, `g` and `b` are gamma ramps for * red, green and blue. `size` is the length of the ramps and must not exceed * the value returned by `wlr_output_get_gamma_size`. + * + * Providing zero-sized ramps resets the gamma table. */ bool wlr_output_set_gamma(struct wlr_output *output, uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b); -- cgit v1.2.3 From 364afced3e944db97b1f4534f161541478319d69 Mon Sep 17 00:00:00 2001 From: emersion Date: Sun, 22 Jul 2018 22:57:22 +0100 Subject: backend/drm: remove unnecessary casts --- backend/drm/drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backend/drm') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index ce5a1640..9d030dff 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -231,7 +231,7 @@ static bool drm_connector_swap_buffers(struct wlr_output *output, static void fill_empty_gamma_table(uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) { for (uint32_t i = 0; i < size; ++i) { - uint16_t val = (uint32_t)0xffff * (uint32_t)i / (uint32_t)(size - 1); + uint16_t val = (uint32_t)0xffff * i / (size - 1); r[i] = g[i] = b[i] = val; } } -- cgit v1.2.3