Commit 96fd2c66 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Drop new chunks of context creation ABI (for now) 



The intent was to expose these as part of the means to perform full
context recovery (though not the SINGLE_TIMELINE, that is for later and
just sucked as collateral damage). As that requires a couple more
patches to complete the series, roll back the earlier chunks of ABI for
an intervening PR. We keep all the internals intact and under selftests.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190327105814.14694-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent a2deb873

drivers/gpu/drm/i915/i915_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -3122,8 +3122,6 @@ static const struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_PERF_ADD_CONFIG, i915_perf_add_config_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_PERF_REMOVE_CONFIG, i915_perf_remove_config_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_QUERY, i915_query_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_VM_CREATE, i915_gem_vm_create_ioctl, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW),

};



static struct drm_driver driver = {

drivers/gpu/drm/i915/i915_gem_context.c

+9 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ 
#include "intel_lrc_reg.h"

#include "intel_workarounds.h"



#define I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE (1 << 1)

#define I915_CONTEXT_PARAM_VM 0x9



#define ALL_L3_SLICES(dev) (1 << NUM_L3_SLICES(dev)) - 1



static struct i915_global_gem_context {
@@ -412,6 +415,8 @@ i915_gem_create_context(struct drm_i915_private *dev_priv, unsigned int flags) 


	lockdep_assert_held(&dev_priv->drm.struct_mutex);



	BUILD_BUG_ON(I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE &

		     ~I915_CONTEXT_CREATE_FLAGS_UNKNOWN);

	if (flags & I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE &&

	    !HAS_EXECLISTS(dev_priv))

		return ERR_PTR(-EINVAL);
@@ -971,6 +976,8 @@ static int get_ppgtt(struct i915_gem_context *ctx, 
	struct i915_hw_ppgtt *ppgtt;

	int ret;



	return -EINVAL; /* nothing to see here; please move along */



	if (!ctx->ppgtt)

		return -ENODEV;
@@ -1071,6 +1078,8 @@ static int set_ppgtt(struct i915_gem_context *ctx, 
	struct i915_hw_ppgtt *ppgtt, *old;

	int err;



	return -EINVAL; /* nothing to see here; please move along */



	if (args->size)

		return -EINVAL;

include/uapi/drm/i915_drm.h

+1 −17
Original line number Diff line number Diff line
@@ -343,8 +343,6 @@ typedef struct _drm_i915_sarea { 
#define DRM_I915_PERF_ADD_CONFIG	0x37

#define DRM_I915_PERF_REMOVE_CONFIG	0x38

#define DRM_I915_QUERY			0x39

#define DRM_I915_GEM_VM_CREATE		0x3a

#define DRM_I915_GEM_VM_DESTROY		0x3b

/* Must be kept compact -- no holes */



#define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
@@ -405,8 +403,6 @@ typedef struct _drm_i915_sarea { 
#define DRM_IOCTL_I915_PERF_ADD_CONFIG	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_ADD_CONFIG, struct drm_i915_perf_oa_config)

#define DRM_IOCTL_I915_PERF_REMOVE_CONFIG	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_REMOVE_CONFIG, __u64)

#define DRM_IOCTL_I915_QUERY			DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_QUERY, struct drm_i915_query)

#define DRM_IOCTL_I915_GEM_VM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)

#define DRM_IOCTL_I915_GEM_VM_DESTROY	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control)



/* Allow drivers to submit batchbuffers directly to hardware, relying

 * on the security mechanisms provided by hardware.
@@ -1456,9 +1452,8 @@ struct drm_i915_gem_context_create_ext { 
	__u32 ctx_id; /* output: id of new context*/

	__u32 flags;

#define I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS	(1u << 0)

#define I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE	(1u << 1)

#define I915_CONTEXT_CREATE_FLAGS_UNKNOWN \

	(-(I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE << 1))

	(-(I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS << 1))

	__u64 extensions;

};
@@ -1500,17 +1495,6 @@ struct drm_i915_gem_context_param { 
 * On creation, all new contexts are marked as recoverable.

 */

#define I915_CONTEXT_PARAM_RECOVERABLE	0x8



	/*

	 * The id of the associated virtual memory address space (ppGTT) of

	 * this context. Can be retrieved and passed to another context

	 * (on the same fd) for both to use the same ppGTT and so share

	 * address layouts, and avoid reloading the page tables on context

	 * switches between themselves.

	 *

	 * See DRM_I915_GEM_VM_CREATE and DRM_I915_GEM_VM_DESTROY.

	 */

#define I915_CONTEXT_PARAM_VM		0x9

/* Must be kept compact -- no holes and well documented */



	__u64 value;