Commit 109d101e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: include uapi/drm/i915_drm.h directly where needed 



Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
drm/i915_drm.h only where needed.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220311100639.114685-2-jani.nikula@intel.com
parent 0438fd1a

drivers/gpu/drm/i915/gem/i915_gem_lmem.c

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Copyright © 2019 Intel Corporation

 */



#include <uapi/drm/i915_drm.h>



#include "intel_memory_region.h"

#include "gem/i915_gem_region.h"

#include "gem/i915_gem_lmem.h"

drivers/gpu/drm/i915/gem/i915_gem_region.c

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Copyright © 2019 Intel Corporation

 */



#include <uapi/drm/i915_drm.h>



#include "intel_memory_region.h"

#include "i915_gem_region.h"

#include "i915_drv.h"

drivers/gpu/drm/i915/intel_memory_region.c

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


#include <linux/prandom.h>



#include <uapi/drm/i915_drm.h>



#include "intel_memory_region.h"

#include "i915_drv.h"

#include "i915_ttm_buddy_manager.h"

drivers/gpu/drm/i915/intel_memory_region.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/mutex.h>

#include <linux/io-mapping.h>

#include <drm/drm_mm.h>

#include <drm/i915_drm.h>

#include <uapi/drm/i915_drm.h>



struct drm_i915_private;

struct drm_i915_gem_object;

drivers/gpu/drm/i915/pxp/intel_pxp_session.c

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
 * Copyright(c) 2020, Intel Corporation. All rights reserved.

 */



#include <drm/i915_drm.h>



#include "i915_drv.h"



#include "intel_pxp.h"