Commit ed46f724 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move intel_dram.[ch] from soc/ to display/ 



The remaining users of intel_dram.[ch] are all in display. Move them
under display.

This allows us to remove the compat soc/intel_dram.h from xe.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/4c0fbdab989a70d287536a7eafb002dc836ced12.1763578288.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 2d74a093

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ i915-y += \ 


# core peripheral code

i915-y += \

	soc/intel_dram.o \

	soc/intel_gmch.o \

	soc/intel_rom.o
@@ -268,6 +267,7 @@ i915-y += \ 
	display/intel_dpll_mgr.o \

	display/intel_dpt.o \

	display/intel_dpt_common.o \

	display/intel_dram.o \

	display/intel_drrs.o \

	display/intel_dsb.o \

	display/intel_dsb_buffer.o \

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

+1 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


#include <drm/drm_print.h>



#include "soc/intel_dram.h"



#include "i915_drv.h"

#include "i915_reg.h"

#include "i9xx_wm.h"
@@ -19,6 +17,7 @@ 
#include "intel_display.h"

#include "intel_display_regs.h"

#include "intel_display_trace.h"

#include "intel_dram.h"

#include "intel_fb.h"

#include "intel_mchbar_regs.h"

#include "intel_wm.h"

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

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

#include <drm/drm_print.h>



#include "soc/intel_dram.h"



#include "i915_drv.h"

#include "i915_reg.h"

#include "intel_bw.h"
@@ -16,6 +14,7 @@ 
#include "intel_display_regs.h"

#include "intel_display_types.h"

#include "intel_display_utils.h"

#include "intel_dram.h"

#include "intel_mchbar_regs.h"

#include "intel_pcode.h"

#include "intel_uncore.h"

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

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include <drm/drm_fixed.h>

#include <drm/drm_print.h>



#include "soc/intel_dram.h"



#include "hsw_ips.h"

#include "i915_drv.h"

#include "i915_reg.h"
@@ -42,6 +40,7 @@ 
#include "intel_display_regs.h"

#include "intel_display_types.h"

#include "intel_display_utils.h"

#include "intel_dram.h"

#include "intel_mchbar_regs.h"

#include "intel_pci_config.h"

#include "intel_pcode.h"

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

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


#include <drm/drm_print.h>



#include "soc/intel_dram.h"



#include "i915_drv.h"

#include "i915_reg.h"

#include "intel_backlight_regs.h"
@@ -25,6 +23,7 @@ 
#include "intel_display_types.h"

#include "intel_display_utils.h"

#include "intel_dmc.h"

#include "intel_dram.h"

#include "intel_mchbar_regs.h"

#include "intel_parent.h"

#include "intel_pch_refclk.h"