1
0
Fork 0

backends/native: Introduce MetaKmsCrtcColorUpdate

To store gamma updates. In the future this will grow other CRTC level
color pipeline properties.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2861>
This commit is contained in:
Sebastian Wick 2023-02-17 23:47:04 +01:00 committed by Marge Bot
parent 37639295db
commit 0180ffdaa1
7 changed files with 115 additions and 66 deletions

View file

@ -248,8 +248,7 @@ meta_crtc_kms_set_gamma_lut (MetaCrtc *crtc,
"Setting CRTC (%" G_GUINT64_FORMAT ") gamma to %s", "Setting CRTC (%" G_GUINT64_FORMAT ") gamma to %s",
meta_crtc_get_id (crtc), gamma_ramp_string); meta_crtc_get_id (crtc), gamma_ramp_string);
crtc_gamma = meta_kms_crtc_gamma_new (kms_crtc, crtc_gamma = meta_kms_crtc_gamma_new (lut->size,
lut->size,
lut->red, lut->red,
lut->green, lut->green,
lut->blue); lut->blue);

View file

@ -316,9 +316,10 @@ meta_kms_crtc_predict_state_in_impl (MetaKmsCrtc *crtc,
crtc_color_updates = meta_kms_update_get_crtc_color_updates (update); crtc_color_updates = meta_kms_update_get_crtc_color_updates (update);
for (l = crtc_color_updates; l; l = l->next) for (l = crtc_color_updates; l; l = l->next)
{ {
MetaKmsCrtcGamma *gamma = l->data; MetaKmsCrtcColorUpdate *color_update = l->data;
MetaKmsCrtcGamma *gamma = color_update->gamma.state;
if (gamma->crtc != crtc) if (color_update->crtc != crtc)
continue; continue;
clear_gamma_state (&crtc->current_state); clear_gamma_state (&crtc->current_state);

View file

@ -47,7 +47,6 @@ typedef struct _MetaKmsCrtcState
typedef struct _MetaKmsCrtcGamma typedef struct _MetaKmsCrtcGamma
{ {
MetaKmsCrtc *crtc;
int size; int size;
uint16_t *red; uint16_t *red;
uint16_t *green; uint16_t *green;
@ -76,8 +75,7 @@ gboolean meta_kms_crtc_is_active (MetaKmsCrtc *crtc);
void meta_kms_crtc_gamma_free (MetaKmsCrtcGamma *gamma); void meta_kms_crtc_gamma_free (MetaKmsCrtcGamma *gamma);
MetaKmsCrtcGamma * meta_kms_crtc_gamma_new (MetaKmsCrtc *crtc, MetaKmsCrtcGamma * meta_kms_crtc_gamma_new (int size,
int size,
const uint16_t *red, const uint16_t *red,
const uint16_t *green, const uint16_t *green,
const uint16_t *blue); const uint16_t *blue);

View file

@ -621,8 +621,12 @@ process_crtc_color_updates (MetaKmsImplDevice *impl_device,
gpointer user_data, gpointer user_data,
GError **error) GError **error)
{ {
MetaKmsCrtcGamma *gamma = update_entry; MetaKmsCrtcColorUpdate *color_update = update_entry;
MetaKmsCrtc *crtc = gamma->crtc; MetaKmsCrtc *crtc = color_update->crtc;
if (color_update->gamma.has_update)
{
MetaKmsCrtcGamma *gamma = color_update->gamma.state;
struct drm_color_lut drm_color_lut[gamma->size]; struct drm_color_lut drm_color_lut[gamma->size];
int i; int i;
uint32_t color_lut_blob_id; uint32_t color_lut_blob_id;
@ -654,6 +658,7 @@ process_crtc_color_updates (MetaKmsImplDevice *impl_device,
color_lut_blob_id, color_lut_blob_id,
error)) error))
return FALSE; return FALSE;
}
return TRUE; return TRUE;
} }

View file

@ -508,8 +508,12 @@ process_crtc_color_updates (MetaKmsImplDevice *impl_device,
gpointer update_entry, gpointer update_entry,
GError **error) GError **error)
{ {
MetaKmsCrtcGamma *gamma = update_entry; MetaKmsCrtcColorUpdate *color_update = update_entry;
MetaKmsCrtc *crtc = gamma->crtc; MetaKmsCrtc *crtc = color_update->crtc;
if (color_update->gamma.has_update)
{
MetaKmsCrtcGamma *gamma = color_update->gamma.state;
int fd; int fd;
int ret; int ret;
@ -533,6 +537,7 @@ process_crtc_color_updates (MetaKmsImplDevice *impl_device,
g_strerror (-ret)); g_strerror (-ret));
return FALSE; return FALSE;
} }
}
return TRUE; return TRUE;
} }

View file

@ -23,10 +23,21 @@
#include <glib.h> #include <glib.h>
#include <stdint.h> #include <stdint.h>
#include "backends/native/meta-kms-crtc.h"
#include "backends/native/meta-kms-plane-private.h" #include "backends/native/meta-kms-plane-private.h"
#include "backends/native/meta-kms-types.h" #include "backends/native/meta-kms-types.h"
#include "backends/native/meta-kms-update.h" #include "backends/native/meta-kms-update.h"
typedef struct _MetaKmsCrtcColorUpdate
{
MetaKmsCrtc *crtc;
struct {
gboolean has_update;
MetaKmsCrtcGamma *state;
} gamma;
} MetaKmsCrtcColorUpdate;
typedef struct _MetaKmsFeedback typedef struct _MetaKmsFeedback
{ {
MetaKmsFeedbackResult result; MetaKmsFeedbackResult result;

View file

@ -370,6 +370,30 @@ meta_kms_update_set_max_bpc (MetaKmsUpdate *update,
connector_update->max_bpc.has_update = TRUE; connector_update->max_bpc.has_update = TRUE;
} }
static MetaKmsCrtcColorUpdate *
ensure_color_update (MetaKmsUpdate *update,
MetaKmsCrtc *crtc)
{
GList *l;
MetaKmsCrtcColorUpdate *color_update;
for (l = update->crtc_color_updates; l; l = l->next)
{
color_update = l->data;
if (color_update->crtc == crtc)
return color_update;
}
color_update = g_new0 (MetaKmsCrtcColorUpdate, 1);
color_update->crtc = crtc;
update->crtc_color_updates = g_list_prepend (update->crtc_color_updates,
color_update);
return color_update;
}
void void
meta_kms_crtc_gamma_free (MetaKmsCrtcGamma *gamma) meta_kms_crtc_gamma_free (MetaKmsCrtcGamma *gamma)
{ {
@ -380,8 +404,7 @@ meta_kms_crtc_gamma_free (MetaKmsCrtcGamma *gamma)
} }
MetaKmsCrtcGamma * MetaKmsCrtcGamma *
meta_kms_crtc_gamma_new (MetaKmsCrtc *crtc, meta_kms_crtc_gamma_new (int size,
int size,
const uint16_t *red, const uint16_t *red,
const uint16_t *green, const uint16_t *green,
const uint16_t *blue) const uint16_t *blue)
@ -390,7 +413,6 @@ meta_kms_crtc_gamma_new (MetaKmsCrtc *crtc,
gamma = g_new0 (MetaKmsCrtcGamma, 1); gamma = g_new0 (MetaKmsCrtcGamma, 1);
*gamma = (MetaKmsCrtcGamma) { *gamma = (MetaKmsCrtcGamma) {
.crtc = crtc,
.size = size, .size = size,
.red = g_memdup2 (red, size * sizeof (*red)), .red = g_memdup2 (red, size * sizeof (*red)),
.green = g_memdup2 (green, size * sizeof (*green)), .green = g_memdup2 (green, size * sizeof (*green)),
@ -408,14 +430,21 @@ meta_kms_update_set_crtc_gamma (MetaKmsUpdate *update,
const uint16_t *green, const uint16_t *green,
const uint16_t *blue) const uint16_t *blue)
{ {
MetaKmsCrtcGamma *gamma; MetaKmsCrtcColorUpdate *color_update;
g_assert (!meta_kms_update_is_locked (update)); g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device); g_assert (meta_kms_crtc_get_device (crtc) == update->device);
gamma = meta_kms_crtc_gamma_new (crtc, size, red, green, blue); color_update = ensure_color_update (update, crtc);
color_update->gamma.state = meta_kms_crtc_gamma_new (size, red, green, blue);
color_update->gamma.has_update = TRUE;
}
update->crtc_color_updates = g_list_prepend (update->crtc_color_updates, gamma); static void
meta_kms_crtc_color_updates_free (MetaKmsCrtcColorUpdate *color_update)
{
if (color_update->gamma.has_update)
g_clear_pointer (&color_update->gamma.state, meta_kms_crtc_gamma_free);
} }
void void
@ -700,7 +729,8 @@ meta_kms_update_free (MetaKmsUpdate *update)
g_list_free_full (update->page_flip_listeners, g_list_free_full (update->page_flip_listeners,
(GDestroyNotify) meta_kms_page_flip_listener_free); (GDestroyNotify) meta_kms_page_flip_listener_free);
g_list_free_full (update->connector_updates, g_free); g_list_free_full (update->connector_updates, g_free);
g_list_free_full (update->crtc_color_updates, (GDestroyNotify) meta_kms_crtc_gamma_free); g_list_free_full (update->crtc_color_updates,
(GDestroyNotify) meta_kms_crtc_color_updates_free);
g_clear_pointer (&update->custom_page_flip, meta_kms_custom_page_flip_free); g_clear_pointer (&update->custom_page_flip, meta_kms_custom_page_flip_free);
g_free (update); g_free (update);