Skip to content

Commit f052feb

Browse files
committed
drm/i915: add new "soc" sub-directory and move PCH and DRAM code there
Add a new sub-directory for things that aren't specifically about the GPU and don't really belong in the i915 driver top level, but also don't belong under any of the existing sub-directories either. Name it "soc", and move the PCH and DRAM code there. Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20221208142347.602726-1-jani.nikula@intel.com
1 parent aeb0351 commit f052feb

File tree

7 files changed

+9
-4
lines changed

7 files changed

+9
-4
lines changed

drivers/gpu/drm/i915/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ i915-y += i915_driver.o \
4848
i915_sysfs.o \
4949
i915_utils.o \
5050
intel_device_info.o \
51-
intel_dram.o \
5251
intel_memory_region.o \
53-
intel_pch.o \
5452
intel_pcode.o \
5553
intel_pm.o \
5654
intel_region_ttm.o \
@@ -62,6 +60,11 @@ i915-y += i915_driver.o \
6260
vlv_sideband.o \
6361
vlv_suspend.o
6462

63+
# core peripheral code
64+
i915-y += \
65+
soc/intel_dram.o \
66+
soc/intel_pch.o
67+
6568
# core library code
6669
i915-y += \
6770
i915_memcpy.o \

drivers/gpu/drm/i915/i915_driver.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@
7575

7676
#include "pxp/intel_pxp_pm.h"
7777

78+
#include "soc/intel_dram.h"
79+
7880
#include "i915_file_private.h"
7981
#include "i915_debugfs.h"
8082
#include "i915_driver.h"
@@ -93,7 +95,6 @@
9395
#include "i915_sysfs.h"
9496
#include "i915_utils.h"
9597
#include "i915_vgpu.h"
96-
#include "intel_dram.h"
9798
#include "intel_gvt.h"
9899
#include "intel_memory_region.h"
99100
#include "intel_pci_config.h"

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
#include "gt/intel_workarounds.h"
5050
#include "gt/uc/intel_uc.h"
5151

52+
#include "soc/intel_pch.h"
53+
5254
#include "i915_drm_client.h"
5355
#include "i915_gem.h"
5456
#include "i915_gpu_error.h"
@@ -58,7 +60,6 @@
5860
#include "i915_utils.h"
5961
#include "intel_device_info.h"
6062
#include "intel_memory_region.h"
61-
#include "intel_pch.h"
6263
#include "intel_runtime_pm.h"
6364
#include "intel_step.h"
6465
#include "intel_uncore.h"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)