From b85f0cbff9b6fb4fb87914be8a77bd6ac8c0ac40 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 11 Jun 2019 13:42:05 +1200 Subject: [PATCH] Remove WLR_DRM_NO_ATOMIC_GAMMA workaround This is fixed on amdgpu, so we don't need this anymore. --- backend/drm/atomic.c | 6 +----- docs/env_vars.md | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index 8ce1e1e6f..ad5ee6e2c 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -211,11 +211,7 @@ static bool atomic_crtc_set_gamma(struct wlr_drm_backend *drm, 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 GPUs that support gamma but not degamma). - // TEMP: This is broken on AMDGPU. Provide a fallback to legacy until they - // get it fixed. Ref https://bugs.freedesktop.org/show_bug.cgi?id=107459 - const char *no_atomic_str = getenv("WLR_DRM_NO_ATOMIC_GAMMA"); - bool no_atomic = no_atomic_str != NULL && strcmp(no_atomic_str, "1") == 0; - if (crtc->props.gamma_lut == 0 || no_atomic) { + if (crtc->props.gamma_lut == 0) { return legacy_iface.crtc_set_gamma(drm, crtc, size, r, g, b); } diff --git a/docs/env_vars.md b/docs/env_vars.md index 81f69b909..2553d2926 100644 --- a/docs/env_vars.md +++ b/docs/env_vars.md @@ -7,8 +7,6 @@ wlroots reads these environment variables considered the primary DRM device. * *WLR_DRM_NO_ATOMIC*: set to 1 to use legacy DRM interface instead of atomic mode setting -* *WLR_DRM_NO_ATOMIC_GAMMA*: set to 1 to use legacy DRM interface for gamma - control instead of the atomic interface * *WLR_LIBINPUT_NO_DEVICES*: set to 1 to not fail without any input devices * *WLR_BACKENDS*: comma-separated list of backends to use (available backends: wayland, x11, headless, noop)