aboutsummaryrefslogtreecommitdiff
path: root/backend/drm
diff options
context:
space:
mode:
authorVincent Vanlaer <vincent.vanlaer@skynet.be>2018-02-04 21:03:44 +0100
committerVincent Vanlaer <vincent.vanlaer@skynet.be>2018-02-09 17:29:14 +0100
commitab011406add31c518f6f352189b1dc6246a74fdb (patch)
tree9d2319f3998f63282b32c885cb148adc47d3c774 /backend/drm
parentcc1229e75e0c0c2cf5ae6d67bc7411c2631deb86 (diff)
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.
Diffstat (limited to 'backend/drm')
-rw-r--r--backend/drm/atomic.c14
-rw-r--r--backend/drm/drm.c6
-rw-r--r--backend/drm/legacy.c5
-rw-r--r--backend/drm/properties.c11
4 files changed, 29 insertions, 7 deletions
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
};