On Thu, 08 Dec 2022, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote:
> On Thu, Dec 08, 2022 at 04:23:47PM +0200, Jani Nikula wrote:
>> 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@xxxxxxxxxxxxxxx>
>> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>> Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx>
>> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>>
>> ---
>>
>> Naming, always the naming! soc? ext? offcore? In the Makefile I'm adding
>> comment "core peripheral code", which is also silly. *facepalm*
>> ---
>> drivers/gpu/drm/i915/Makefile | 7 +++++--
>> drivers/gpu/drm/i915/i915_driver.c | 3 ++-
>> drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>> drivers/gpu/drm/i915/{ => soc}/intel_dram.c | 0
>> drivers/gpu/drm/i915/{ => soc}/intel_dram.h | 0
>> drivers/gpu/drm/i915/{ => soc}/intel_pch.c | 0
>> drivers/gpu/drm/i915/{ => soc}/intel_pch.h | 0
>> 7 files changed, 9 insertions(+), 4 deletions(-)
>> rename drivers/gpu/drm/i915/{ => soc}/intel_dram.c (100%)
>> rename drivers/gpu/drm/i915/{ => soc}/intel_dram.h (100%)
>> rename drivers/gpu/drm/i915/{ => soc}/intel_pch.c (100%)
>> rename drivers/gpu/drm/i915/{ => soc}/intel_pch.h (100%)
>>
>> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
>> index 01974b82d205..7046e435a155 100644
>> --- a/drivers/gpu/drm/i915/Makefile
>> +++ b/drivers/gpu/drm/i915/Makefile
>> @@ -48,9 +48,7 @@ i915-y += i915_driver.o \
>> i915_sysfs.o \
>> i915_utils.o \
>> intel_device_info.o \
>> - intel_dram.o \
>> intel_memory_region.o \
>> - intel_pch.o \
>> intel_pcode.o \
>
> should pcode be moved as well?
>
>> intel_pm.o \
>> intel_region_ttm.o \
>> @@ -62,6 +60,11 @@ i915-y += i915_driver.o \
>> vlv_sideband.o \
>
> and also maybe the sideband?
Yeah, should be considered as a follow-up.
>
> anyway,
>
> Acked-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Thanks, pushed to drm-intel-next.
BR,
Jani.
>
>> vlv_suspend.o
>>
>> +# core peripheral code
>> +i915-y += \
>> + soc/intel_dram.o \
>> + soc/intel_pch.o
>> +
>> # core library code
>> i915-y += \
>> i915_memcpy.o \
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>> index 4cc3ced83959..6c87cfa0d7c8 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -75,6 +75,8 @@
>>
>> #include "pxp/intel_pxp_pm.h"
>>
>> +#include "soc/intel_dram.h"
>> +
>> #include "i915_file_private.h"
>> #include "i915_debugfs.h"
>> #include "i915_driver.h"
>> @@ -93,7 +95,6 @@
>> #include "i915_sysfs.h"
>> #include "i915_utils.h"
>> #include "i915_vgpu.h"
>> -#include "intel_dram.h"
>> #include "intel_gvt.h"
>> #include "intel_memory_region.h"
>> #include "intel_pci_config.h"
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index a8a5bd426e78..b6d0c12ffeea 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -49,6 +49,8 @@
>> #include "gt/intel_workarounds.h"
>> #include "gt/uc/intel_uc.h"
>>
>> +#include "soc/intel_pch.h"
>> +
>> #include "i915_drm_client.h"
>> #include "i915_gem.h"
>> #include "i915_gpu_error.h"
>> @@ -58,7 +60,6 @@
>> #include "i915_utils.h"
>> #include "intel_device_info.h"
>> #include "intel_memory_region.h"
>> -#include "intel_pch.h"
>> #include "intel_runtime_pm.h"
>> #include "intel_step.h"
>> #include "intel_uncore.h"
>> diff --git a/drivers/gpu/drm/i915/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_dram.c
>> rename to drivers/gpu/drm/i915/soc/intel_dram.c
>> diff --git a/drivers/gpu/drm/i915/intel_dram.h b/drivers/gpu/drm/i915/soc/intel_dram.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_dram.h
>> rename to drivers/gpu/drm/i915/soc/intel_dram.h
>> diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_pch.c
>> rename to drivers/gpu/drm/i915/soc/intel_pch.c
>> diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/soc/intel_pch.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_pch.h
>> rename to drivers/gpu/drm/i915/soc/intel_pch.h
>> --
>> 2.34.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
