diff options
| author | Flora Cui <flora.cui@amd.com> | 2020-06-01 12:48:26 +0800 |
|---|---|---|
| committer | Flora Cui <Flora.Cui@amd.com> | 2020-06-07 22:51:20 -0400 |
| commit | 4706e515e7b76a4e8fddba901c1e345d9f91afed (patch) | |
| tree | 30e9184036bc3f0e99f41e052bb1b23dbcb6fc01 /include | |
| parent | ecda4bf0398ea5345427a07ba371bb7bac6aeecc (diff) | |
drm/amdkcl: add drm_atomic_helper_plane_reset
to commit v4.19-rc1-206-ge267364a6e1b.
Signed-off-by: Flora Cui <flora.cui@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/kcl/backport/kcl_drm_atomic_helper_backport.h | 5 | ||||
| -rw-r--r-- | include/kcl/kcl_drm_atomic_helper.h | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/kcl/backport/kcl_drm_atomic_helper_backport.h b/include/kcl/backport/kcl_drm_atomic_helper_backport.h index 3f8c99c8ad0f..e81954090a42 100644 --- a/include/kcl/backport/kcl_drm_atomic_helper_backport.h +++ b/include/kcl/backport/kcl_drm_atomic_helper_backport.h @@ -31,4 +31,9 @@ int _kcl_drm_atomic_helper_resume(struct drm_device *dev, } #define drm_atomic_helper_resume _kcl_drm_atomic_helper_resume #endif + +#ifdef AMDKCL__DRM_ATOMIC_HELPER_PLANE_RESET +#define __drm_atomic_helper_plane_reset _kcl__drm_atomic_helper_plane_reset +#endif /* AMDKCL__DRM_ATOMIC_HELPER_PLANE_RESET */ + #endif diff --git a/include/kcl/kcl_drm_atomic_helper.h b/include/kcl/kcl_drm_atomic_helper.h index ff8e24189c6e..e2939823d349 100644 --- a/include/kcl/kcl_drm_atomic_helper.h +++ b/include/kcl/kcl_drm_atomic_helper.h @@ -106,4 +106,14 @@ kcl_drm_atomic_get_new_plane_state_before_commit(struct drm_atomic_state *state, #endif } +/* + * v4.19-rc1-206-ge267364a6e1b + * drm/atomic: Initialise planes with opaque alpha values + */ +#if DRM_VERSION_CODE < DRM_VERSION(4, 20, 0) +#define AMDKCL__DRM_ATOMIC_HELPER_PLANE_RESET +void _kcl__drm_atomic_helper_plane_reset(struct drm_plane *plane, + struct drm_plane_state *state); +#endif + #endif |