Commit 06d3ff6e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move intel_csr.[ch] under display/ 



The DMC firmware is about display. Move the handling under display. No
functional changes.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200211161451.6867-1-jani.nikula@intel.com
parent 8eecfb39

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ i915-y += i915_drv.o \ 
	  i915_switcheroo.o \

	  i915_sysfs.o \

	  i915_utils.o \

	  intel_csr.o \

	  intel_device_info.o \

	  intel_memory_region.o \

	  intel_pch.o \
@@ -183,6 +182,7 @@ i915-y += \ 
	display/intel_color.o \

	display/intel_combo_phy.o \

	display/intel_connector.o \

	display/intel_csr.o \

	display/intel_display.o \

	display/intel_display_power.o \

	display/intel_dpio_phy.o \

drivers/gpu/drm/i915/i915_debugfs.c

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

#include <drm/drm_fourcc.h>



#include "display/intel_csr.h"

#include "display/intel_display_types.h"

#include "display/intel_dp.h"

#include "display/intel_fbc.h"
@@ -51,7 +52,6 @@ 
#include "i915_debugfs_params.h"

#include "i915_irq.h"

#include "i915_trace.h"

#include "intel_csr.h"

#include "intel_pm.h"

#include "intel_sideband.h"

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "display/intel_audio.h"

#include "display/intel_bw.h"

#include "display/intel_cdclk.h"

#include "display/intel_csr.h"

#include "display/intel_display_types.h"

#include "display/intel_dp.h"

#include "display/intel_fbdev.h"
@@ -77,7 +78,6 @@ 
#include "i915_sysfs.h"

#include "i915_trace.h"

#include "i915_vgpu.h"

#include "intel_csr.h"

#include "intel_memory_region.h"

#include "intel_pm.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE