Commit 111a3f0a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2024-02-01' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



UAPI Changes:
- Only allow a single user-fence per exec / bind.
  The reason for this clarification fix is a limitation in the implementation
  which can be lifted moving forward, if needed.

Driver Changes:
- A crash fix
- A fix for an assert due to missing mem_acces ref
- Only allow a single user-fence per exec / bind.
- Some sparse warning fixes
- Two fixes for compilation failures on various odd
  combinations of gcc / arch pointed out on LKML.
- Fix a fragile partial allocation pointed out on LKML.

Cross-driver Change:
- A sysfs ABI documentation warning fix
  This also touches i915 and is acked by i915 maintainers.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZbuCYdMDVK-kAWC5@fedora
parents 419d8a93 5f16ee27

Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

+7 −7
Original line number Diff line number Diff line 
What:		/sys/devices/.../hwmon/hwmon<i>/in0_input

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -6,7 +6,7 @@ Description: RO. Current Voltage in millivolt. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -20,7 +20,7 @@ Description: RW. Card reactive sustained (PL1/Tau) power limit in microwatts. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_rated_max

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_rated_max

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -28,7 +28,7 @@ Description: RO. Card default power limit (default TDP setting). 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max_interval

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max_interval

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -37,7 +37,7 @@ Description: RW. Sustained power limit interval (Tau in PL1/Tau) in 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_crit

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_crit

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -50,7 +50,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/curr1_crit

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/curr1_crit

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org
@@ -63,7 +63,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes. 


		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/energy1_input

What:		/sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/energy1_input

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+7 −7
Original line number Diff line number Diff line 
What:		/sys/devices/.../hwmon/hwmon<i>/power1_max

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -12,7 +12,7 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_rated_max

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_rated_max

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -20,7 +20,7 @@ Description: RO. Card default power limit (default TDP setting). 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_crit

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -33,7 +33,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/curr1_crit

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -44,7 +44,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes. 
		the operating frequency if the power averaged over a window

		exceeds this limit.



What:		/sys/devices/.../hwmon/hwmon<i>/in0_input

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in0_input

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -52,7 +52,7 @@ Description: RO. Current Voltage in millivolt. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/energy1_input

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input

Date:		September 2023

KernelVersion:	6.5

Contact:	intel-xe@lists.freedesktop.org
@@ -60,7 +60,7 @@ Description: RO. Energy input of device in microjoules. 


		Only supported for particular Intel xe graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max_interval

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval

Date:		October 2023

KernelVersion:	6.6

Contact:	intel-xe@lists.freedesktop.org

drivers/gpu/drm/xe/abi/guc_actions_abi.h

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 


#define HOST2GUC_SELF_CFG_REQUEST_MSG_LEN		(GUC_HXG_REQUEST_MSG_MIN_LEN + 3u)

#define HOST2GUC_SELF_CFG_REQUEST_MSG_0_MBZ		GUC_HXG_REQUEST_MSG_0_DATA0

#define HOST2GUC_SELF_CFG_REQUEST_MSG_1_KLV_KEY		(0xffff << 16)

#define HOST2GUC_SELF_CFG_REQUEST_MSG_1_KLV_LEN		(0xffff << 0)

#define HOST2GUC_SELF_CFG_REQUEST_MSG_1_KLV_KEY		(0xffffu << 16)

#define HOST2GUC_SELF_CFG_REQUEST_MSG_1_KLV_LEN		(0xffffu << 0)

#define HOST2GUC_SELF_CFG_REQUEST_MSG_2_VALUE32		GUC_HXG_REQUEST_MSG_n_DATAn

#define HOST2GUC_SELF_CFG_REQUEST_MSG_3_VALUE64		GUC_HXG_REQUEST_MSG_n_DATAn

drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h

+2 −2
Original line number Diff line number Diff line
@@ -242,8 +242,8 @@ struct slpc_shared_data { 
		(HOST2GUC_PC_SLPC_REQUEST_REQUEST_MSG_MIN_LEN + \

			HOST2GUC_PC_SLPC_EVENT_MAX_INPUT_ARGS)

#define HOST2GUC_PC_SLPC_REQUEST_MSG_0_MBZ		GUC_HXG_REQUEST_MSG_0_DATA0

#define HOST2GUC_PC_SLPC_REQUEST_MSG_1_EVENT_ID		(0xff << 8)

#define HOST2GUC_PC_SLPC_REQUEST_MSG_1_EVENT_ARGC	(0xff << 0)

#define HOST2GUC_PC_SLPC_REQUEST_MSG_1_EVENT_ID		(0xffu << 8)

#define HOST2GUC_PC_SLPC_REQUEST_MSG_1_EVENT_ARGC	(0xffu << 0)

#define HOST2GUC_PC_SLPC_REQUEST_MSG_N_EVENT_DATA_N	GUC_HXG_REQUEST_MSG_n_DATAn



#endif

drivers/gpu/drm/xe/abi/guc_communication_ctb_abi.h

+4 −4
Original line number Diff line number Diff line
@@ -82,11 +82,11 @@ static_assert(sizeof(struct guc_ct_buffer_desc) == 64); 
#define GUC_CTB_HDR_LEN				1u

#define GUC_CTB_MSG_MIN_LEN			GUC_CTB_HDR_LEN

#define GUC_CTB_MSG_MAX_LEN			256u

#define GUC_CTB_MSG_0_FENCE			(0xffff << 16)

#define GUC_CTB_MSG_0_FORMAT			(0xf << 12)

#define GUC_CTB_MSG_0_FENCE			(0xffffu << 16)

#define GUC_CTB_MSG_0_FORMAT			(0xfu << 12)

#define   GUC_CTB_FORMAT_HXG			0u

#define GUC_CTB_MSG_0_RESERVED			(0xf << 8)

#define GUC_CTB_MSG_0_NUM_DWORDS		(0xff << 0)

#define GUC_CTB_MSG_0_RESERVED			(0xfu << 8)

#define GUC_CTB_MSG_0_NUM_DWORDS		(0xffu << 0)



/**

 * DOC: CTB HXG Message