]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: abc9d3c) | patch
drm/ttm: fix broken merge between drm-next and drm-misc-next
authorChristian König <christian.koenig@amd.com>
Wed, 19 Aug 2020 13:27:48 +0000 (15:27 +0200)
committerChristian König <christian.koenig@amd.com>
Thu, 20 Aug 2020 12:03:10 +0000 (14:03 +0200)
commit00d49de7ba12a63d198f982a3c51a8b548a89859
tree9b2a34ce9e74eb386987ca6c124ab8caa09ad50atree | snapshot
parentabc9d3c70a0e19ad4bdf251c1279c78dda7ce5b9commit | diff
drm/ttm: fix broken merge between drm-next and drm-misc-next

drm-next reverted the changes to ttm_tt_create() to do the
NULL check inside the function, but drm-misc-next adds new
users of this approach.

Re-apply the NULL check change inside the function to fix this.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/386628/
drivers/gpu/drm/ttm/ttm_bo.c diff | blob | history
drivers/gpu/drm/ttm/ttm_tt.c diff | blob | history
Linux Kernel Source Tree.