Reduce diff with Linux 6.7

Differences were reviewed using e.g.:

    diff -Nau -pX scripts/diffignore \
      drm-kmod/drivers/gpu/drm/ \
      linux/drivers/gpu/drm/

    diff -Naur -pX scripts/diffignore \
      drm-kmod/drivers/gpu/drm/amd/amdgpu/ \
      linux/drivers/gpu/drm/amd/amdgpu/

    diff -Naur -pX scripts/diffignore \
      drm-kmod/drivers/gpu/drm/i915/ \
      linux/drivers/gpu/drm/i915/

    diff -Naur -pX scripts/diffignore \
      drm-kmod/include/drm/ \
      linux/include/drm/

Author: dumbbell

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

@@ -1242,7 +1242,7 @@ static void gmc_v9_0_override_vm_pte_flags(struct amdgpu_device *adev,
 					   struct amdgpu_vm *vm,
 					   uint64_t addr, uint64_t *flags)
 {
-#ifdef CONFIG_NUMA
+#ifdef __linux__
 	int local_node, nid;
 #endif
 
@@ -1252,7 +1252,7 @@ static void gmc_v9_0_override_vm_pte_flags(struct amdgpu_device *adev,
 	if (amdgpu_ip_version(adev, GC_HWIP, 0) != IP_VERSION(9, 4, 3))
 		return;
 
-#ifdef CONFIG_NUMA
+#ifdef __linux__
 	/* Only direct-mapped memory allows us to determine the NUMA node from
 	 * the DMA address.
 	 */

drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c

@@ -360,8 +360,10 @@ static int jpeg_v4_0_3_hw_fini(void *handle)
 
 	cancel_delayed_work_sync(&adev->jpeg.idle_work);
 
-	if (adev->jpeg.cur_state != AMD_PG_STATE_GATE)
-		ret = jpeg_v4_0_3_set_powergating_state(adev, AMD_PG_STATE_GATE);
+	if (!amdgpu_sriov_vf(adev)) {
+		if (adev->jpeg.cur_state != AMD_PG_STATE_GATE)
+			ret = jpeg_v4_0_3_set_powergating_state(adev, AMD_PG_STATE_GATE);
+	}
 
 	return ret;
 }

drivers/gpu/drm/drm_print.c

@@ -39,7 +39,9 @@
  * __drm_debug: Enable debug output.
  * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
  */
-#ifdef __FreeBSD__
+#ifdef __linux__
+unsigned long __drm_debug;
+#elif defined(__FreeBSD__)
 #if defined(DRM_DEBUG_LOG_ALL) || defined(INVARIANTS)
 unsigned long __drm_debug = 0xffffffff;	/* bitmask of DRM_UT_x */
 #else
@@ -452,7 +454,7 @@ void __drm_err(const char *function_name, const char *format, ...)
 #endif
 EXPORT_SYMBOL(__drm_err);
 
-#ifdef CONFIG_DEBUGSFS
+#ifdef __linux__
 /**
  * drm_print_regset32 - print the contents of registers to a
  * &drm_printer stream.

drivers/gpu/drm/i915/i915_scheduler.h

@@ -11,8 +11,8 @@
 #include <linux/list.h>
 #include <linux/kernel.h>
 
-#include "i915_tasklet.h"
 #include "i915_scheduler_types.h"
+#include "i915_tasklet.h"
 
 struct drm_printer;