Skip to content

Commit 44ea208

Browse files
Wang_JohnZintel-mediadev
Wang_JohnZ
authored and
intel-mediadev
committed
[VP] Full support of Gen9 CML kernel integration
Full support of Gen9 CML kernel integration Stay the same compile option as Gen9 v20190405 http://ubit-gfx.intel.com/build/6522821 Change-Id: I967d7ef820abcdeac91a11d369ade1982c089984
1 parent 911bad6 commit 44ea208

File tree

9 files changed

+130
-31
lines changed

9 files changed

+130
-31
lines changed

‎media_driver/agnostic/gen9/vp/kernel/media_srcs.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@
2121
set(TMP_SOURCES_
2222
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_g9.c
2323
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_isa_g9.c
24-
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_g9_cml.c
2524
)
2625

2726
set(TMP_HEADERS_
2827
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_g9.h
2928
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_isa_g9.h
30-
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_g9_cml.h
3129
)
3230

3331
set(SOURCES_

‎media_driver/agnostic/gen9_cml/media_srcs.cmake

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright (c) 2019, Intel Corporation
2+
#
3+
# Permission is hereby granted, free of charge, to any person obtaining a
4+
# copy of this software and associated documentation files (the "Software"),
5+
# to deal in the Software without restriction, including without limitation
6+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
7+
# and/or sell copies of the Software, and to permit persons to whom the
8+
# Software is furnished to do so, subject to the following conditions:
9+
#
10+
# The above copyright notice and this permission notice shall be included
11+
# in all copies or substantial portions of the Software.
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
14+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
16+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
17+
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
18+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
19+
# OTHER DEALINGS IN THE SOFTWARE.
20+
21+
media_include_subdirectory(vp)

‎media_driver/agnostic/gen9/vp/kernel/igvpkrn_g9_cml.c ‎media_driver/agnostic/gen9_cml/vp/kernel/igvpkrn_g9_cml.c

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
/*
2-
* Copyright (c) 2019, Intel Corporation
3-
*
4-
* Permission is hereby granted, free of charge, to any person obtaining a
5-
* copy of this software and associated documentation files (the
6-
* 'Software'), to deal in the Software without restriction, including
7-
* without limitation the rights to use, copy, modify, merge, publish,
8-
* distribute, sublicense, and/or sell copies of the Software, and to
9-
* permit persons to whom the Software is furnished to do so, subject to
10-
* the following conditions:
11-
*
12-
* The above copyright notice and this permission notice shall be included
13-
* in all copies or substantial portions of the Software.
14-
*
15-
* THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS
16-
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17-
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18-
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19-
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20-
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21-
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22-
*/
1+
/*
2+
* Copyright (c) 2019, Intel Corporation
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a
5+
* copy of this software and associated documentation files (the
6+
* 'Software'), to deal in the Software without restriction, including
7+
* without limitation the rights to use, copy, modify, merge, publish,
8+
* distribute, sublicense, and/or sell copies of the Software, and to
9+
* permit persons to whom the Software is furnished to do so, subject to
10+
* the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included
13+
* in all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS
16+
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21+
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22+
*/
23+
24+
////////////////////////////////////////////////////////////////////////////////
25+
// !!! WARNING - AUTO GENERATED FILE. DO NOT EDIT DIRECTLY. !!!
26+
// Generated by KernelBinToSource.exe tool
27+
////////////////////////////////////////////////////////////////////////////////
2328

24-
////////////////////////////////////////////////////////////////////////////////
25-
// !!! WARNING - AUTO GENERATED FILE. DO NOT EDIT DIRECTLY. !!!
26-
// Generated by KernelBinToSource.exe tool
27-
////////////////////////////////////////////////////////////////////////////////
28-
29-
#ifdef IGFX_GEN9_SUPPORTED
29+
#ifdef IGFX_GEN9_CML_SUPPORTED
3030
extern const unsigned int IGVPKRN_G9_CML_SIZE = 1633728;
3131
extern const unsigned int IGVPKRN_G9_CML[] =
3232
{

‎media_driver/agnostic/gen9/vp/kernel/igvpkrn_g9_cml.h ‎media_driver/agnostic/gen9_cml/vp/kernel/igvpkrn_g9_cml.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019 Intel Corporation
2+
* Copyright (c) 2019, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the

‎media_driver/agnostic/gen9_cml/vp/kernel/media_srcs.cmake

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright (c) 2019, Intel Corporation
2+
#
3+
# Permission is hereby granted, free of charge, to any person obtaining a
4+
# copy of this software and associated documentation files (the "Software"),
5+
# to deal in the Software without restriction, including without limitation
6+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
7+
# and/or sell copies of the Software, and to permit persons to whom the
8+
# Software is furnished to do so, subject to the following conditions:
9+
#
10+
# The above copyright notice and this permission notice shall be included
11+
# in all copies or substantial portions of the Software.
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
14+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
16+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
17+
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
18+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
19+
# OTHER DEALINGS IN THE SOFTWARE.
20+
21+
set(TMP_SOURCES_
22+
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_g9_cml.c
23+
)
24+
25+
set(TMP_HEADERS_
26+
${CMAKE_CURRENT_LIST_DIR}/igvpkrn_g9_cml.h
27+
)
28+
29+
set(SOURCES_
30+
${SOURCES_}
31+
${TMP_SOURCES_}
32+
)
33+
34+
set(HEADERS_
35+
${HEADERS_}
36+
${TMP_HEADERS_}
37+
)
38+
39+
source_group( "Kernel\\VpKernel" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
40+
41+
42+
media_add_curr_to_include_path()

‎media_driver/agnostic/gen9_cml/vp/media_srcs.cmake

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright (c) 2019, Intel Corporation
2+
#
3+
# Permission is hereby granted, free of charge, to any person obtaining a
4+
# copy of this software and associated documentation files (the "Software"),
5+
# to deal in the Software without restriction, including without limitation
6+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
7+
# and/or sell copies of the Software, and to permit persons to whom the
8+
# Software is furnished to do so, subject to the following conditions:
9+
#
10+
# The above copyright notice and this permission notice shall be included
11+
# in all copies or substantial portions of the Software.
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
14+
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
16+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
17+
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
18+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
19+
# OTHER DEALINGS IN THE SOFTWARE.
20+
21+
if(ENABLE_KERNELS AND ENABLE_NONFREE_KERNELS)
22+
media_include_subdirectory(kernel)
23+
endif()

‎media_driver/agnostic/media_srcs.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ if(GEN9)
205205
media_include_subdirectory(gen9)
206206
endif()
207207

208+
if(GEN9_CML)
209+
media_include_subdirectory(gen9_cml)
210+
endif()
211+
208212
if(GEN9_BXT)
209213
media_include_subdirectory(gen9_bxt)
210214
endif()

‎media_driver/cmake/linux/media_gen_flags_linux.cmake

+7
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ cmake_dependent_option(GEN9_KBL
3939
cmake_dependent_option(GEN9_SKL
4040
"Enabled SKL support (Gen9)" ON
4141
"GEN9" OFF)
42+
cmake_dependent_option(GEN9_CML
43+
"Enabled CML support (Gen9)" ON
44+
"GEN9" OFF)
4245

4346
option(GEN10 "Enable Gen10 support" ON)
4447
cmake_dependent_option(GEN10_CNL
@@ -82,6 +85,10 @@ if(GEN9_KBL)
8285
add_definitions(-DIGFX_GEN9_KBL_SUPPORTED)
8386
endif()
8487

88+
if(GEN9_CML)
89+
add_definitions(-DIGFX_GEN9_CML_SUPPORTED)
90+
endif()
91+
8592
if(GEN10)
8693
add_definitions(-DIGFX_GEN10_SUPPORTED)
8794
endif()

‎media_driver/linux/media_srcs.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ if(GEN9)
2828
media_include_subdirectory(gen9)
2929
endif()
3030

31+
if(GEN9_CML)
32+
media_include_subdirectory(gen9_cml)
33+
endif()
34+
3135
if(GEN9_BXT)
3236
media_include_subdirectory(gen9_bxt)
3337
endif()

0 commit comments

Comments
 (0)