Commit 4db1cb13 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into drm-misc-fixes 

Picking up left-over patches in drm-misc-next-fixes.
parents 1e7b5812 34bd46bc

drivers/gpu/drm/qxl/qxl_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <drm/drm_ioctl.h>

#include <drm/drm_sysfs.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_range_manager.h>

#include <drm/ttm/ttm_placement.h>

#include <generated/utsrelease.h>

drivers/gpu/drm/vmwgfx/vmwgfx_mob.c

+0 −1
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ static void vmw_otable_batch_takedown(struct vmw_private *dev_priv, 
	ttm_bo_unpin(bo);

	ttm_bo_unreserve(bo);



	ttm_bo_unpin(batch->otable_bo);

	ttm_bo_put(batch->otable_bo);

	batch->otable_bo = NULL;

}