projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'sound-asoc/for-next'
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
drm_atomic.c
diff --git
a/drivers/gpu/drm/drm_atomic.c
b/drivers/gpu/drm/drm_atomic.c
index 2a3ded44cf2a689c66ecfd48ce9362004a9a5964..23739609427d86b9cd64d81ddad719bf5fc2bd78 100644
(file)
--- a/
drivers/gpu/drm/drm_atomic.c
+++ b/
drivers/gpu/drm/drm_atomic.c
@@
-837,8
+837,9
@@
static int drm_atomic_plane_check(struct drm_plane *plane,
/* Check whether this plane supports the fb pixel format. */
ret = drm_plane_check_pixel_format(plane, state->fb->pixel_format);
if (ret) {
/* Check whether this plane supports the fb pixel format. */
ret = drm_plane_check_pixel_format(plane, state->fb->pixel_format);
if (ret) {
- DRM_DEBUG_ATOMIC("Invalid pixel format %s\n",
- drm_get_format_name(state->fb->pixel_format));
+ char *format_name = drm_get_format_name(state->fb->pixel_format);
+ DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", format_name);
+ kfree(format_name);
return ret;
}
return ret;
}
@@
-1690,7
+1691,7
@@
retry:
goto out;
}
goto out;
}
- prop = drm_
property_find(dev
, prop_id);
+ prop = drm_
mode_obj_find_prop_id(obj
, prop_id);
if (!prop) {
drm_mode_object_unreference(obj);
ret = -ENOENT;
if (!prop) {
drm_mode_object_unreference(obj);
ret = -ENOENT;
This page took
0.088927 seconds
and
5
git commands to generate.