From c822c799e42b50bd829128f5ecf66b63c3be0fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 1 Apr 2021 11:56:22 +0200 Subject: [PATCH] kms/impl-device: Fix some argument naming mistakes It was left-overs from when the MetaKmsImpl was not per device. Part-of: --- src/backends/native/meta-kms-impl-device-atomic.c | 2 +- src/backends/native/meta-kms-impl-device-dummy.c | 2 +- src/backends/native/meta-kms-impl-device-simple.c | 2 +- src/backends/native/meta-kms-impl-device.c | 2 +- src/backends/native/meta-kms-impl-device.h | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backends/native/meta-kms-impl-device-atomic.c b/src/backends/native/meta-kms-impl-device-atomic.c index d2da354d3..466f0fc8d 100644 --- a/src/backends/native/meta-kms-impl-device-atomic.c +++ b/src/backends/native/meta-kms-impl-device-atomic.c @@ -711,7 +711,7 @@ atomic_page_flip_handler (int fd, } static void -meta_kms_impl_device_atomic_setup_drm_event_context (MetaKmsImplDevice *impl, +meta_kms_impl_device_atomic_setup_drm_event_context (MetaKmsImplDevice *impl_device, drmEventContext *drm_event_context) { drm_event_context->version = 3; diff --git a/src/backends/native/meta-kms-impl-device-dummy.c b/src/backends/native/meta-kms-impl-device-dummy.c index c1a0a4430..22e326c32 100644 --- a/src/backends/native/meta-kms-impl-device-dummy.c +++ b/src/backends/native/meta-kms-impl-device-dummy.c @@ -35,7 +35,7 @@ G_DEFINE_TYPE_WITH_CODE (MetaKmsImplDeviceDummy, meta_kms_impl_device_dummy, initable_iface_init)) static void -meta_kms_impl_device_dummy_discard_pending_page_flips (MetaKmsImplDevice *impl) +meta_kms_impl_device_dummy_discard_pending_page_flips (MetaKmsImplDevice *impl_device) { } diff --git a/src/backends/native/meta-kms-impl-device-simple.c b/src/backends/native/meta-kms-impl-device-simple.c index 07f80c21f..1ca1f4d21 100644 --- a/src/backends/native/meta-kms-impl-device-simple.c +++ b/src/backends/native/meta-kms-impl-device-simple.c @@ -1351,7 +1351,7 @@ page_flip_handler (int fd, } static void -meta_kms_impl_device_simple_setup_drm_event_context (MetaKmsImplDevice *impl, +meta_kms_impl_device_simple_setup_drm_event_context (MetaKmsImplDevice *impl_device, drmEventContext *drm_event_context) { drm_event_context->version = 2; diff --git a/src/backends/native/meta-kms-impl-device.c b/src/backends/native/meta-kms-impl-device.c index d0247ef71..4ed5479d6 100644 --- a/src/backends/native/meta-kms-impl-device.c +++ b/src/backends/native/meta-kms-impl-device.c @@ -837,7 +837,7 @@ meta_kms_impl_device_init_mode_setting (MetaKmsImplDevice *impl_device, } static void -meta_kms_impl_device_init (MetaKmsImplDevice *device) +meta_kms_impl_device_init (MetaKmsImplDevice *impl_device) { } diff --git a/src/backends/native/meta-kms-impl-device.h b/src/backends/native/meta-kms-impl-device.h index 5b3585aa7..08d0011fb 100644 --- a/src/backends/native/meta-kms-impl-device.h +++ b/src/backends/native/meta-kms-impl-device.h @@ -61,13 +61,13 @@ struct _MetaKmsImplDeviceClass { GObjectClass parent_class; - void (* setup_drm_event_context) (MetaKmsImplDevice *impl, + void (* setup_drm_event_context) (MetaKmsImplDevice *impl_device, drmEventContext *drm_event_context); - MetaKmsFeedback * (* process_update) (MetaKmsImplDevice *impl, + MetaKmsFeedback * (* process_update) (MetaKmsImplDevice *impl_device, MetaKmsUpdate *update); - void (* handle_page_flip_callback) (MetaKmsImplDevice *impl, + void (* handle_page_flip_callback) (MetaKmsImplDevice *impl_device, MetaKmsPageFlipData *page_flip_data); - void (* discard_pending_page_flips) (MetaKmsImplDevice *impl); + void (* discard_pending_page_flips) (MetaKmsImplDevice *impl_device); }; MetaKmsDevice * meta_kms_impl_device_get_device (MetaKmsImplDevice *impl_device);