brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor-manager-kms: Set gamma on MetaKmsUpdate directly

Browse Source 
The meta_kms_crtc_* helper didn't do anything more than call another
function with the exact same arguments.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
This commit is contained in:
Jonas Ådahl 2020-07-14 17:03:34 +02:00 committed by Marge Bot
parent ec7667fc31
commit 9d7be40502
5 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backends/native/meta-kms-crtc.c
View File

@ -48,17 +48,6 @@ struct _MetaKmsCrtc
G_DEFINE_TYPE (MetaKmsCrtc, meta_kms_crtc, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaKmsCrtc, meta_kms_crtc, G_TYPE_OBJECT)
void
meta_kms_crtc_set_gamma (MetaKmsCrtc *crtc,
MetaKmsUpdate *update,
int size,
const uint16_t *red,
const uint16_t *green,
const uint16_t *blue)
{
meta_kms_update_set_crtc_gamma (update, crtc, size, red, green, blue);
}
MetaKmsDevice * MetaKmsDevice *
meta_kms_crtc_get_device (MetaKmsCrtc *crtc) meta_kms_crtc_get_device (MetaKmsCrtc *crtc)
{ {

7
src/backends/native/meta-kms-crtc.h
View File

@ -47,13 +47,6 @@ G_DECLARE_FINAL_TYPE (MetaKmsCrtc, meta_kms_crtc,
META, KMS_CRTC, META, KMS_CRTC,
GObject) GObject)
void meta_kms_crtc_set_gamma (MetaKmsCrtc *crtc,
MetaKmsUpdate *update,
int size,
const uint16_t *red,
const uint16_t *green,
const uint16_t *blue);
MetaKmsDevice * meta_kms_crtc_get_device (MetaKmsCrtc *crtc); MetaKmsDevice * meta_kms_crtc_get_device (MetaKmsCrtc *crtc);
const MetaKmsCrtcState * meta_kms_crtc_get_current_state (MetaKmsCrtc *crtc); const MetaKmsCrtcState * meta_kms_crtc_get_current_state (MetaKmsCrtc *crtc);

7
src/backends/native/meta-kms-update-private.h
View File

@ -111,13 +111,6 @@ void meta_kms_update_seal (MetaKmsUpdate *update);
gboolean meta_kms_update_is_sealed (MetaKmsUpdate *update); gboolean meta_kms_update_is_sealed (MetaKmsUpdate *update);
void meta_kms_update_set_crtc_gamma (MetaKmsUpdate *update,
MetaKmsCrtc *crtc,
int size,
const uint16_t *red,
const uint16_t *green,
const uint16_t *blue);
void meta_kms_plane_assignment_set_rotation (MetaKmsPlaneAssignment *plane_assignment, void meta_kms_plane_assignment_set_rotation (MetaKmsPlaneAssignment *plane_assignment,
uint64_t rotation); uint64_t rotation);

7
src/backends/native/meta-kms-update.h
View File

@ -102,6 +102,13 @@ void meta_kms_update_mode_set (MetaKmsUpdate *update,
GList *connectors, GList *connectors,
MetaKmsMode *mode); MetaKmsMode *mode);
void meta_kms_update_set_crtc_gamma (MetaKmsUpdate *update,
MetaKmsCrtc *crtc,
int size,
const uint16_t *red,
const uint16_t *green,
const uint16_t *blue);
MetaKmsPlaneAssignment * meta_kms_update_assign_plane (MetaKmsUpdate *update, MetaKmsPlaneAssignment * meta_kms_update_assign_plane (MetaKmsUpdate *update,
MetaKmsCrtc *crtc, MetaKmsCrtc *crtc,
MetaKmsPlane *plane, MetaKmsPlane *plane,

3
src/backends/native/meta-monitor-manager-kms.c
View File

@ -429,8 +429,7 @@ meta_monitor_manager_kms_set_crtc_gamma (MetaMonitorManager *manager,
kms_update = meta_kms_ensure_pending_update (kms); kms_update = meta_kms_ensure_pending_update (kms);
kms_crtc = meta_crtc_kms_get_kms_crtc (META_CRTC_KMS (crtc)); kms_crtc = meta_crtc_kms_get_kms_crtc (META_CRTC_KMS (crtc));
meta_kms_crtc_set_gamma (kms_crtc, kms_update, meta_kms_update_set_crtc_gamma (kms_update, kms_crtc, size, red, green, blue);
size, red, green, blue);
kms_feedback = meta_kms_post_pending_update_sync (kms); kms_feedback = meta_kms_post_pending_update_sync (kms);
if (meta_kms_feedback_get_result (kms_feedback) != META_KMS_FEEDBACK_PASSED) if (meta_kms_feedback_get_result (kms_feedback) != META_KMS_FEEDBACK_PASSED)