From cc1229e75e0c0c2cf5ae6d67bc7411c2631deb86 Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer Date: Thu, 1 Feb 2018 20:27:35 +0100 Subject: Add atomic gamma setting --- include/backend/drm/drm.h | 5 ++++- include/backend/drm/iface.h | 4 ++++ include/backend/drm/properties.h | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'include/backend/drm') diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index af472ede..782764c8 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -39,7 +39,10 @@ struct wlr_drm_plane { struct wlr_drm_crtc { uint32_t id; - uint32_t mode_id; // atomic modesetting only + + // Atomic modesetting only + uint32_t mode_id; + uint32_t gamma_lut; drmModeAtomicReq *atomic; union { diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index 4a5d2e9d..228b313a 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -27,6 +27,10 @@ struct wlr_drm_interface { // Move the cursor on crtc bool (*crtc_move_cursor)(struct wlr_drm_backend *drm, struct wlr_drm_crtc *crtc, int x, int y); + // Set the gamma lut on crtc + bool (*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); }; extern const struct wlr_drm_interface atomic_iface; diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h index 7de386ea..119d24c3 100644 --- a/include/backend/drm/properties.h +++ b/include/backend/drm/properties.h @@ -32,8 +32,9 @@ union wlr_drm_crtc_props { uint32_t active; uint32_t mode_id; + uint32_t gamma_lut; }; - uint32_t props[4]; + uint32_t props[5]; }; union wlr_drm_plane_props { -- cgit v1.2.3 From ab011406add31c518f6f352189b1dc6246a74fdb Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer Date: Sun, 4 Feb 2018 21:03:44 +0100 Subject: Add atomic gamma lut size fetching Legacy gamma lut size now uses the new legacy_crtc member of wlr_drm_crtc. This was Previously doen using old_crtc in wlr_drm_connector, but since this refers to the crtc that was connected to the ouput, this could give the wrong result. --- backend/drm/atomic.c | 14 ++++++++++++++ backend/drm/drm.c | 6 ++++-- backend/drm/legacy.c | 5 +++++ backend/drm/properties.c | 11 ++++++----- include/backend/drm/drm.h | 3 +++ include/backend/drm/iface.h | 3 +++ include/backend/drm/properties.h | 3 ++- 7 files changed, 37 insertions(+), 8 deletions(-) (limited to 'include/backend/drm') diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index a8003492..79765fef 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -226,10 +226,24 @@ 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, + struct wlr_drm_crtc *crtc) { + uint64_t gamma_lut_size; + + if (!wlr_drm_get_prop(drm->fd, crtc->id, crtc->props.gamma_lut_size, + &gamma_lut_size)) { + wlr_log(L_ERROR, "Unable to get gamma lut size"); + return 0; + } + + return (uint32_t) gamma_lut_size; +} + const struct wlr_drm_interface atomic_iface = { .conn_enable = atomic_conn_enable, .crtc_pageflip = atomic_crtc_pageflip, .crtc_set_cursor = atomic_crtc_set_cursor, .crtc_move_cursor = atomic_crtc_move_cursor, .crtc_set_gamma = atomic_crtc_set_gamma, + .crtc_get_gamma_size = atomic_crtc_get_gamma_size, }; diff --git a/backend/drm/drm.c b/backend/drm/drm.c index abcfcf8a..eef1e333 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -140,6 +140,7 @@ bool wlr_drm_resources_init(struct wlr_drm_backend *drm) { for (size_t i = 0; i < drm->num_crtcs; ++i) { struct wlr_drm_crtc *crtc = &drm->crtcs[i]; crtc->id = res->crtcs[i]; + crtc->legacy_crtc = drmModeGetCrtc(drm->fd, crtc->id); wlr_drm_get_crtc_props(drm->fd, crtc->id, &crtc->props); } @@ -166,6 +167,7 @@ void wlr_drm_resources_free(struct wlr_drm_backend *drm) { for (size_t i = 0; i < drm->num_crtcs; ++i) { struct wlr_drm_crtc *crtc = &drm->crtcs[i]; drmModeAtomicFree(crtc->atomic); + drmModeFreeCrtc(crtc->legacy_crtc); if (crtc->mode_id) { drmModeDestroyPropertyBlob(drm->fd, crtc->mode_id); } @@ -235,8 +237,8 @@ static void wlr_drm_connector_set_gamma(struct wlr_output *output, static uint32_t wlr_drm_connector_get_gamma_size(struct wlr_output *output) { struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; - drmModeCrtc *crtc = conn->old_crtc; - return crtc ? crtc->gamma_size : 0; + struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend; + return drm->iface->crtc_get_gamma_size(drm, conn->crtc); } void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) { diff --git a/backend/drm/legacy.c b/backend/drm/legacy.c index 46911905..eec8c642 100644 --- a/backend/drm/legacy.c +++ b/backend/drm/legacy.c @@ -65,6 +65,10 @@ bool legacy_crtc_set_gamma(struct wlr_drm_backend *drm, return !drmModeCrtcSetGamma(drm->fd, crtc->id, size, r, g, b); } +uint32_t legacy_crtc_get_gamma_size(struct wlr_drm_backend *drm, + struct wlr_drm_crtc *crtc) { + return crtc->legacy_crtc->gamma_size; +} const struct wlr_drm_interface legacy_iface = { .conn_enable = legacy_conn_enable, @@ -72,4 +76,5 @@ const struct wlr_drm_interface legacy_iface = { .crtc_set_cursor = legacy_crtc_set_cursor, .crtc_move_cursor = legacy_crtc_move_cursor, .crtc_set_gamma = legacy_crtc_set_gamma, + .crtc_get_gamma_size = legacy_crtc_get_gamma_size, }; diff --git a/backend/drm/properties.c b/backend/drm/properties.c index c3efa96e..153e845e 100644 --- a/backend/drm/properties.c +++ b/backend/drm/properties.c @@ -27,11 +27,12 @@ static const struct prop_info connector_info[] = { static const struct prop_info crtc_info[] = { #define INDEX(name) (offsetof(union wlr_drm_crtc_props, name) / sizeof(uint32_t)) - { "ACTIVE", INDEX(active) }, - { "GAMMA_LUT", INDEX(gamma_lut) }, - { "MODE_ID", INDEX(mode_id) }, - { "rotation", INDEX(rotation) }, - { "scaling mode", INDEX(scaling_mode) }, + { "ACTIVE", INDEX(active) }, + { "GAMMA_LUT", INDEX(gamma_lut) }, + { "GAMMA_LUT_SIZE", INDEX(gamma_lut_size) }, + { "MODE_ID", INDEX(mode_id) }, + { "rotation", INDEX(rotation) }, + { "scaling mode", INDEX(scaling_mode) }, #undef INDEX }; diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 782764c8..12530da6 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -45,6 +45,9 @@ struct wlr_drm_crtc { uint32_t gamma_lut; drmModeAtomicReq *atomic; + // Legacy only + drmModeCrtc *legacy_crtc; + union { struct { struct wlr_drm_plane *overlay; diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index 228b313a..15cdf1ab 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -31,6 +31,9 @@ struct wlr_drm_interface { bool (*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); + // Get the gamma lut size of a crtc + uint32_t (*crtc_get_gamma_size)(struct wlr_drm_backend *drm, + struct wlr_drm_crtc *crtc); }; extern const struct wlr_drm_interface atomic_iface; diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h index 119d24c3..3cf8cc87 100644 --- a/include/backend/drm/properties.h +++ b/include/backend/drm/properties.h @@ -33,8 +33,9 @@ union wlr_drm_crtc_props { uint32_t active; uint32_t mode_id; uint32_t gamma_lut; + uint32_t gamma_lut_size; }; - uint32_t props[5]; + uint32_t props[6]; }; union wlr_drm_plane_props { -- cgit v1.2.3