[CP] Change CP SUBCOMP ID

Change CP SUBCOMP ID in case regkey message dropped, see JIRA in commit for deatails

Author: peiranzh

media_common/agnostic/common/os/mos_util_user_feature_keys.h

@@ -268,10 +268,10 @@
 //!        3 bits for level, 1 bit for assert on/off, 1 bit for warning message per sub-component.
 //!        Each component has to create a separate key for its sub-comps.
 //!
-//!     63_____60_59_____55_54______50_49_______45_44_________40_39_____35_34______30_29_____25_24_____20_19_____15_14__10_9_____________5_4______________0
-//!     |        |   LIB   |   DLL    |AUTHCHANNEL|SECURESESSION| CMD_BFR | UMD_CTXT |  CODEC  | GPU_HAL | PCH_HAL |  OS  |    DEVICE     |    CP_DDI     |
-//!     |Reserved|  W|A|L  |   W|A|L  |   W|A|L   |    W|A|L    |  W|A|L  |  W|A|L   |  W|A|L  |  W|A|L  |  W|A|L  |W|A|L |Warn|Asrt|level|Warn|Asrt|level|
-//!     |________|_________|__________|___________|_____________|_________|__________|_________|_________|_________|______|_______________|_______________|
+//!     63_____30_29___25_24___20_19_____15_14_____10_9_____5_4______________0
+//!     |        | CODEC |  MHW  | GPU_HAL | TEE_HAL |   OS  |     DDI       |
+//!     |Reserved| W|A|L | W|A|L |  W|A|L  |  W|A|L  | W|A|L |Warn|Asrt|level|
+//!     |________|_______|_______|_________|_________|_______|_______________|
 //!
 #define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_CP_TAG                 "CP Sub Components Tags"
 

media_softlet/agnostic/common/os/mos_util_debug.h

@@ -104,26 +104,29 @@ typedef enum
 //       in mos_util_user_feature_keys.h if you change this enum.
 typedef enum
 {
-    MOS_CP_SUBCOMP_DDI              = 0,             // CP-related DDIs
-    MOS_CP_SUBCOMP_DEVICE           = 1,             // The CP device class
-    MOS_CP_SUBCOMP_OS               = 2,             // The CP OS services classes
-    MOS_CP_SUBCOMP_PCH_HAL          = 3,             // The CP PCH HAL class
-    MOS_CP_SUBCOMP_GPU_HAL          = 4,             // The CP GPU HAL classes
-    MOS_CP_SUBCOMP_CODEC            = 5,             // Content Protection portions of the Codec UMD
-    MOS_CP_SUBCOMP_UMD_CONTEXT      = 6,             // Content Protection portions of UMD device context
-    MOS_CP_SUBCOMP_CMD_BUFFER       = 7,             // Content Protection Command buffer class
-    MOS_CP_SUBCOMP_SECURESESSION    = 8,             // The secure session classes
-    MOS_CP_SUBCOMP_AUTHCHANNEL      = 9,             // The AuthChannel classes
-    MOS_CP_SUBCOMP_DLL              = 10,            // CP DLL classes
-    MOS_CP_SUBCOMP_LIB              = 11,            // Lib classes
-    MOS_CP_SUBCOMP_MHW              = 12,            // CP MHW classes
-    MOS_CP_SUBCOMP_PROTECTEDSESSION = 13,            // Protected session class
-    MOS_CP_SUBCOMP_PROTECTED_RESOURCE_SESSION = 14,  // Protected Resource session class
-    MOS_CP_SUBCOMP_TEE_HAL          = 15,            // CP TEE HAL class
-    MOS_CP_SUBCOMP_CAPS             = 16,            // CP CAPS clas
-    MOS_CP_SUBCOMP_CPLIB            = 17,            // CP CPLIB interacting
-    MOS_CP_SUBCOMP_CENC             = 18,            // CP cenc class
-    MOS_CP_SUBCOMP_COUNT                             // Must be last in the list
+    MOS_CP_SUBCOMP_DDI              = 0,                              // CP-related DDIs
+    MOS_CP_SUBCOMP_DEVICE           = MOS_CP_SUBCOMP_DDI,             // (DDI)The CP device class
+    MOS_CP_SUBCOMP_UMD_CONTEXT      = MOS_CP_SUBCOMP_DDI,             // (DDI)Content Protection portions of UMD device context
+    MOS_CP_SUBCOMP_SECURESESSION    = MOS_CP_SUBCOMP_DDI,             // (DDI)The secure session classes
+    MOS_CP_SUBCOMP_AUTHCHANNEL      = MOS_CP_SUBCOMP_DDI,             // (DDI)The AuthChannel classes
+    MOS_CP_SUBCOMP_PROTECTEDSESSION = MOS_CP_SUBCOMP_DDI,             // (DDI)Protected session class
+    MOS_CP_SUBCOMP_PROTECTED_RESOURCE_SESSION = MOS_CP_SUBCOMP_DDI,   // (DDI)Protected Resource session class
+    MOS_CP_SUBCOMP_CAPS             = MOS_CP_SUBCOMP_DDI,             // (DDI)CP CAPS clas
+
+    MOS_CP_SUBCOMP_OS               = 1,                              // The CP OS services classes
+
+    MOS_CP_SUBCOMP_TEE_HAL          = 2,                              // CP TEE HAL class
+    MOS_CP_SUBCOMP_PCH_HAL          = MOS_CP_SUBCOMP_TEE_HAL,         // (TEE_HAL)The CP PCH HAL class
+    MOS_CP_SUBCOMP_DLL              = MOS_CP_SUBCOMP_TEE_HAL,         // (TEE_HAL)CP DLL classes
+
+    MOS_CP_SUBCOMP_GPU_HAL          = 3,                              // The CP GPU HAL classes
+
+    MOS_CP_SUBCOMP_MHW              = 4,                              // CP MHW classes
+
+    MOS_CP_SUBCOMP_CODEC            = 5,                              // Content Protection portions of the Codec UMD
+    MOS_CP_SUBCOMP_CENC             = MOS_CP_SUBCOMP_CODEC,           // (CODEC)CP cenc class
+
+    MOS_CP_SUBCOMP_COUNT                                              // Must be last in the list
 } MOS_CP_SUBCOMP_ID;
 
 //!