From mboxrd@z Thu Jan 1 00:00:00 1970 From: "StDenis, Tom" Subject: Re: [PATCH] Autodetect libdrm path (v2) Date: Sun, 5 Feb 2017 22:42:46 +0000 Message-ID: References: <20170205222447.19945-1-tom.stdenis@amd.com>, <62ec2a45-ea86-a643-f7fd-3e5e5054540b@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0905585622==" Return-path: In-Reply-To: <62ec2a45-ea86-a643-f7fd-3e5e5054540b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Content-Language: en-US List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: Andres Rodriguez , Tom St Denis , "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" --===============0905585622== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_CY4PR12MB17683BCCBAC6759B4118F4EEF7410CY4PR12MB1768namp_" --_000_CY4PR12MB17683BCCBAC6759B4118F4EEF7410CY4PR12MB1768namp_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Thanks. Pushed it. Tom ________________________________ From: Andres Rodriguez Sent: Sunday, February 5, 2017 17:28 To: Tom St Denis; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: StDenis, Tom Subject: Re: [PATCH] Autodetect libdrm path (v2) Reviewed-by: Andres Rodriguez On 2/5/2017 5:24 PM, Tom St Denis wrote: > (v2): Use findLibDRM script instead of directly finding path > > Signed-off-by: Tom St Denis > --- > CMakeLists.txt | 3 +++ > cmake_modules/FindLibDRM.cmake | 35 +++++++++++++++++++++++++++++++++++ > src/lib/query_drm.c | 4 ++-- > 3 files changed, 40 insertions(+), 2 deletions(-) > create mode 100644 cmake_modules/FindLibDRM.cmake > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index bef94fdba788..ef78c97ad763 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -25,6 +25,9 @@ include_directories(${CURSES_INCLUDE_DIRS}) > find_package(PCIAccess REQUIRED) > include_directories(${PCIACCESS_INCLUDE_DIR}) > > +find_package(LibDRM REQUIRED) > +include_directories(${LIBDRM_INCLUDE_DIR}) > + > set(REQUIRED_EXTERNAL_LIBS > ${CURSES_LIBRARIES} > ${PCIACCESS_LIBRARIES} > diff --git a/cmake_modules/FindLibDRM.cmake b/cmake_modules/FindLibDRM.cm= ake > new file mode 100644 > index 000000000000..e840c4d1bfd0 > --- /dev/null > +++ b/cmake_modules/FindLibDRM.cmake > @@ -0,0 +1,35 @@ > +# Try to find libdrm > +# > +# Once done, this will define > +# > +# LIBDRM_FOUND > +# LIBDRM_INCLUDE_DIR > +# LIBDRM_LIBRARIES > + > +find_package(PkgConfig) > + > +pkg_check_modules(PC_LIBDRM QUIET libdrm) > + > +find_path(LIBDRM_INCLUDE_DIR NAMES amdgpu_drm.h > + HINTS > + ${PC_LIBDRM_INCLUDEDIR} > + ${PC_LIBDRM_INCLUDE_DIRS} > + /usr/include > +) > + > +find_library(LIBDRM_LIBRARY NAMES libdrm_amdgpu.so.1 > + HINTS > + ${PC_LIBDRM_LIBDIR} > + ${PC_LIBDRM_LIBRARY_DIRS} > + /usr/lib64 > + /usr/lib > +) > + > +SET(LIBDRM_LIBRARIES optimized ${LIBDRM_LIBRARY}) > + > +include(FindPackageHandleStandardArgs) > +find_package_handle_standard_args(LIBDRM DEFAULT_MSG > + LIBDRM_LIBRARIES LIBDRM_INCLUDE_DIR > +) > + > +mark_as_advanced(LIBDRM_INCLUDE_DIR LIBDRM_LIBRARIES) > diff --git a/src/lib/query_drm.c b/src/lib/query_drm.c > index b9d80a8fc0c8..755c65fbc662 100644 > --- a/src/lib/query_drm.c > +++ b/src/lib/query_drm.c > @@ -25,8 +25,8 @@ > #include "umr.h" > #include > #include > -#include > -#include > +#include > +#include > > #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) > #define DRM_IOC_WRITE _IOC_WRITE > --_000_CY4PR12MB17683BCCBAC6759B4118F4EEF7410CY4PR12MB1768namp_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

Thanks.  Pushed it.


Tom



From: Andres Rodriguez &l= t;andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Sent: Sunday, February 5, 2017 17:28
To: Tom St Denis; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: StDenis, Tom
Subject: Re: [PATCH] Autodetect libdrm path (v2)
 
Reviewed-by: Andres Rodriguez<andresx7-Re5JQEeQqe8@public.gmane.org= m>

On 2/5/2017 5:24 PM, Tom St Denis wrote:
> (v2):  Use findLibDRM script instead of directly finding path
>
> Signed-off-by: Tom St Denis <tom.stdenis-5C7GfCeVMHo@public.gmane.org>
> ---
>  CMakeLists.txt        &n= bsp;        |  3 +++ >  cmake_modules/FindLibDRM.cmake | 35 +++++= 3;++++++++++++++= 3;++++++++++++++ >  src/lib/query_drm.c       &nb= sp;    |  4 ++--
>  3 files changed, 40 insertions(+), 2 deletions(-)
>  create mode 100644 cmake_modules/FindLibDRM.cmake
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index bef94fdba788..ef78c97ad763 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -25,6 +25,9 @@ include_directories(${CURSES_INCLUDE_DIRS})
>  find_package(PCIAccess REQUIRED)
>  include_directories(${PCIACCESS_INCLUDE_DIR})
>
> +find_package(LibDRM REQUIRED)
> +include_directories(${LIBDRM_INCLUDE_DIR})
> +
>  set(REQUIRED_EXTERNAL_LIBS
>    ${CURSES_LIBRARIES}
>    ${PCIACCESS_LIBRARIES}
> diff --git a/cmake_modules/FindLibDRM.cmake b/cmake_modules/FindLibDRM= .cmake
> new file mode 100644
> index 000000000000..e840c4d1bfd0
> --- /dev/null
> +++ b/cmake_modules/FindLibDRM.cmake
> @@ -0,0 +1,35 @@
> +# Try to find libdrm
> +#
> +# Once done, this will define
> +#
> +# LIBDRM_FOUND
> +# LIBDRM_INCLUDE_DIR
> +# LIBDRM_LIBRARIES
> +
> +find_package(PkgConfig)
> +
> +pkg_check_modules(PC_LIBDRM QUIET libdrm)
> +
> +find_path(LIBDRM_INCLUDE_DIR NAMES amdgpu_drm.h
> +    HINTS
> +    ${PC_LIBDRM_INCLUDEDIR}
> +    ${PC_LIBDRM_INCLUDE_DIRS}
> +    /usr/include
> +)
> +
> +find_library(LIBDRM_LIBRARY NAMES libdrm_amdgpu.so.1
> +    HINTS
> +    ${PC_LIBDRM_LIBDIR}
> +    ${PC_LIBDRM_LIBRARY_DIRS}
> +    /usr/lib64
> +    /usr/lib
> +)
> +
> +SET(LIBDRM_LIBRARIES optimized ${LIBDRM_LIBRARY})
> +
> +include(FindPackageHandleStandardArgs)
> +find_package_handle_standard_args(LIBDRM DEFAULT_MSG
> +     LIBDRM_LIBRARIES LIBDRM_INCLUDE_DIR
> +)
> +
> +mark_as_advanced(LIBDRM_INCLUDE_DIR LIBDRM_LIBRARIES)
> diff --git a/src/lib/query_drm.c b/src/lib/query_drm.c
> index b9d80a8fc0c8..755c65fbc662 100644
> --- a/src/lib/query_drm.c
> +++ b/src/lib/query_drm.c
> @@ -25,8 +25,8 @@
>  #include "umr.h"
>  #include <asm/ioctl.h>
>  #include <sys/ioctl.h>
> -#include <drm/drm.h>
> -#include <drm/amdgpu_drm.h>
> +#include <drm.h>
> +#include <amdgpu_drm.h>
>
>  #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)=
>  #define DRM_IOC_WRITE       &= nbsp;   _IOC_WRITE
>
--_000_CY4PR12MB17683BCCBAC6759B4118F4EEF7410CY4PR12MB1768namp_-- --===============0905585622== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg== --===============0905585622==--