[Mesa-dev] [PATCH 2/2] meson: build imx driver

[Christian Gmeiner]

2017-10-21 1:04 GMT+02:00 Dylan Baker <dylan at pnwbakers.com>:
> This is build tested only.
>
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>

Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

> ---
>  meson.build                            |  5 +++++
>  meson_options.txt                      |  2 +-
>  src/gallium/meson.build                |  3 +++
>  src/gallium/targets/dri/meson.build    |  5 +++++
>  src/gallium/winsys/imx/drm/meson.build | 28 ++++++++++++++++++++++++++++
>  5 files changed, 42 insertions(+), 1 deletion(-)
>  create mode 100644 src/gallium/winsys/imx/drm/meson.build
>
> diff --git a/meson.build b/meson.build
> index 143ee7febf3..fdd99e48ae7 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -98,6 +98,7 @@ with_gallium_softpipe = false
>  with_gallium_vc4 = false
>  with_gallium_vc5 = false
>  with_gallium_etnaviv = false
> +with_gallium_imx = false
>  _drivers = get_option('gallium-drivers')
>  if _drivers != ''
>    _split = _drivers.split(',')
> @@ -108,6 +109,7 @@ if _drivers != ''
>    with_gallium_vc4 = _split.contains('vc4')
>    with_gallium_vc5 = _split.contains('vc5')
>    with_gallium_etnaviv = _split.contains('etnaviv')
> +  with_gallium_imx = _split.contains('imx')
>    with_gallium = true
>    with_dri = true
>  endif
> @@ -123,6 +125,9 @@ endif
>  if with_dri_swrast and with_gallium_softpipe
>    error('Only one swrast provider can be built')
>  endif
> +if with_gallium_imx and not with_gallium_etnaviv
> +  error('IMX driver requires etnaviv driver')
> +endif
>
>  dep_libdrm_intel = []
>  if with_dri_i915
> diff --git a/meson_options.txt b/meson_options.txt
> index fbc6fad5a41..4596c8415cd 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -46,7 +46,7 @@ option(
>  option(
>    'gallium-drivers',
>    type : 'string',
> -  value : 'pl111,radeonsi,nouveau,swrast,vc4,etnaviv',
> +  value : 'pl111,radeonsi,nouveau,swrast,vc4,etnaviv,imx',
>    description : 'comma separated list of gallium drivers to build.'
>  )
>  option(
> diff --git a/src/gallium/meson.build b/src/gallium/meson.build
> index cc823ca2e4f..29b0548a62e 100644
> --- a/src/gallium/meson.build
> +++ b/src/gallium/meson.build
> @@ -61,6 +61,9 @@ endif
>  if with_gallium_etnaviv
>    subdir('winsys/etnaviv/drm')
>  endif
> +if with_gallium_imx
> +  subdir('winsys/imx/drm')
> +endif
>  subdir('state_trackers/dri')
>  # TODO: freedreno
>  # TODO: i915
> diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
> index 9640e8acbab..1517fcc5d3c 100644
> --- a/src/gallium/targets/dri/meson.build
> +++ b/src/gallium/targets/dri/meson.build
> @@ -96,6 +96,11 @@ if with_gallium_etnaviv
>    gallium_dri_link_with += [libetnaviv, libetnavivdrm]
>    gallium_dri_drivers += 'etnaviv_dri.so'
>  endif
> +if with_gallium_imx
> +  gallium_dri_c_args += '-DGALLIUM_IMX'
> +  gallium_dri_link_with += libimxdrm
> +  gallium_dri_drivers += 'imx-drm_dri.so'
> +endif
>
>  if with_gallium_vc4 or with_gallium_vc5
>    gallium_dri_link_with += libbroadcom_cle
> diff --git a/src/gallium/winsys/imx/drm/meson.build b/src/gallium/winsys/imx/drm/meson.build
> new file mode 100644
> index 00000000000..468345476ec
> --- /dev/null
> +++ b/src/gallium/winsys/imx/drm/meson.build
> @@ -0,0 +1,28 @@
> +# Copyright © 2017 Intel Corporation
> +
> +# Permission is hereby granted, free of charge, to any person obtaining a copy
> +# of this software and associated documentation files (the "Software"), to deal
> +# in the Software without restriction, including without limitation the rights
> +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> +# copies of the Software, and to permit persons to whom the Software is
> +# furnished to do so, subject to the following conditions:
> +
> +# The above copyright notice and this permission notice shall be included in
> +# all copies or substantial portions of the Software.
> +
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> +# SOFTWARE.
> +
> +libimxdrm = static_library(
> +  'imxdrm',
> +  'imx_drm_winsys.c',
> +  include_directories : [
> +    inc_include, inc_src, inc_gallium, inc_gallium_aux,
> +    include_directories('../..'),
> +  ],
> +)
> --
> 2.14.2
>

greets
--
Christian Gmeiner, MSc

https://christian-gmeiner.info