git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'perf-urgent-for-mingo-4.14-20170928' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
drm_blend.c
diff --git
a/drivers/gpu/drm/drm_blend.c
b/drivers/gpu/drm/drm_blend.c
index db6aeec50b821eb119fc0e0b6d5885a26350c56f..2e5e089dd9123fa324e1a7d343d8bb47a200739b 100644
(file)
--- a/
drivers/gpu/drm/drm_blend.c
+++ b/
drivers/gpu/drm/drm_blend.c
@@
-319,7
+319,7
@@
static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,
DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n",
crtc->base.id, crtc->name);
DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n",
crtc->base.id, crtc->name);
- states = kmalloc_array(total_planes, sizeof(*states), GFP_
TEMPORARY
);
+ states = kmalloc_array(total_planes, sizeof(*states), GFP_
KERNEL
);
if (!states)
return -ENOMEM;
if (!states)
return -ENOMEM;