Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f261b24 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/uc: move GuC and HuC files under gt/uc/ 



Both microcontrollers are part of the GT HW and are closely related to
GT operations. To keep all the files cleanly together, they've been
placed in their own subdir inside the gt/ folder

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190713100016.8026-6-chris@chris-wilson.co.uk


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 633023a4

drivers/gpu/drm/i915/Makefile

+11 −10
Original line number Diff line number Diff line
@@ -139,16 +139,17 @@ i915-y += \ 
	  intel_wopcm.o



# general-purpose microcontroller (GuC) support

i915-y += intel_uc.o \

	  intel_uc_fw.o \

	  intel_guc.o \

	  intel_guc_ads.o \

	  intel_guc_ct.o \

	  intel_guc_fw.o \

	  intel_guc_log.o \

	  intel_guc_submission.o \

	  intel_huc.o \

	  intel_huc_fw.o

obj-y += gt/uc/

i915-y += gt/uc/intel_uc.o \

	  gt/uc/intel_uc_fw.o \

	  gt/uc/intel_guc.o \

	  gt/uc/intel_guc_ads.o \

	  gt/uc/intel_guc_ct.o \

	  gt/uc/intel_guc_fw.o \

	  gt/uc/intel_guc_log.o \

	  gt/uc/intel_guc_submission.o \

	  gt/uc/intel_huc.o \

	  gt/uc/intel_huc_fw.o



# modesetting core code

obj-y += display/

drivers/gpu/drm/i915/Makefile.header-test

+0 −4
Original line number Diff line number Diff line
@@ -19,14 +19,10 @@ header_test := \ 
	i915_vgpu.h \

	intel_csr.h \

	intel_drv.h \

	intel_guc_ct.h \

	intel_guc_fwif.h \

	intel_guc_reg.h \

	intel_gvt.h \

	intel_pm.h \

	intel_runtime_pm.h \

	intel_sideband.h \

	intel_uc_fw.h \

	intel_uncore.h \

	intel_wakeref.h

drivers/gpu/drm/i915/gt/intel_reset.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "intel_gt_pm.h"

#include "intel_reset.h"



#include "intel_guc.h"

#include "uc/intel_guc.h"



#define RESET_MAX_RETRIES 3

drivers/gpu/drm/i915/gt/uc/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# For building individual subdir files on the command line

subdir-ccflags-y += -I$(srctree)/$(src)/../..



# Extra header tests

include $(src)/Makefile.header-test

drivers/gpu/drm/i915/gt/uc/Makefile.header-test

0 → 100644
+16 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT

# Copyright © 2019 Intel Corporation



# Test the headers are compilable as standalone units

header_test := $(notdir $(wildcard $(src)/*.h))



quiet_cmd_header_test = HDRTEST $@

      cmd_header_test = echo "\#include \"$(<F)\"" > $@



header_test_%.c: %.h

	$(call cmd,header_test)



extra-$(CONFIG_DRM_I915_WERROR) += \

	$(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))



clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))