Commit 28f587ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2025-03-07' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Fixes across the board, mostly xe and imagination with some amd and
  misc others.

  The xe fixes are mostly hmm related, though there are some others in
  there as well, nothing really stands out otherwise.

  The nouveau Kconfig to select FW_CACHE is in this, which we discussed
  a while back.

  nouveau:
   - rely on fw caching Kconfig fix

  imagination:
   - avoid deadlock on fence release
   - fix fence initialisation
   - fix timestamps firmware traces

  scheduler:
   - fix include guard

  bochs:
   - dpms fix

  i915:
   - bump max stream count to match pipes

  xe:
   - Remove double page flip on initial plane
   - Properly setup userptr pfn_flags_mask
   - Fix GT "for each engine" workarounds
   - Fix userptr races and missed validations
   - Userptr invalid page access fixes
   - Cleanup some style nits

  amdgpu:
   - Fix NULL check in DC code
   - SMU 14 fix

  amdkfd:
   - Fix NULL check in queue validation

  radeon:
   - RS400 HyperZ fix"

* tag 'drm-fixes-2025-03-07' of https://gitlab.freedesktop.org/drm/kernel: (22 commits)
  drm/bochs: Fix DPMS regression
  drm/xe/userptr: Unmap userptrs in the mmu notifier
  drm/xe/hmm: Don't dereference struct page pointers without notifier lock
  drm/xe/hmm: Style- and include fixes
  drm/xe: Add staging tree for VM binds
  drm/xe: Fix fault mode invalidation with unbind
  drm/xe/vm: Fix a misplaced #endif
  drm/xe/vm: Validate userptr during gpu vma prefetching
  drm/amd/pm: always allow ih interrupt from fw
  drm/radeon: Fix rs400_gpu_init for ATI mobility radeon Xpress 200M
  drm/amdkfd: Fix NULL Pointer Dereference in KFD queue
  drm/amd/display: Fix null check for pipe_ctx->plane_state in resource_build_scaling_params
  drm/xe: Fix GT "for each engine" workarounds
  drm/xe/userptr: properly setup pfn_flags_mask
  drm/i915/mst: update max stream count to match number of pipes
  drm/xe: Remove double pageflip
  drm/sched: Fix preprocessor guard
  drm/imagination: Fix timestamps in firmware traces
  drm/imagination: only init job done fences once
  drm/imagination: Hold drm_gem_gpuva lock for unmap
  ...
parents 0f52fd4f c8bc6620

drivers/gpu/drm/amd/amdkfd/kfd_queue.c

+2 −2
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_prope 
	/* EOP buffer is not required for all ASICs */

	if (properties->eop_ring_buffer_address) {

		if (properties->eop_ring_buffer_size != topo_dev->node_props.eop_buffer_size) {

			pr_debug("queue eop bo size 0x%lx not equal to node eop buf size 0x%x\n",

				properties->eop_buf_bo->tbo.base.size,

			pr_debug("queue eop bo size 0x%x not equal to node eop buf size 0x%x\n",

				properties->eop_ring_buffer_size,

				topo_dev->node_props.eop_buffer_size);

			err = -EINVAL;

			goto out_err_unreserve;

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+2 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,8 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) 
	DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);



	/* Invalid input */

	if (!plane_state->dst_rect.width ||

	if (!plane_state ||

			!plane_state->dst_rect.width ||

			!plane_state->dst_rect.height ||

			!plane_state->src_rect.width ||

			!plane_state->src_rect.height) {

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c

+1 −11
Original line number Diff line number Diff line
@@ -1895,16 +1895,6 @@ static int smu_v14_0_allow_ih_interrupt(struct smu_context *smu) 
				    NULL);

}



static int smu_v14_0_process_pending_interrupt(struct smu_context *smu)

{

	int ret = 0;



	if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_ACDC_BIT))

		ret = smu_v14_0_allow_ih_interrupt(smu);



	return ret;

}



int smu_v14_0_enable_thermal_alert(struct smu_context *smu)

{

	int ret = 0;
@@ -1916,7 +1906,7 @@ int smu_v14_0_enable_thermal_alert(struct smu_context *smu) 
	if (ret)

		return ret;



	return smu_v14_0_process_pending_interrupt(smu);

	return smu_v14_0_allow_ih_interrupt(smu);

}



int smu_v14_0_disable_thermal_alert(struct smu_context *smu)

drivers/gpu/drm/i915/display/intel_dp_mst.c

+2 −1
Original line number Diff line number Diff line
@@ -1867,7 +1867,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id) 
	/* create encoders */

	mst_stream_encoders_create(dig_port);

	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, display->drm,

					   &intel_dp->aux, 16, 3, conn_base_id);

					   &intel_dp->aux, 16,

					   INTEL_NUM_PIPES(display), conn_base_id);

	if (ret) {

		intel_dp->mst_mgr.cbs = NULL;

		return ret;

drivers/gpu/drm/imagination/pvr_fw_meta.c

+4 −2
Original line number Diff line number Diff line
@@ -527,8 +527,10 @@ pvr_meta_vm_map(struct pvr_device *pvr_dev, struct pvr_fw_object *fw_obj) 
static void

pvr_meta_vm_unmap(struct pvr_device *pvr_dev, struct pvr_fw_object *fw_obj)

{

	pvr_vm_unmap(pvr_dev->kernel_vm_ctx, fw_obj->fw_mm_node.start,

		     fw_obj->fw_mm_node.size);

	struct pvr_gem_object *pvr_obj = fw_obj->gem;



	pvr_vm_unmap_obj(pvr_dev->kernel_vm_ctx, pvr_obj,

			 fw_obj->fw_mm_node.start, fw_obj->fw_mm_node.size);

}



static bool