add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/gpu/drm/radeon/radeon_combios.c
..
..
@@ -24,8 +24,12 @@
24
24
  * Authors: Dave Airlie
25
25
  *          Alex Deucher
26
26
  */
27
-#include <drm/drmP.h>
27
+
28
+#include <linux/pci.h>
29
+
30
+#include <drm/drm_device.h>
28
31
 #include <drm/radeon_drm.h>
32
+
29
33
 #include "radeon.h"
30
34
 #include "atom.h"
31
35
 
..
..
@@ -2635,7 +2639,7 @@
2635
2639
 {
2636
2640
 	struct drm_device *dev = rdev->ddev;
2637
2641
 	u16 offset, misc, misc2 = 0;
2638
-	u8 rev, blocks, tmp;
2642
+	u8 rev, tmp;
2639
2643
 	int state_index = 0;
2640
2644
 	struct radeon_i2c_bus_rec i2c_bus;
2641
2645
 
..
..
@@ -2700,7 +2704,7 @@
2700
2704
 				const char *name = thermal_controller_names[thermal_controller];
2701
2705
 				info.addr = i2c_addr >> 1;
2702
2706
 				strlcpy(info.type, name, sizeof(info.type));
2703
-				i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
2707
+				i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
2704
2708
 			}
2705
2709
 		}
2706
2710
 	} else {
..
..
@@ -2717,7 +2721,7 @@
2717
2721
 				const char *name = "f75375";
2718
2722
 				info.addr = 0x28;
2719
2723
 				strlcpy(info.type, name, sizeof(info.type));
2720
-				i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
2724
+				i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
2721
2725
 				DRM_INFO("Possible %s thermal controller at 0x%02x\n",
2722
2726
 					 name, info.addr);
2723
2727
 			}
..
..
@@ -2728,7 +2732,6 @@
2728
2732
 		offset = combios_get_table_offset(dev, COMBIOS_POWERPLAY_INFO_TABLE);
2729
2733
 		if (offset) {
2730
2734
 			rev = RBIOS8(offset);
2731
-			blocks = RBIOS8(offset + 0x2);
2732
2735
 			/* power mode 0 tends to be the only valid one */
2733
2736
 			rdev->pm.power_state[state_index].num_clock_modes = 1;
2734
2737
 			rdev->pm.power_state[state_index].clock_info[0].mclk = RBIOS32(offset + 0x5 + 0x2);