diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-08-16 09:11:17 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-08-16 09:11:17 +0300 |
commit | b2eb7d716426fe056596761cd371005d64e9caec (patch) | |
tree | 436d0566cf4bc900522c9dbf1e203234ef65b2f7 /drivers/gpu/drm/qxl/qxl_ttm.c | |
parent | 2817efaeb608421d8f6fe7939826c35a852644e9 (diff) | |
parent | 2819cf0e7dbe45a2bccf2f6c60fe6a27b299cc3e (diff) | |
download | linux-b2eb7d716426fe056596761cd371005d64e9caec.tar.xz |
Merge drm/drm-next into drm-intel-next
Catch up with drm core changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_ttm.c')
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index 19fd39d9a00c..37a1b6a6ad6d 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -127,7 +127,7 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo, struct qxl_bo *qbo; struct qxl_device *qdev; - if (!qxl_ttm_bo_is_qxl_bo(bo)) + if (!qxl_ttm_bo_is_qxl_bo(bo) || !bo->resource) return; qbo = to_qxl_bo(bo); qdev = to_qxl(qbo->tbo.base.dev); |