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

kms/crtc: Find MODE_ID and ACTIVE property IDs

Browse Source 
Will be used by the atomic KMS backend.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
This commit is contained in:
Jonas Ådahl 2020-06-04 17:19:26 +02:00 committed by Marge Bot
parent df89e8ce4b
commit 11966dc6cb
2 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,13 @@
#include "backends/native/meta-kms-types.h" #include "backends/native/meta-kms-types.h"
typedef enum _MetaKmsCrtcProp
{
META_KMS_CRTC_PROP_MODE_ID = 0,
META_KMS_CRTC_PROP_ACTIVE,
META_KMS_CRTC_N_PROPS
} MetaKmsCrtcProp;
MetaKmsCrtc * meta_kms_crtc_new (MetaKmsImplDevice *impl_device, MetaKmsCrtc * meta_kms_crtc_new (MetaKmsImplDevice *impl_device,
drmModeCrtc *drm_crtc, drmModeCrtc *drm_crtc,
int idx); int idx);
@ -33,4 +40,10 @@ void meta_kms_crtc_update_state (MetaKmsCrtc *crtc);
void meta_kms_crtc_predict_state (MetaKmsCrtc *crtc, void meta_kms_crtc_predict_state (MetaKmsCrtc *crtc,
MetaKmsUpdate *update); MetaKmsUpdate *update);
uint32_t meta_kms_crtc_get_prop_id (MetaKmsCrtc *crtc,
MetaKmsCrtcProp prop);
const char * meta_kms_crtc_get_prop_name (MetaKmsCrtc *crtc,
MetaKmsCrtcProp prop);
#endif /* META_KMS_CRTC_PRIVATE_H */ #endif /* META_KMS_CRTC_PRIVATE_H */

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

@ -27,6 +27,11 @@
#include "backends/native/meta-kms-mode.h" #include "backends/native/meta-kms-mode.h"
#include "backends/native/meta-kms-update-private.h" #include "backends/native/meta-kms-update-private.h"
typedef struct _MetaKmsCrtcPropTable
{
MetaKmsProp props[META_KMS_CRTC_N_PROPS];
} MetaKmsCrtcPropTable;
struct _MetaKmsCrtc struct _MetaKmsCrtc
{ {
GObject parent; GObject parent;
@ -37,6 +42,8 @@ struct _MetaKmsCrtc
int idx; int idx;
MetaKmsCrtcState current_state; MetaKmsCrtcState current_state;
MetaKmsCrtcPropTable prop_table;
}; };
G_DEFINE_TYPE (MetaKmsCrtc, meta_kms_crtc, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaKmsCrtc, meta_kms_crtc, G_TYPE_OBJECT)
@ -76,6 +83,20 @@ meta_kms_crtc_get_idx (MetaKmsCrtc *crtc)
return crtc->idx; return crtc->idx;
} }
uint32_t
meta_kms_crtc_get_prop_id (MetaKmsCrtc *crtc,
MetaKmsCrtcProp prop)
{
return crtc->prop_table.props[prop].prop_id;
}
const char *
meta_kms_crtc_get_prop_name (MetaKmsCrtc *crtc,
MetaKmsCrtcProp prop)
{
return crtc->prop_table.props[prop].name;
}
static void static void
read_gamma_state (MetaKmsCrtc *crtc, read_gamma_state (MetaKmsCrtc *crtc,
MetaKmsImplDevice *impl_device, MetaKmsImplDevice *impl_device,
@ -214,6 +235,44 @@ meta_kms_crtc_predict_state (MetaKmsCrtc *crtc,
} }
} }
static void
init_proporties (MetaKmsCrtc *crtc,
MetaKmsImplDevice *impl_device,
drmModeCrtc *drm_crtc)
{
MetaKmsCrtcPropTable *prop_table = &crtc->prop_table;
int fd;
drmModeObjectProperties *drm_props;
*prop_table = (MetaKmsCrtcPropTable) {
.props = {
[META_KMS_CRTC_PROP_MODE_ID] =
{
.name = "MODE_ID",
.type = DRM_MODE_PROP_BLOB,
},
[META_KMS_CRTC_PROP_ACTIVE] =
{
.name = "ACTIVE",
.type = DRM_MODE_PROP_RANGE,
},
}
};
fd = meta_kms_impl_device_get_fd (impl_device);
drm_props = drmModeObjectGetProperties (fd,
drm_crtc->crtc_id,
DRM_MODE_OBJECT_CRTC);
meta_kms_impl_device_init_prop_table (impl_device,
drm_props->props,
drm_props->count_props,
crtc->prop_table.props,
META_KMS_CRTC_N_PROPS);
drmModeFreeObjectProperties (drm_props);
}
MetaKmsCrtc * MetaKmsCrtc *
meta_kms_crtc_new (MetaKmsImplDevice *impl_device, meta_kms_crtc_new (MetaKmsImplDevice *impl_device,
drmModeCrtc *drm_crtc, drmModeCrtc *drm_crtc,
@ -226,6 +285,8 @@ meta_kms_crtc_new (MetaKmsImplDevice *impl_device,
crtc->id = drm_crtc->crtc_id; crtc->id = drm_crtc->crtc_id;
crtc->idx = idx; crtc->idx = idx;
init_proporties (crtc, impl_device, drm_crtc);
meta_kms_crtc_read_state (crtc, impl_device, drm_crtc); meta_kms_crtc_read_state (crtc, impl_device, drm_crtc);
return crtc; return crtc;