History

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.

Chris Wilson committed 7 years ago

Commit 96fd2c61 parent a2deb873 files · +10 −19Browse files

Showing the changes to include/uapi (1 of 3 files). Show all

Unified · Split

include/uapi/drm/i915_drm.h+1−17
@@ -343,8 +343,6 @@ typedef struct _drm_i915_sarea { · 342 unmodified lines
343343 #define DRM_I915_PERF_ADD_CONFIG 0x37
344344 #define DRM_I915_PERF_REMOVE_CONFIG 0x38
345345 #define DRM_I915_QUERY 0x39
346−#define DRM_I915_GEM_VM_CREATE 0x3a
347−#define DRM_I915_GEM_VM_DESTROY 0x3b
348346 /* Must be kept compact -- no holes */
349347
350348 #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 { · 54 unmodified lines
405403 #define DRM_IOCTL_I915_PERF_ADD_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_ADD_CONFIG, struct drm_i915_perf_oa_config)
406404 #define DRM_IOCTL_I915_PERF_REMOVE_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_REMOVE_CONFIG, __u64)
407405 #define DRM_IOCTL_I915_QUERY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_QUERY, struct drm_i915_query)
408−#define DRM_IOCTL_I915_GEM_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)
409−#define DRM_IOCTL_I915_GEM_VM_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control)
410406
411407 /* Allow drivers to submit batchbuffers directly to hardware, relying
412408 * on the security mechanisms provided by hardware.
@@ -1456,9 +1452,8 @@ struct drm_i915_gem_context_create_ext { · 1043 unmodified lines
14561452 __u32 ctx_id; /* output: id of new context*/
14571453 __u32 flags;
14581454 #define I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS (1u << 0)
1459−#define I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE (1u << 1)
14601455 #define I915_CONTEXT_CREATE_FLAGS_UNKNOWN \
1461− (-(I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE << 1))
1456+ (-(I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS << 1))
14621457 __u64 extensions;
14631458 };
14641459
@@ -1500,17 +1495,6 @@ struct drm_i915_gem_context_param { · 35 unmodified lines
15001495 * On creation, all new contexts are marked as recoverable.
15011496 */
15021497 #define I915_CONTEXT_PARAM_RECOVERABLE 0x8
1503−
1504− /*
1505− * The id of the associated virtual memory address space (ppGTT) of
1506− * this context. Can be retrieved and passed to another context
1507− * (on the same fd) for both to use the same ppGTT and so share
1508− * address layouts, and avoid reloading the page tables on context
1509− * switches between themselves.
1510− *
1511− * See DRM_I915_GEM_VM_CREATE and DRM_I915_GEM_VM_DESTROY.
1512− */
1513−#define I915_CONTEXT_PARAM_VM 0x9
15141498 /* Must be kept compact -- no holes and well documented */
15151499
15161500 __u64 value;