diff options
author | Dave Airlie <airlied@redhat.com> | 2023-12-08 12:16:10 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-12-08 12:16:11 +1000 |
commit | 9ac4883d24f231a290c3547b29bfc1f3b16727a5 (patch) | |
tree | 68146a266a8e7734dd64365024b78516d4bb4f45 /include | |
parent | abd02118807adec599e2d03b8b18529f5ba7f2a5 (diff) | |
parent | e0f04e41e8eedd4e5a1275f2318df7e1841855f2 (diff) |
Merge tag 'drm-misc-fixes-2023-12-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v6.7-rc5:
- Document nouveau's GSP-RM.
- Flush vmm harder on nouveau tu102.
- Panfrost fix for imported dma-buf objects, and device frequency.
- Kconfig Build fix for tc358768.
- Call end_fb_access after atomic commit.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/05a26dc0-8cf1-4b1f-abb6-3bf471fbfc99@linux.intel.com
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/drm_atomic_helper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 536a0b0091c3..006b5c977ad7 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -97,6 +97,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, int drm_atomic_helper_prepare_planes(struct drm_device *dev, struct drm_atomic_state *state); +void drm_atomic_helper_unprepare_planes(struct drm_device *dev, + struct drm_atomic_state *state); #define DRM_PLANE_COMMIT_ACTIVE_ONLY BIT(0) #define DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET BIT(1) |