[Mesa-dev] [PATCH 1/3] ac: resolve conflicts introduced with "ac: remove amdgpu.h dependency"

[Bas Nieuwenhuizen]

The series is

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Tested-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

On Fri, Jun 16, 2017 at 10:09 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> The commit did not add the relevant includes - in particular
> stdint.h and stdbool.h for the respective standard types.
>
> At the same time, the amdgpu_device_handle typedef redeclaration was
> off.
>
> Fixes: 81945ded0dc ("ac: remove amdgpu.h dependency")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101471
> Cc: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
> Cc: Mark Janes <mark.a.janes at intel.com>
> Reported-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
> Reported-by: Mark Janes <mark.a.janes at intel.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/amd/common/ac_gpu_info.h | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h
> index a72ab58f9a3..3091fed6a43 100644
> --- a/src/amd/common/ac_gpu_info.h
> +++ b/src/amd/common/ac_gpu_info.h
> @@ -26,6 +26,8 @@
>  #ifndef AC_GPU_INFO_H
>  #define AC_GPU_INFO_H
>
> +#include <stdint.h>
> +#include <stdbool.h>
>  #include "amd_family.h"
>
>  #ifdef __cplusplus
> @@ -33,7 +35,7 @@ extern "C" {
>  #endif
>
>  /* Prior to C11 the following may trigger a typedef redeclaration warning */
> -typedef void * amdgpu_device_handle;
> +typedef struct amdgpu_device *amdgpu_device_handle;
>  struct amdgpu_gpu_info;
>
>  struct radeon_info {
> --
> 2.13.0
>