reduce diff to linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/smu_v11_0_i2c.c b/sys/dev/pci/drm/amd/amdgpu/smu_v11_0_i2c.c
index 92dffb4..1e5c3c5 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/smu_v11_0_i2c.c
+++ b/sys/dev/pci/drm/amd/amdgpu/smu_v11_0_i2c.c
@@ -719,9 +719,7 @@ static const struct i2c_algorithm smu_v11_0_i2c_algo = {
 };
 
 static const struct i2c_adapter_quirks smu_v11_0_i2c_control_quirks = {
-#ifdef notyet
        .flags = I2C_AQ_NO_ZERO_LEN,
-#endif
 };
 
 int smu_v11_0_i2c_control_init(struct amdgpu_device *adev)

diff --git a/sys/dev/pci/drm/drm_print.c b/sys/dev/pci/drm/drm_print.c
index 8073241..68c810e 100644 (file)
--- a/sys/dev/pci/drm/drm_print.c
+++ b/sys/dev/pci/drm/drm_print.c
@@ -23,7 +23,7 @@
  * Rob Clark <robdclark@gmail.com>
  */
 
-#include <sys/stdarg.h>
+#include <linux/stdarg.h>
 
 #include <linux/io.h>
 #include <linux/moduleparam.h>

diff --git a/sys/dev/pci/drm/drm_syncobj.c b/sys/dev/pci/drm/drm_syncobj.c
index 0894679..73b7395 100644 (file)
--- a/sys/dev/pci/drm/drm_syncobj.c
+++ b/sys/dev/pci/drm/drm_syncobj.c
@@ -188,6 +188,7 @@
  */
 
 #include <linux/anon_inodes.h>
+#include <linux/dma-fence-unwrap.h>
 #include <linux/eventfd.h>
 #include <linux/file.h>
 #include <linux/fs.h>

diff --git a/sys/dev/pci/drm/i915/gt/intel_rc6.c b/sys/dev/pci/drm/i915/gt/intel_rc6.c
index b3669af..ccdc1af 100644 (file)
--- a/sys/dev/pci/drm/i915/gt/intel_rc6.c
+++ b/sys/dev/pci/drm/i915/gt/intel_rc6.c
@@ -539,9 +539,7 @@ static bool rc6_supported(struct intel_rc6 *rc6)
 static void rpm_get(struct intel_rc6 *rc6)
 {
        GEM_BUG_ON(rc6->wakeref);
-#ifdef notyet
        pm_runtime_get_sync(rc6_to_i915(rc6)->drm.dev);
-#endif
        rc6->wakeref = true;
 }
 

diff --git a/sys/dev/pci/drm/radeon/radeon_prime.c b/sys/dev/pci/drm/radeon/radeon_prime.c
index ab5cbc2..2c273c3 100644 (file)
--- a/sys/dev/pci/drm/radeon/radeon_prime.c
+++ b/sys/dev/pci/drm/radeon/radeon_prime.c
@@ -34,7 +34,6 @@
 #include "radeon.h"
 #include "radeon_prime.h"
 
-
 struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj)
 {
        struct radeon_bo *bo = gem_to_radeon_bo(obj);
@@ -104,6 +103,7 @@ void radeon_gem_prime_unpin(struct drm_gem_object *obj)
        radeon_bo_unreserve(bo);
 }
 
+
 struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
                                        int flags)
 {