diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/atomic.c | 17 | ||||
| -rw-r--r-- | backend/drm/drm.c | 40 | ||||
| -rw-r--r-- | backend/drm/legacy.c | 10 |
3 files changed, 39 insertions, 28 deletions
diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index 90acac25..5c064ac7 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -200,14 +200,14 @@ 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 wlr_drm_crtc *crtc, size_t size, + uint16_t *r, uint16_t *g, uint16_t *b) { // Fallback to legacy gamma interface when gamma properties are not available // (can happen on older intel gpu's that support gamma but not degamma) // TEMP: This is broken on AMDGPU. Always fallback to legacy until they get // it fixed. Ref https://bugs.freedesktop.org/show_bug.cgi?id=107459 if (crtc->props.gamma_lut == 0 || true) { - return legacy_iface.crtc_set_gamma(drm, crtc, r, g, b, size); + return legacy_iface.crtc_set_gamma(drm, crtc, size, r, g, b); } struct drm_color_lut *gamma = malloc(size * sizeof(struct drm_color_lut)); @@ -216,7 +216,7 @@ static bool atomic_crtc_set_gamma(struct wlr_drm_backend *drm, return false; } - for (uint32_t i = 0; i < size; i++) { + for (size_t i = 0; i < size; i++) { gamma[i].red = r[i]; gamma[i].green = g[i]; gamma[i].blue = b[i]; @@ -240,21 +240,20 @@ static bool atomic_crtc_set_gamma(struct wlr_drm_backend *drm, return atomic_end(drm->fd, &atom); } -static uint32_t atomic_crtc_get_gamma_size(struct wlr_drm_backend *drm, +static size_t atomic_crtc_get_gamma_size(struct wlr_drm_backend *drm, struct wlr_drm_crtc *crtc) { - uint64_t gamma_lut_size; - if (crtc->props.gamma_lut_size == 0) { return legacy_iface.crtc_get_gamma_size(drm, crtc); } + uint64_t gamma_lut_size; if (!get_drm_prop(drm->fd, crtc->id, crtc->props.gamma_lut_size, - &gamma_lut_size)) { + &gamma_lut_size)) { wlr_log(WLR_ERROR, "Unable to get gamma lut size"); return 0; } - return (uint32_t)gamma_lut_size; + return (size_t)gamma_lut_size; } const struct wlr_drm_interface atomic_iface = { diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 110c2229..ac7fca02 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -251,7 +251,7 @@ static bool drm_connector_swap_buffers(struct wlr_output *output, return true; } -static void fill_empty_gamma_table(uint32_t size, +static void fill_empty_gamma_table(size_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 * i / (size - 1); @@ -259,7 +259,7 @@ static void fill_empty_gamma_table(uint32_t size, } } -static uint32_t drm_connector_get_gamma_size(struct wlr_output *output) { +static size_t drm_connector_get_gamma_size(struct wlr_output *output) { struct wlr_drm_connector *conn = get_drm_connector_from_output(output); struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend); @@ -270,8 +270,8 @@ 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) { +static bool drm_connector_set_gamma(struct wlr_output *output, size_t size, + const uint16_t *r, const uint16_t *g, const uint16_t *b) { struct wlr_drm_connector *conn = get_drm_connector_from_output(output); struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend); @@ -279,25 +279,37 @@ static bool drm_connector_set_gamma(struct wlr_output *output, return false; } - uint16_t *reset_table = NULL; + bool reset = false; if (size == 0) { + reset = true; 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"); + if (size == 0) { 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); + uint16_t *gamma_table = malloc(3 * size * sizeof(uint16_t)); + if (gamma_table == NULL) { + wlr_log(WLR_ERROR, "Failed to allocate gamma table"); + return false; + } + uint16_t *_r = gamma_table; + uint16_t *_g = gamma_table + size; + uint16_t *_b = gamma_table + 2 * size; + + if (reset) { + fill_empty_gamma_table(size, _r, _g, _b); + } else { + memcpy(_r, r, size * sizeof(uint16_t)); + memcpy(_g, g, size * sizeof(uint16_t)); + memcpy(_b, b, size * sizeof(uint16_t)); + } + + bool ok = drm->iface->crtc_set_gamma(drm, conn->crtc, size, _r, _g, _b); if (ok) { wlr_output_update_needs_swap(output); } - free(reset_table); + free(gamma_table); return ok; } diff --git a/backend/drm/legacy.c b/backend/drm/legacy.c index c205e167..182c7a95 100644 --- a/backend/drm/legacy.c +++ b/backend/drm/legacy.c @@ -63,14 +63,14 @@ bool legacy_crtc_move_cursor(struct wlr_drm_backend *drm, } bool legacy_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) { - return !drmModeCrtcSetGamma(drm->fd, crtc->id, size, r, g, b); + struct wlr_drm_crtc *crtc, size_t size, + uint16_t *r, uint16_t *g, uint16_t *b) { + return !drmModeCrtcSetGamma(drm->fd, crtc->id, (uint32_t)size, r, g, b); } -uint32_t legacy_crtc_get_gamma_size(struct wlr_drm_backend *drm, +size_t legacy_crtc_get_gamma_size(struct wlr_drm_backend *drm, struct wlr_drm_crtc *crtc) { - return crtc->legacy_crtc->gamma_size; + return (size_t)crtc->legacy_crtc->gamma_size; } const struct wlr_drm_interface legacy_iface = { |