projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-v4.4-rc1' of git://git.linaro.org/people/ulf.hansson/mmc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
drm_plane_helper.c
diff --git
a/drivers/gpu/drm/drm_plane_helper.c
b/drivers/gpu/drm/drm_plane_helper.c
index 5e5a07af02c85c4297df213847759bd620a82390..d384ebcf0aaf52a63125c9599553fc24e6a7f87b 100644
(file)
--- a/
drivers/gpu/drm/drm_plane_helper.c
+++ b/
drivers/gpu/drm/drm_plane_helper.c
@@
-426,7
+426,7
@@
int drm_plane_helper_commit(struct drm_plane *plane,
if (plane_funcs->prepare_fb && plane_state->fb &&
plane_state->fb != old_fb) {
if (plane_funcs->prepare_fb && plane_state->fb &&
plane_state->fb != old_fb) {
- ret = plane_funcs->prepare_fb(plane,
plane_state->fb,
+ ret = plane_funcs->prepare_fb(plane,
plane_state);
if (ret)
goto out;
plane_state);
if (ret)
goto out;
@@
-479,8
+479,8
@@
int drm_plane_helper_commit(struct drm_plane *plane,
ret = 0;
}
ret = 0;
}
- if (plane_funcs->cleanup_fb
&& old_fb
)
- plane_funcs->cleanup_fb(plane,
old_fb,
plane_state);
+ if (plane_funcs->cleanup_fb)
+ plane_funcs->cleanup_fb(plane, plane_state);
out:
if (plane_state) {
if (plane->funcs->atomic_destroy_state)
out:
if (plane_state) {
if (plane->funcs->atomic_destroy_state)