Commit 399f7b67 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/uncore: add to_intel_uncore() and use it 



Add to_intel_uncore() function to avoid the inclusion of i915_drv.h from
intel_de.h. This reveals a number of implicit dependencies on i915_drv.h
that need to be added.

For now, to_intel_uncore() can be an inline function, with all the
includes in compat intel_uncore.h, as long as i915_drv.h isn't
included. The implicit dependencies on i915_drv.h is a problem in
display code, but the same is not true for xe_device.h etc.

Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/377e2b400d126776224fc49874ed9cb03ac3123c.1732104170.git.jani.nikula@intel.com
parent adceb416

drivers/gpu/drm/i915/display/g4x_dp.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/string_helpers.h>



#include "g4x_dp.h"

#include "i915_drv.h"

#include "i915_reg.h"

#include "intel_audio.h"

#include "intel_backlight.h"

drivers/gpu/drm/i915/display/g4x_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include "g4x_hdmi.h"

#include "i915_drv.h"

#include "i915_reg.h"

#include "intel_atomic.h"

#include "intel_audio.h"

drivers/gpu/drm/i915/display/i9xx_plane.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <drm/drm_blend.h>

#include <drm/drm_fourcc.h>



#include "i915_drv.h"

#include "i915_reg.h"

#include "i9xx_plane.h"

#include "i9xx_plane_regs.h"

drivers/gpu/drm/i915/display/icl_dsi.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <drm/drm_mipi_dsi.h>

#include <drm/drm_probe_helper.h>



#include "i915_drv.h"

#include "i915_reg.h"

#include "icl_dsi.h"

#include "icl_dsi_regs.h"

drivers/gpu/drm/i915/display/intel_alpm.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/debugfs.h>



#include "i915_drv.h"

#include "intel_alpm.h"

#include "intel_crtc.h"

#include "intel_de.h"