Commit d04a836e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next 

Mostly code reorganizations and optimizations for vmwgfx.
- Move TTM code that's only used by vmwgfx to vmwgfx
- Break out the vmwgfx buffer- and resource validation code to a separate source file
- Get rid of a number of atomic operations during command buffer validation.

From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180928131157.2810-1-thellstrom@vmware.com
parents 87c2ee74 e8c66efb

drivers/gpu/drm/ttm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \

	ttm_bo_util.o ttm_bo_vm.o ttm_module.o \

	ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \

	ttm_bo_manager.o ttm_page_alloc_dma.o

	ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o \

	ttm_page_alloc_dma.o

ttm-$(CONFIG_AGP) += ttm_agp_backend.o



obj-$(CONFIG_DRM_TTM) += ttm.o

drivers/gpu/drm/ttm/ttm_bo_vm.c

+1 −2
Original line number Diff line number Diff line
@@ -409,8 +409,7 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev, 
	node = drm_vma_offset_lookup_locked(&bdev->vma_manager, offset, pages);

	if (likely(node)) {

		bo = container_of(node, struct ttm_buffer_object, vma_node);

		if (!kref_get_unless_zero(&bo->kref))

			bo = NULL;

		bo = ttm_bo_get_unless_zero(bo);

	}



	drm_vma_offset_unlock_lookup(&bdev->vma_manager);

drivers/gpu/drm/vmwgfx/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ 
	    vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o \

	    vmwgfx_cmdbuf_res.o vmwgfx_cmdbuf.o vmwgfx_stdu.o \

	    vmwgfx_cotable.o vmwgfx_so.o vmwgfx_binding.o vmwgfx_msg.o \

	    vmwgfx_simple_resource.o vmwgfx_va.o vmwgfx_blit.o

	    vmwgfx_simple_resource.o vmwgfx_va.o vmwgfx_blit.o \

	    vmwgfx_validation.o \

	    ttm_object.o ttm_lock.o



obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/ttm/ttm_lock.c→drivers/gpu/drm/vmwgfx/ttm_lock.c

+3 −12
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
 * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>

 */



#include <drm/ttm/ttm_lock.h>

#include <drm/ttm/ttm_module.h>

#include <linux/atomic.h>

#include <linux/errno.h>

#include <linux/wait.h>

#include <linux/sched/signal.h>

#include <linux/module.h>

#include "ttm_lock.h"

#include "ttm_object.h"



#define TTM_WRITE_LOCK_PENDING    (1 << 0)

#define TTM_VT_LOCK_PENDING       (1 << 1)
@@ -52,7 +52,6 @@ void ttm_lock_init(struct ttm_lock *lock) 
	lock->kill_takers = false;

	lock->signal = SIGKILL;

}

EXPORT_SYMBOL(ttm_lock_init);



void ttm_read_unlock(struct ttm_lock *lock)

{
@@ -61,7 +60,6 @@ void ttm_read_unlock(struct ttm_lock *lock) 
		wake_up_all(&lock->queue);

	spin_unlock(&lock->lock);

}

EXPORT_SYMBOL(ttm_read_unlock);



static bool __ttm_read_lock(struct ttm_lock *lock)

{
@@ -92,7 +90,6 @@ int ttm_read_lock(struct ttm_lock *lock, bool interruptible) 
		wait_event(lock->queue, __ttm_read_lock(lock));

	return ret;

}

EXPORT_SYMBOL(ttm_read_lock);



static bool __ttm_read_trylock(struct ttm_lock *lock, bool *locked)

{
@@ -144,7 +141,6 @@ void ttm_write_unlock(struct ttm_lock *lock) 
	wake_up_all(&lock->queue);

	spin_unlock(&lock->lock);

}

EXPORT_SYMBOL(ttm_write_unlock);



static bool __ttm_write_lock(struct ttm_lock *lock)

{
@@ -185,7 +181,6 @@ int ttm_write_lock(struct ttm_lock *lock, bool interruptible) 


	return ret;

}

EXPORT_SYMBOL(ttm_write_lock);



static int __ttm_vt_unlock(struct ttm_lock *lock)

{
@@ -262,14 +257,12 @@ int ttm_vt_lock(struct ttm_lock *lock, 


	return ret;

}

EXPORT_SYMBOL(ttm_vt_lock);



int ttm_vt_unlock(struct ttm_lock *lock)

{

	return ttm_ref_object_base_unref(lock->vt_holder,

					 lock->base.hash.key, TTM_REF_USAGE);

					 lock->base.handle, TTM_REF_USAGE);

}

EXPORT_SYMBOL(ttm_vt_unlock);



void ttm_suspend_unlock(struct ttm_lock *lock)

{
@@ -278,7 +271,6 @@ void ttm_suspend_unlock(struct ttm_lock *lock) 
	wake_up_all(&lock->queue);

	spin_unlock(&lock->lock);

}

EXPORT_SYMBOL(ttm_suspend_unlock);



static bool __ttm_suspend_lock(struct ttm_lock *lock)

{
@@ -300,4 +292,3 @@ void ttm_suspend_lock(struct ttm_lock *lock) 
{

	wait_event(lock->queue, __ttm_suspend_lock(lock));

}
 
EXPORT_SYMBOL(ttm_suspend_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE