diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-05-09 10:43:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-05-09 10:43:52 +1000 |
| commit | f2e8d169b2b96d234be7f109f8222d7fa4612899 (patch) | |
| tree | b7fecee08ebd09d340dd491dc6568d14ed851894 /include/drm | |
| parent | 30d62d4453e49f85dd17b2ba60bbb68b6593dba0 (diff) | |
| parent | 15e9122d9b5c745024f2d9d5653caed1f37c185f (diff) | |
Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
This is the 2nd pull request for the malidp-next. The new patches add
additional support for Arm Mali D71 so that it can now be enabled
correctly and brought up on any SoC that contains the IP. From now on
we will start focusing on adding writeback, scaling and other useful
features to bring the driver to the same level of maturity as mali-dp.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Liviu Dudau <Liviu.Dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190507103712.GJ15144@e110455-lin.cambridge.arm.com
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_atomic.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 824a5ed4e216..e937ff2beb04 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -452,6 +452,12 @@ void drm_atomic_private_obj_fini(struct drm_private_obj *obj); struct drm_private_state * __must_check drm_atomic_get_private_obj_state(struct drm_atomic_state *state, struct drm_private_obj *obj); +struct drm_private_state * +drm_atomic_get_old_private_obj_state(struct drm_atomic_state *state, + struct drm_private_obj *obj); +struct drm_private_state * +drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state, + struct drm_private_obj *obj); /** * drm_atomic_get_existing_crtc_state - get crtc state, if it exists |