From: Dave Airlie <airlied@redhat.com>
Date: Mon, 15 Sep 2025 07:51:07 +0000 (+1000)
Subject: Merge tag 'v6.17-rc6' into drm-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d9f0083f7a5a31d91d501467b499bb8c4b25bdf;p=users%2Fhch%2Fmisc.git

Merge tag 'v6.17-rc6' into drm-next

This is a backmerge of Linux 6.17-rc6, needed for msm,
also requested by misc.

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

0d9f0083f7a5a31d91d501467b499bb8c4b25bdf
diff --cc drivers/gpu/drm/amd/display/dc/dc.h
index aa808675fead,f24e1da68269..954a2786fbe2
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@@ -1157,12 -1145,7 +1157,12 @@@ struct dc_debug_options 
  	bool enable_hblank_borrow;
  	bool force_subvp_df_throttle;
  	uint32_t acpi_transition_bitmasks[MAX_PIPES];
+ 	bool enable_pg_cntl_debug_logs;
 +	unsigned int auxless_alpm_lfps_setup_ns;
 +	unsigned int auxless_alpm_lfps_period_ns;
 +	unsigned int auxless_alpm_lfps_silence_ns;
 +	unsigned int auxless_alpm_lfps_t1t2_us;
 +	short auxless_alpm_lfps_t1t2_offset_us;
- 	bool enable_pg_cntl_debug_logs;
  };
  
  
diff --cc drivers/gpu/drm/drm_gpuvm.c
index 78a1a4f09509,db9b089ef62c..a52e95555549
--- a/drivers/gpu/drm/drm_gpuvm.c
+++ b/drivers/gpu/drm/drm_gpuvm.c
@@@ -2741,10 -2613,13 +2743,10 @@@ err_free_ops
  /**
   * drm_gpuvm_sm_map_ops_create() - creates the &drm_gpuva_ops to split and merge
   * @gpuvm: the &drm_gpuvm representing the GPU VA space
 - * @req_addr: the start address of the new mapping
 - * @req_range: the range of the new mapping
 - * @req_obj: the &drm_gem_object to map
 - * @req_offset: the offset within the &drm_gem_object
 + * @req: map request arguments
   *
   * This function creates a list of operations to perform splitting and merging
-  * of existent mapping(s) with the newly requested one.
+  * of existing mapping(s) with the newly requested one.
   *
   * The list can be iterated with &drm_gpuva_for_each_op and must be processed
   * in the given order. It can contain map, unmap and remap operations, but it
diff --cc drivers/gpu/drm/nova/file.rs
index 7e7d4e2de2fb,4fe62cf98a23..90b9d2d0ec4a
--- a/drivers/gpu/drm/nova/file.rs
+++ b/drivers/gpu/drm/nova/file.rs
@@@ -36,7 -39,8 +36,7 @@@ impl File 
              _ => return Err(EINVAL),
          };
  
-         getparam.value = value;
 -        #[allow(clippy::useless_conversion)]
 -        getparam.set_value(value.into());
++        getparam.value = Into::<u64>::into(value);
  
          Ok(0)
      }
diff --cc drivers/gpu/drm/xe/xe_pm.c
index d4b54cd34cff,bb9b6ecad2af..6eea4190bbd2
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@@ -23,8 -23,8 +23,9 @@@
  #include "xe_irq.h"
  #include "xe_pcode.h"
  #include "xe_pxp.h"
 +#include "xe_sriov_vf_ccs.h"
  #include "xe_trace.h"
+ #include "xe_vm.h"
  #include "xe_wa.h"
  
  /**
diff --cc rust/kernel/drm/device.rs
index 4a62f9fd88b7,d29c477e89a8..bb8e43c77dc9
--- a/rust/kernel/drm/device.rs
+++ b/rust/kernel/drm/device.rs
@@@ -10,10 -11,9 +11,10 @@@ use crate::
      error::from_err_ptr,
      error::Result,
      prelude::*,
 -    types::{ARef, AlwaysRefCounted, Opaque},
 +    sync::aref::{ARef, AlwaysRefCounted},
 +    types::Opaque,
  };
- use core::{mem, ops::Deref, ptr, ptr::NonNull};
+ use core::{alloc::Layout, mem, ops::Deref, ptr, ptr::NonNull};
  
  #[cfg(CONFIG_DRM_LEGACY)]
  macro_rules! drm_legacy_fields {