drm/ttm: fix broken merge between drm-next and drm-misc-next

Browse source

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/

...

This commit is contained in:

Christian König 2020-08-19 15:27:48 +02:00

parent cdd296cdae

commit 0b06286579

2 changed files with 4 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/ttm/ttm_bo.c

View file

4

drivers/gpu/drm/ttm/ttm_tt.c

View file