diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-03-01 13:12:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-03-01 13:13:06 +1000 |
| commit | 45046af3d0c2d6f4f1953f7f07cd1b34ffc86498 (patch) | |
| tree | bcd9afd820557d57bef4e6daea88172979972b0d /include | |
| parent | d206a76d7d2726f3b096037f2079ce0bd3ba329b (diff) | |
| parent | c70703320e557ff30847915e6a7631a9abdda16b (diff) | |
| download | lwn-45046af3d0c2d6f4f1953f7f07cd1b34ffc86498.tar.gz lwn-45046af3d0c2d6f4f1953f7f07cd1b34ffc86498.zip | |
Merge tag 'drm-misc-fixes-2024-02-29' of https://anongit.freedesktop.org/git/drm/drm-misc into drm-fixes
A reset fix for host1x, a resource leak fix and a probe fix for aux-hpd,
a use-after-free fix and a boot fix for a pmic_glink qcom driver in
drivers/soc, a fix for the simpledrm/tegra transition, a kunit fix for
the TTM tests, a font handling fix for fbcon, two allocation fixes and a
kunit test to cover them for drm/buddy
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240229-angelic-adorable-teal-fbfabb@houat
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/bridge/aux-bridge.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridge.h index c4c423e97f06..4453906105ca 100644 --- a/include/drm/bridge/aux-bridge.h +++ b/include/drm/bridge/aux-bridge.h @@ -9,6 +9,8 @@ #include <drm/drm_connector.h> +struct auxiliary_device; + #if IS_ENABLED(CONFIG_DRM_AUX_BRIDGE) int drm_aux_bridge_register(struct device *parent); #else @@ -19,10 +21,23 @@ static inline int drm_aux_bridge_register(struct device *parent) #endif #if IS_ENABLED(CONFIG_DRM_AUX_HPD_BRIDGE) +struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, struct device_node *np); +int devm_drm_dp_hpd_bridge_add(struct device *dev, struct auxiliary_device *adev); struct device *drm_dp_hpd_bridge_register(struct device *parent, struct device_node *np); void drm_aux_hpd_bridge_notify(struct device *dev, enum drm_connector_status status); #else +static inline struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, + struct device_node *np) +{ + return NULL; +} + +static inline int devm_drm_dp_hpd_bridge_add(struct auxiliary_device *adev) +{ + return 0; +} + static inline struct device *drm_dp_hpd_bridge_register(struct device *parent, struct device_node *np) { |