diff options
author | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
commit | 649e980dadee36f961738d054627225542d547a2 (patch) | |
tree | a67f0dc4ea53f03c85f5e0648f83f3ff0e4877f7 /drivers/gpu/drm/ast/ast_drv.h | |
parent | a4103eacc2ab408bb65e9902f0857b219fb489de (diff) | |
parent | 2ad6d23f465a4f851e3bcf6d74c315ce7b2c205b (diff) |
Merge branch 'bpf/master' into for-6.12
Pull bpf/master to receive baebe9aaba1e ("bpf: allow passing struct
bpf_iter_<type> as kfunc arguments") and related changes in preparation for
the DSQ iterator patchset.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/ast/ast_drv.h')
-rw-r--r-- | drivers/gpu/drm/ast/ast_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index ba3d86973995..47bab5596c16 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -472,6 +472,7 @@ void ast_init_3rdtx(struct drm_device *dev); bool ast_astdp_is_connected(struct ast_device *ast); int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata); void ast_dp_launch(struct drm_device *dev); +bool ast_dp_power_is_on(struct ast_device *ast); void ast_dp_power_on_off(struct drm_device *dev, bool no); void ast_dp_set_on_off(struct drm_device *dev, bool no); void ast_dp_set_mode(struct drm_crtc *crtc, struct ast_vbios_mode_info *vbios_mode); |