[igt-dev] [PATCH i-g-t] lib/intel_memory_region: Fix missing header inclusion

[Petri Latvala]

On Fri, Jun 10, 2022 at 01:33:35PM +0200, Janusz Krzysztofik wrote:
> IGT commit 68efa99c62e2 ("i915/gem_eio: Exercise object creation while
> wedged") extended lib/i915/intel_memory_region.h header with a definition
> of new struct gem_memory_region.  That structure contains a member of type
> struct drm_i915_gem_memory_class_instance, but definition of that type is
> not available unless "i915_drm.h" header is included.  Include the missing
> header.
> 
> ../lib/i915/intel_memory_region.h:118:44: error: field ‘ci’ has incomplete type
>   118 |  struct drm_i915_gem_memory_class_instance ci;
> 
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com>

I was wondering why I haven't seen that error, but everything
currently has i915_drm.h included directly or indirectly before
intel_memory_region.h so it was hidden.

Reviewed-by: Petri Latvala <petri.latvala at intel.com>


> ---
>  lib/i915/intel_memory_region.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/lib/i915/intel_memory_region.h b/lib/i915/intel_memory_region.h
> index f9af9401ea..a874172401 100644
> --- a/lib/i915/intel_memory_region.h
> +++ b/lib/i915/intel_memory_region.h
> @@ -20,6 +20,7 @@
>   * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
>   * IN THE SOFTWARE.
>   */
> +#include "i915_drm.h"
>  #include "igt_collection.h"
>  
>  #ifndef INTEL_MEMORY_REGION_H
> @@ -62,8 +63,6 @@ unsigned int gem_get_lmem_region_count(int fd);
>  
>  bool gem_has_lmem(int fd);
>  
> -struct drm_i915_gem_memory_class_instance;
> -
>  int __gem_create_in_memory_region_list(int fd, uint32_t *handle, uint64_t *size,
>  				       struct drm_i915_gem_memory_class_instance *mem_regions,
>  				       int num_regions);
> -- 
> 2.25.1
>