diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-04-08 06:43:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-04-08 06:43:43 +1000 |
| commit | 1f913730e7c7904595cd899659c9a46f27eda07c (patch) | |
| tree | f2f7f7d309ca8534124994a7ca897410e6ed0af8 /include | |
| parent | fee54d08bc83d1afab57d193de0724d98f050f0f (diff) | |
| parent | d1ef8fc18be6adbbffdee06fbb5b33699e2852be (diff) | |
Merge tag 'drm-misc-next-2024-04-05' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.10:
Core Changes:
- Fix DRM_DISPLAY_DP_HELPER dependencies.
Driver Changes:
- i2c and polling fixes to ast.
- Small fixes to panthor.
- Allow IRQ to share GPIO pins in bridge/adv7511.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2ad89d5a-4096-4cc5-badb-4ad61ff1df7d@linux.intel.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_probe_helper.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/drm/drm_probe_helper.h b/include/drm/drm_probe_helper.h index 62741a88796b..d6ce7b218b77 100644 --- a/include/drm/drm_probe_helper.h +++ b/include/drm/drm_probe_helper.h @@ -16,6 +16,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector int drm_helper_probe_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force); + +int drmm_kms_helper_poll_init(struct drm_device *dev); void drm_kms_helper_poll_init(struct drm_device *dev); void drm_kms_helper_poll_fini(struct drm_device *dev); bool drm_helper_hpd_irq_event(struct drm_device *dev); @@ -37,4 +39,8 @@ int drm_connector_helper_get_modes_fixed(struct drm_connector *connector, int drm_connector_helper_get_modes(struct drm_connector *connector); int drm_connector_helper_tv_get_modes(struct drm_connector *connector); +int drm_connector_helper_detect_from_ddc(struct drm_connector *connector, + struct drm_modeset_acquire_ctx *ctx, + bool force); + #endif |