tests: Documentation refactoring part 1

Unify documentation for Intel i915 tests that we have by moving
common parts to be available for all tests.

v2: rebase on master, add 3 more files with refactoring
(tests/intel/api_intel_allocator.c, tests/intel/api_intel_bb.c,
tests/intel/gem_busy.c)

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
Acked-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

9 files changed, 82 insertions, 349 deletions

diff --git a/tests/intel/api_intel_allocator.c b/tests/intel/api_intel_allocator.c
index b2e6770fe..f260250d4 100644
--- a/tests/intel/api_intel_allocator.c
+++ b/tests/intel/api_intel_allocator.c
@@ -16,79 +16,49 @@
 /**
  * TEST: api intel allocator
  * Category: Infrastructure
- * Functionality: virtual address ranges
+ * Functionality: virtual address
+ * Description: checking the virtual address ranges
  * Run type: FULL
  * Sub-category: IGT Lib
  * Test category: GEM_Legacy
+ * Feature: igt_core
  *
  * SUBTEST: alloc-simple
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: default-alignment
- * Description:
- *   For simple allocator check does default alignment is properly handled in open and alloc
- *   functions
- *   checking the virtual address ranges
- * Feature: igt_core
+ * Description: For simple allocator check does default alignment is properly
+ *		handled in open and alloc functions checking the virtual
+ *		address ranges
  *
  * SUBTEST: execbuf-with-allocator
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: fork-simple-once
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: fork-simple-stress
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: fork-simple-stress-signal
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: gem-pool
- * Description:
- *   Verifies creating and executing bb from gem pool
- *   checking the virtual address ranges
- * Feature: igt_core
+ * Description: Verifies creating and executing bb from gem pool checking
+ *		the virtual address ranges
  *
  * SUBTEST: open-vm
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: reloc-allocator
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: reopen
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: reopen-fork
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: reserve-simple
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: simple-allocator
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: standalone
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: two-level-inception
- * Description: checking the virtual address ranges
- * Feature: igt_core
  *
  * SUBTEST: two-level-inception-interruptible
- * Description: checking the virtual address ranges
- * Feature: igt_core
  */
 
 #define OBJ_SIZE 1024
diff --git a/tests/intel/api_intel_bb.c b/tests/intel/api_intel_bb.c
index 8a210f2ab..74e334581 100644
--- a/tests/intel/api_intel_bb.c
+++ b/tests/intel/api_intel_bb.c
@@ -43,210 +43,72 @@
 #include "intel_blt.h"
 /**
  * TEST: api intel bb
- * Description: intel_bb API check.
- * Run type: FULL
- *
- * SUBTEST: add-remove-objects
  * Category: Infrastructure
  * Description: checking dummy buffer creation & submission
  * Feature: igt_core
  * Functionality: dummy buffer creation & submission
  * Sub-category: IGT Lib
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: add-remove-objects
  *
  * SUBTEST: bb-with-allocator
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-noreloc-keep-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-noreloc-purge-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-reloc-keep-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-reloc-purge-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: crc32
  * Description: Compare cpu and gpu crc32 sums on input object
- * Feature: igt_core
- * Test category: GEM_Legacy
  *
  * SUBTEST: delta-check
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: destroy-bb
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: full-batch
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: intel-bb-blit-none
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: intel-bb-blit-x
- * Feature: igt_core
  *
  * SUBTEST: intel-bb-blit-y
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: lot-of-buffers
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: misplaced-blitter
- * Category: Infrastructure
- * Description:
- *   Execute intel_bb with set of engines provided by userspace
- *   checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
+ * Description: Execute intel_bb with set of engines provided by userspace
+ *		checking dummy buffer creation & submission
  *
  * SUBTEST: object-noreloc-keep-cache-simple
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: object-noreloc-purge-cache-simple
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: object-reloc-keep-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: object-reloc-purge-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: offset-control
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: purge-bb
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: render
- * Feature: igt_core
  *
  * SUBTEST: render-ccs
- * Feature: igt_core
  *
  * SUBTEST: reset-bb
- * Category: Infrastructure
- * Description:
- *   Ensure reset is possible on fresh bb
- *   checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
+ * Description: Ensure reset is possible on fresh bb checking dummy buffer
+ *		creation & submission
  *
  * SUBTEST: reset-flags
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: simple-bb
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: simple-bb-ctx
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  */
 
 #define PAGE_SIZE 4096
diff --git a/tests/intel/debugfs_test.c b/tests/intel/debugfs_test.c
index b67bfabac..9706b81e1 100644
--- a/tests/intel/debugfs_test.c
+++ b/tests/intel/debugfs_test.c
@@ -33,43 +33,29 @@
  * TEST: debugfs test
  * Description: Read entries from debugfs, hwmon and sysfs paths.
  * Feature: core
+ * Category: Infrastructure
+ * Functionality: debugfs
+ * Sub-category: uapi
+ * Test category: uapi
+ * Run type: FULL
  *
  * SUBTEST: basic-hwmon
- * Category: Infrastructure
- * Description:
- *   Read all entries from hwmon path
- *   validating debugfs entries
- * Functionality: debugfs entries
+ * Description: Read all entries from hwmon path validating debugfs entries
  * Run type: BAT
- * Test category: GEM_Legacy
  *
  * SUBTEST: read_all_entries
- * Category: Infrastructure
- * Description:
- *   Read all entries from debugfs path.
- *   validating debugfs entries
- * Functionality: debugfs entries
+ * Description: Read all entries from debugfs path validating debugfs entries
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: read_all_entries_display_off
  * Description: Read all debugfs entries with display on/off.
- * Run type: FULL
  *
  * SUBTEST: read_all_entries_display_on
  * Description: Read all debugfs entries with display on/off.
- * Run type: FULL
  *
  * SUBTEST: sysfs
- * Category: Infrastructure
- * Description:
- *   Read all entries from sysfs path.
- *   validating debugfs entries
- * Functionality: debugfs entries
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Read all entries from sysfs path validating debugfs entries
+ *
  */
 
 IGT_TEST_DESCRIPTION("Read entries from debugfs, hwmon and sysfs paths.");
diff --git a/tests/intel/gem_basic.c b/tests/intel/gem_basic.c
index 3485f92c8..513113cd1 100644
--- a/tests/intel/gem_basic.c
+++ b/tests/intel/gem_basic.c
@@ -44,33 +44,21 @@
 /**
  * TEST: gem basic
  * Description: Tests basic gem_create and gem_close IOCTLs
- *
- * SUBTEST: bad-close
  * Category: Infrastructure
- * Description: Verify that gem_close fails with bad params.
  * Feature: gem_core
  * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
+ * Sub-category: uapi
  * Test category: GEM_Legacy
+ * Run type: BAT
+ *
+ * SUBTEST: bad-close
+ * Description: Verify that gem_close fails with bad params.
  *
  * SUBTEST: create-close
- * Category: Infrastructure
  * Description: Verify basic functionality of gem_create and gem_close.
- * Feature: gem_core
- * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-fd-close
- * Category: Infrastructure
  * Description: Verify that closing drm driver is possible with opened gem object.
- * Feature: gem_core
- * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: multigpu-create-close
  * Description: Verify basic functionality of gem_create and gem_close on multi-GPU.
diff --git a/tests/intel/gem_blits.c b/tests/intel/gem_blits.c
index e567cdf33..b9d0b5f87 100644
--- a/tests/intel/gem_blits.c
+++ b/tests/intel/gem_blits.c
@@ -34,7 +34,7 @@
  * Feature: blitter
  * Functionality: command streamer
  * Run type: FULL
- * Sub-category: HW
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
  *
  * SUBTEST: basic
diff --git a/tests/intel/gem_busy.c b/tests/intel/gem_busy.c
index c60654b1e..7baaac41f 100644
--- a/tests/intel/gem_busy.c
+++ b/tests/intel/gem_busy.c
@@ -33,57 +33,43 @@
 /**
  * TEST: gem busy
  * Description: Basic check of busy-ioctl ABI.
+ * Category: Desktop client
+ * Functionality: semaphore
+ * Sub-category: uapi
+ * Test category: GEM_Legacy
  * Feature: cmd_submission
  * Run type: FULL
  *
  * SUBTEST: busy
- * Category: Desktop client
  * Description: Basic test to check busyness of each engine.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: busy@all
- * Functionality: Semaphore
  *
  * SUBTEST: busy@all-engines
  * Run type: BAT
  *
  * SUBTEST: close-race
- * Category: Desktop client
- * Description: Test to check race condition by randomly closing the handle using gem_close.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Test to check race condition by randomly closing the handle
+ *		using gem_close.
  *
  * SUBTEST: extended
- * Category: Desktop client
  * Description: Extended test to check busyness of dwstore-capable engines.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: hang
- * Description: Basic test to check hang state behaviour of engines with increased timeout.
+ * Description: Basic test to check hang state behaviour of engines with
+ *		increased timeout.
  *
  * SUBTEST: hang-extended
- * Description:
- *   Extended test to check hang state behaviour of dwstore-capable engines with increased
- *   timeout.
+ * Description: Extended test to check hang state behaviour of dwstore-capable
+ *		engines with increased timeout.
  *
  * SUBTEST: parallel
- * Category: Desktop client
- * Description:
- *   Extended test to check busyness of dwstore-capable engines while doing parallel
- *   execution.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Extended test to check busyness of dwstore-capable engines
+ *		while doing parallel execution.
  *
  * SUBTEST: semaphore
- * Description:
- *   Test to check busyness of engine on submitting a new batch while engine is busy in executing
- *   previous batch.
+ * Description: Test to check busyness of engine on submitting a new batch
+ *		while engine is busy in executing previous batch.
  */
 
 #define PAGE_ALIGN(x) ALIGN(x, 4096)
diff --git a/tests/intel/gem_ccs.c b/tests/intel/gem_ccs.c
index e8f16d7d8..3442ecfd3 100644
--- a/tests/intel/gem_ccs.c
+++ b/tests/intel/gem_ccs.c
@@ -19,11 +19,11 @@
 /**
  * TEST: gem ccs
  * Description: Exercise gen12 blitter with and without flatccs compression
+ * Feature: flat_ccs_mapping
  * Run type: FULL
  *
  * SUBTEST: block-copy-compressed
  * Description: Check block-copy flatccs compressed blit
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: block-copy-uncompressed
  * Description: Check block-copy uncompressed blit
@@ -31,19 +31,16 @@
  *
  * SUBTEST: block-multicopy-compressed
  * Description: Check block-multicopy flatccs compressed blit
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: block-multicopy-inplace
  * Description: Check block-multicopy flatccs inplace decompression blit
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: ctrl-surf-copy
  * Description: Check flatccs data can be copied from/to surface
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: ctrl-surf-copy-new-ctx
- * Description: Check flatccs data are physically tagged and visible in different contexts
- * Feature: flat_ccs_mapping
+ * Description: Check flatccs data are physically tagged and visible i
+ *		different contexts
  *
  * SUBTEST: suspend-resume
  * Description: Check flatccs data persists after suspend / resume (S0)
diff --git a/tests/intel/gem_close_race.c b/tests/intel/gem_close_race.c
index cef0ff025..9c2034ad3 100644
--- a/tests/intel/gem_close_race.c
+++ b/tests/intel/gem_close_race.c
@@ -51,57 +51,42 @@
 /**
  * TEST: gem close race
  * Description: Test try to race gem_close against workload submission.
- *
- * SUBTEST: basic-process
  * Category: Infrastructure
- * Description: Basic workload submission.
  * Feature: synchronization
  * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: basic-process
+ * Description: Basic workload submission.
+ * Run type: BAT
  *
  * SUBTEST: basic-threads
- * Category: Infrastructure
- * Description:
- *   Share buffer handle across different drm fd's and trying to race gem_close against
- *   continuous workload with minimum timeout.
- * Feature: synchronization
- * Functionality: driver handler
+ * Description: Share buffer handle across different drm fd's and trying to
+ *		race gem_close against continuous workload with minimum timeout.
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: contexts
- * Description:
- *   Share buffer handle across different drm fd's and trying to race gem_close against
- *   continuous workload in other contexts.
- * Feature: synchronization
- * Run type: FULL
+ * Description: Share buffer handle across different drm fd's and trying to
+ *		race gem_close against continuous workload in other contexts.
  *
  * SUBTEST: gem-close-race
- * Description:
- *   Share buffer handle across different drm fd's and trying to race of gem_close against
- *   continuous workload.
- * Feature: synchronization
- * Run type: FULL
+ * Description: Share buffer handle across different drm fd's and trying to
+ *		race of gem_close against continuous workload.
  *
  * SUBTEST: multigpu-basic-process
  * Description: Basic workload submission on multi-GPU machine.
  * Feature: multigpu, synchronization
- * Run type: FULL
  * Test category: MultiGPU
  *
  * SUBTEST: multigpu-basic-threads
  * Description: Run basic-threads race on multi-GPU machine.
  * Feature: multigpu, synchronization
- * Run type: FULL
  * Test category: MultiGPU
  *
  * SUBTEST: process-exit
  * Description: Test try to race gem_close against submission of continuous workload.
- * Feature: synchronization
- * Run type: FULL
  */
 
 #define OBJECT_SIZE (256 * 1024)
diff --git a/tests/intel/gem_create.c b/tests/intel/gem_create.c
index 87fde2963..77ffceda4 100644
--- a/tests/intel/gem_create.c
+++ b/tests/intel/gem_create.c
@@ -64,101 +64,60 @@
 #include "i915_drm.h"
 /**
  * TEST: gem create
- * Description:
- *   Ensure that basic gem_create and gem_create_ext works and that invalid input combinations
- *   are rejected.
- * Run type: FULL
- *
- * SUBTEST: busy-create
+ * Description: Ensure that basic gem_create and gem_create_ext works and that
+ *		invalid input combinations are rejected.
  * Category: Infrastructure
- * Description: Create buffer objects while GPU is busy.
  * Feature: mapping
  * Functionality: buffer management
- * Sub-category: i915
+ * Sub-category: uapi
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: busy-create
+ * Description: Create buffer objects while GPU is busy.
  *
  * SUBTEST: create-clear
- * Category: Infrastructure
  * Description: Verify that all new objects are clear.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-ext-cpu-access-big
- * Description:
- *   Verify the extreme cases with very large objects and.
- *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
- * Feature: mapping
+ * Description: Verify the extreme cases with very large objects and
+ *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
  *
  * SUBTEST: create-ext-cpu-access-sanity-check
- * Description:
- *   Verify the basic functionally and expected ABI contract around.
- *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
- * Feature: mapping
+ * Description: Verify the basic functionally and expected ABI contract around
+ *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
  *
  * SUBTEST: create-ext-placement-all
  * Category: Infrastructure
  * Description: Create objects in every memory region using create_ext.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-ext-placement-each
- * Category: Infrastructure
- * Description: Create one object with memory pieces in each memory region using create_ext.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Create one object with memory pieces in each memory region
+ *		using create_ext.
  *
  * SUBTEST: create-ext-placement-sanity-check
- * Category: Infrastructure
  * Description: Exercise create_ext placements extension.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-invalid-size
- * Category: Infrastructure
- * Description: Try to create a gem object of invalid size 0 and check if ioctl returns error.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Try to create a gem object of invalid size 0 and check if
+ *		ioctl returns error.
  *
  * SUBTEST: create-massive
- * Category: Infrastructure
- * Description: Exercise creation of buffer object with impossible size and check for the expected error.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Exercise creation of buffer object with impossible size and
+ *		check for the expected error.
  *
  * SUBTEST: create-size-update
- * Category: Infrastructure
- * Description: Try to create a gem object with size 15 and check actual created size.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Try to create a gem object with size 15 and check actual
+ *		created size.
  *
  * SUBTEST: create-valid-nonaligned
- * Category: Infrastructure
- * Description:
- *   Try to create an object with non-aligned size, check we got one with size aligned up to page
- *   size and test we can write into the padded extra memory.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Try to create an object with non-aligned size, check we got one
+ *		with size aligned up to page size and test we can write into
+ *		the padded extra memory.
  *
  * SUBTEST: hog-create
  * Description: Create buffer objects while GPU is busy.
- * Feature: mapping
- * Test category: GEM_Legacy
+ *
  */
 
 IGT_TEST_DESCRIPTION("Ensure that basic gem_create and gem_create_ext works"