drm/vmwgfx: Initial DX support (d80efd5c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/drm/vmwgfx/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,5 +8,6 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
		vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.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

		obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/vmwgfx/vmwgfx_binding.c

0 → 100644

+1294 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/vmwgfx/vmwgfx_binding.h

0 → 100644

+209 −0

Original line number	Diff line number	Diff line
		/**************************************************************************
		*
		* Copyright © 2015 VMware, Inc., Palo Alto, CA., USA
		* All Rights Reserved.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the
		* "Software"), to deal in the Software without restriction, including
		* without limitation the rights to use, copy, modify, merge, publish,
		* distribute, sub license, and/or sell copies of the Software, and to
		* permit persons to whom the Software is furnished to do so, subject to
		* the following conditions:
		*
		* The above copyright notice and this permission notice (including the
		* next paragraph) shall be included in all copies or substantial portions
		* of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
		* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
		* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
		* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
		* USE OR OTHER DEALINGS IN THE SOFTWARE.
		*
		**************************************************************************/
		#ifndef _VMWGFX_BINDING_H_
		#define _VMWGFX_BINDING_H_

		#include "device_include/svga3d_reg.h"
		#include <linux/list.h>

		#define VMW_MAX_VIEW_BINDINGS 128

		struct vmw_private;
		struct vmw_ctx_binding_state;

		/*
		* enum vmw_ctx_binding_type - abstract resource to context binding types
		*/
		enum vmw_ctx_binding_type {
		vmw_ctx_binding_shader,
		vmw_ctx_binding_rt,
		vmw_ctx_binding_tex,
		vmw_ctx_binding_cb,
		vmw_ctx_binding_dx_shader,
		vmw_ctx_binding_dx_rt,
		vmw_ctx_binding_sr,
		vmw_ctx_binding_ds,
		vmw_ctx_binding_so,
		vmw_ctx_binding_vb,
		vmw_ctx_binding_ib,
		vmw_ctx_binding_max
		};

		/**
		* struct vmw_ctx_bindinfo - single binding metadata
		*
		* @ctx_list: List head for the context's list of bindings.
		* @res_list: List head for a resource's list of bindings.
		* @ctx: Non-refcounted pointer to the context that owns the binding. NULL
		* indicates no binding present.
		* @res: Non-refcounted pointer to the resource the binding points to. This
		* is typically a surface or a view.
		* @bt: Binding type.
		* @scrubbed: Whether the binding has been scrubbed from the context.
		*/
		struct vmw_ctx_bindinfo {
		struct list_head ctx_list;
		struct list_head res_list;
		struct vmw_resource *ctx;
		struct vmw_resource *res;
		enum vmw_ctx_binding_type bt;
		bool scrubbed;
		};

		/**
		* struct vmw_ctx_bindinfo_tex - texture stage binding metadata
		*
		* @bi: struct vmw_ctx_bindinfo we derive from.
		* @texture_stage: Device data used to reconstruct binding command.
		*/
		struct vmw_ctx_bindinfo_tex {
		struct vmw_ctx_bindinfo bi;
		uint32 texture_stage;
		};

		/**
		* struct vmw_ctx_bindinfo_shader - Shader binding metadata
		*
		* @bi: struct vmw_ctx_bindinfo we derive from.
		* @shader_slot: Device data used to reconstruct binding command.
		*/
		struct vmw_ctx_bindinfo_shader {
		struct vmw_ctx_bindinfo bi;
		SVGA3dShaderType shader_slot;
		};

		/**
		* struct vmw_ctx_bindinfo_cb - Constant buffer binding metadata
		*
		* @bi: struct vmw_ctx_bindinfo we derive from.
		* @shader_slot: Device data used to reconstruct binding command.
		* @offset: Device data used to reconstruct binding command.
		* @size: Device data used to reconstruct binding command.
		* @slot: Device data used to reconstruct binding command.
		*/
		struct vmw_ctx_bindinfo_cb {
		struct vmw_ctx_bindinfo bi;
		SVGA3dShaderType shader_slot;
		uint32 offset;
		uint32 size;
		uint32 slot;
		};

		/**
		* struct vmw_ctx_bindinfo_view - View binding metadata
		*
		* @bi: struct vmw_ctx_bindinfo we derive from.
		* @shader_slot: Device data used to reconstruct binding command.
		* @slot: Device data used to reconstruct binding command.
		*/
		struct vmw_ctx_bindinfo_view {
		struct vmw_ctx_bindinfo bi;
		SVGA3dShaderType shader_slot;
		uint32 slot;
		};

		/**
		* struct vmw_ctx_bindinfo_so - StreamOutput binding metadata
		*
		* @bi: struct vmw_ctx_bindinfo we derive from.
		* @offset: Device data used to reconstruct binding command.
		* @size: Device data used to reconstruct binding command.
		* @slot: Device data used to reconstruct binding command.
		*/
		struct vmw_ctx_bindinfo_so {
		struct vmw_ctx_bindinfo bi;
		uint32 offset;
		uint32 size;
		uint32 slot;
		};

		/**
		* struct vmw_ctx_bindinfo_vb - Vertex buffer binding metadata
		*
		* @bi: struct vmw_ctx_bindinfo we derive from.
		* @offset: Device data used to reconstruct binding command.
		* @stride: Device data used to reconstruct binding command.
		* @slot: Device data used to reconstruct binding command.
		*/
		struct vmw_ctx_bindinfo_vb {
		struct vmw_ctx_bindinfo bi;
		uint32 offset;
		uint32 stride;
		uint32 slot;
		};

		/**
		* struct vmw_ctx_bindinfo_ib - StreamOutput binding metadata
		*
		* @bi: struct vmw_ctx_bindinfo we derive from.
		* @offset: Device data used to reconstruct binding command.
		* @format: Device data used to reconstruct binding command.
		*/
		struct vmw_ctx_bindinfo_ib {
		struct vmw_ctx_bindinfo bi;
		uint32 offset;
		uint32 format;
		};

		/**
		* struct vmw_dx_shader_bindings - per shader type context binding state
		*
		* @shader: The shader binding for this shader type
		* @const_buffer: Const buffer bindings for this shader type.
		* @shader_res: Shader resource view bindings for this shader type.
		* @dirty_sr: Bitmap tracking individual shader resource bindings changes
		* that have not yet been emitted to the device.
		* @dirty: Bitmap tracking per-binding type binding changes that have not
		* yet been emitted to the device.
		*/
		struct vmw_dx_shader_bindings {
		struct vmw_ctx_bindinfo_shader shader;
		struct vmw_ctx_bindinfo_cb const_buffers[SVGA3D_DX_MAX_CONSTBUFFERS];
		struct vmw_ctx_bindinfo_view shader_res[SVGA3D_DX_MAX_SRVIEWS];
		DECLARE_BITMAP(dirty_sr, SVGA3D_DX_MAX_SRVIEWS);
		unsigned long dirty;
		};

		extern void vmw_binding_add(struct vmw_ctx_binding_state *cbs,
		const struct vmw_ctx_bindinfo *ci,
		u32 shader_slot, u32 slot);
		extern void
		vmw_binding_state_commit(struct vmw_ctx_binding_state *to,
		struct vmw_ctx_binding_state *from);
		extern void vmw_binding_res_list_kill(struct list_head *head);
		extern void vmw_binding_res_list_scrub(struct list_head *head);
		extern int vmw_binding_rebind_all(struct vmw_ctx_binding_state *cbs);
		extern void vmw_binding_state_kill(struct vmw_ctx_binding_state *cbs);
		extern void vmw_binding_state_scrub(struct vmw_ctx_binding_state *cbs);
		extern struct vmw_ctx_binding_state *
		vmw_binding_state_alloc(struct vmw_private *dev_priv);
		extern void vmw_binding_state_free(struct vmw_ctx_binding_state *cbs);
		extern struct list_head *
		vmw_binding_state_list(struct vmw_ctx_binding_state *cbs);
		extern void vmw_binding_state_reset(struct vmw_ctx_binding_state *cbs);

		#endif

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -916,8 +916,7 @@ static void vmw_cmdbuf_reserve_cur(struct vmw_cmdbuf_man man,

		cur = man->cur;
		if (cur && (size + man->cur_pos > cur->size \|\|
		(ctx_id != SVGA3D_INVALID_ID &&
		(cur->cb_header->flags & SVGA_CB_FLAG_DX_CONTEXT) &&
		((cur->cb_header->flags & SVGA_CB_FLAG_DX_CONTEXT) &&
		ctx_id != cur->cb_header->dxContext)))
		__vmw_cmdbuf_cur_flush(man);

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c

+14 −10

Original line number	Diff line number	Diff line
		@@ -26,15 +26,10 @@
		**************************************************************************/

		#include "vmwgfx_drv.h"
		#include "vmwgfx_resource_priv.h"

		#define VMW_CMDBUF_RES_MAN_HT_ORDER 12

		enum vmw_cmdbuf_res_state {
		VMW_CMDBUF_RES_COMMITED,
		VMW_CMDBUF_RES_ADD,
		VMW_CMDBUF_RES_DEL
		};

		/**
		* struct vmw_cmdbuf_res - Command buffer managed resource entry.
		*
		@@ -132,9 +127,12 @@ void vmw_cmdbuf_res_commit(struct list_head *list)

		list_for_each_entry_safe(entry, next, list, head) {
		list_del(&entry->head);
		if (entry->res->func->commit_notify)
		entry->res->func->commit_notify(entry->res,
		entry->state);
		switch (entry->state) {
		case VMW_CMDBUF_RES_ADD:
		entry->state = VMW_CMDBUF_RES_COMMITED;
		entry->state = VMW_CMDBUF_RES_COMMITTED;
		list_add_tail(&entry->head, &entry->man->list);
		break;
		case VMW_CMDBUF_RES_DEL:
		@@ -175,7 +173,7 @@ void vmw_cmdbuf_res_revert(struct list_head *list)
		&entry->hash);
		list_del(&entry->head);
		list_add_tail(&entry->head, &entry->man->list);
		entry->state = VMW_CMDBUF_RES_COMMITED;
		entry->state = VMW_CMDBUF_RES_COMMITTED;
		break;
		default:
		BUG();
		@@ -231,6 +229,9 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man,
		* @res_type: The resource type.
		* @user_key: The user-space id of the resource.
		* @list: The staging list.
		* @res_p: If the resource is in an already committed state, points to the
		* struct vmw_resource on successful return. The pointer will be
		* non ref-counted.
		*
		* This function looks up the struct vmw_cmdbuf_res entry from the manager
		* hash table and, if it exists, removes it. Depending on its current staging
		@@ -240,7 +241,8 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man,
		int vmw_cmdbuf_res_remove(struct vmw_cmdbuf_res_manager *man,
		enum vmw_cmdbuf_res_type res_type,
		u32 user_key,
		struct list_head *list)
		struct list_head *list,
		struct vmw_resource **res_p)
		{
		struct vmw_cmdbuf_res *entry;
		struct drm_hash_item *hash;
		@@ -256,12 +258,14 @@ int vmw_cmdbuf_res_remove(struct vmw_cmdbuf_res_manager *man,
		switch (entry->state) {
		case VMW_CMDBUF_RES_ADD:
		vmw_cmdbuf_res_free(man, entry);
		*res_p = NULL;
		break;
		case VMW_CMDBUF_RES_COMMITED:
		case VMW_CMDBUF_RES_COMMITTED:
		(void) drm_ht_remove_item(&man->resources, &entry->hash);
		list_del(&entry->head);
		entry->state = VMW_CMDBUF_RES_DEL;
		list_add_tail(&entry->head, list);
		*res_p = entry->res;
		break;
		default:
		BUG();