Commit 801543b2 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: stop including i915_irq.h from i915_trace.h 



Turns out many of the files that need i915_reg.h get it implicitly via
{display/intel_de.h, gt/intel_context.h} -> i915_trace.h -> i915_irq.h
-> i915_reg.h. Since i915_trace.h doesn't actually need i915_irq.h,
makes sense to drop it, but that requires adding quite a few new
includes all over the place.

Prefer including i915_reg.h where needed instead of adding another
implicit include, because eventually we'll want to split up i915_reg.h
and only include the specific registers at each place.

Also some places actually needed i915_irq.h too.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6e78a2e0ac1bffaf5af3b5ccc21dff05e6518cef.1668008071.git.jani.nikula@intel.com
parent e563531a

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_reg.h"

#include "intel_audio.h"

#include "intel_backlight.h"

#include "intel_connector.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_reg.h"

#include "intel_audio.h"

#include "intel_connector.h"

#include "intel_crtc.h"

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

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

#include <drm/drm_fourcc.h>



#include "i915_irq.h"

#include "i915_reg.h"

#include "i9xx_plane.h"

#include "intel_atomic.h"

#include "intel_atomic_plane.h"

#include "intel_de.h"
@@ -15,7 +18,6 @@ 
#include "intel_fb.h"

#include "intel_fbc.h"

#include "intel_sprite.h"

#include "i9xx_plane.h"



/* Primary plane formats for gen <= 3 */

static const u32 i8xx_primary_formats[] = {

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

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

#include <drm/drm_mipi_dsi.h>



#include "i915_reg.h"

#include "icl_dsi.h"

#include "icl_dsi_regs.h"

#include "intel_atomic.h"

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

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

#include <linux/string_helpers.h>



#include "i915_reg.h"

#include "intel_backlight.h"

#include "intel_backlight_regs.h"

#include "intel_connector.h"