add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/gpu/drm/radeon/radeon_atombios.c
..
..
@@ -23,8 +23,12 @@
23
23
  * Authors: Dave Airlie
24
24
  *          Alex Deucher
25
25
  */
26
-#include <drm/drmP.h>
26
+
27
+#include <linux/pci.h>
28
+
29
+#include <drm/drm_device.h>
27
30
 #include <drm/radeon_drm.h>
31
+
28
32
 #include "radeon.h"
29
33
 
30
34
 #include "atom.h"
..
..
@@ -566,7 +570,7 @@
566
570
 		path_size += le16_to_cpu(path->usSize);
567
571
 
568
572
 		if (device_support & le16_to_cpu(path->usDeviceTag)) {
569
-			uint8_t con_obj_id, con_obj_num, con_obj_type;
573
+			uint8_t con_obj_id, con_obj_num;
570
574
 
571
575
 			con_obj_id =
572
576
 			    (le16_to_cpu(path->usConnObjectId) & OBJECT_ID_MASK)
..
..
@@ -574,9 +578,6 @@
574
578
 			con_obj_num =
575
579
 			    (le16_to_cpu(path->usConnObjectId) & ENUM_ID_MASK)
576
580
 			    >> ENUM_ID_SHIFT;
577
-			con_obj_type =
578
-			    (le16_to_cpu(path->usConnObjectId) &
579
-			     OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT;
580
581
 
581
582
 			/* TODO CV support */
582
583
 			if (le16_to_cpu(path->usDeviceTag) ==
..
..
@@ -644,15 +645,7 @@
644
645
 			router.ddc_valid = false;
645
646
 			router.cd_valid = false;
646
647
 			for (j = 0; j < ((le16_to_cpu(path->usSize) - 8) / 2); j++) {
647
-				uint8_t grph_obj_id, grph_obj_num, grph_obj_type;
648
-
649
-				grph_obj_id =
650
-				    (le16_to_cpu(path->usGraphicObjIds[j]) &
651
-				     OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
652
-				grph_obj_num =
653
-				    (le16_to_cpu(path->usGraphicObjIds[j]) &
654
-				     ENUM_ID_MASK) >> ENUM_ID_SHIFT;
655
-				grph_obj_type =
648
+				uint8_t grph_obj_type =
656
649
 				    (le16_to_cpu(path->usGraphicObjIds[j]) &
657
650
 				     OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT;
658
651
 
..
..
@@ -2118,7 +2111,7 @@
2118
2111
 								    ucOverdriveThermalController];
2119
2112
 			info.addr = power_info->info.ucOverdriveControllerAddress >> 1;
2120
2113
 			strlcpy(info.type, name, sizeof(info.type));
2121
-			i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
2114
+			i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
2122
2115
 		}
2123
2116
 	}
2124
2117
 	num_modes = power_info->info.ucNumOfPowerModeEntries;
..
..
@@ -2368,7 +2361,7 @@
2368
2361
 				const char *name = pp_lib_thermal_controller_names[controller->ucType];
2369
2362
 				info.addr = controller->ucI2cAddress >> 1;
2370
2363
 				strlcpy(info.type, name, sizeof(info.type));
2371
-				i2c_new_device(&rdev->pm.i2c_bus->adapter, &info);
2364
+				i2c_new_client_device(&rdev->pm.i2c_bus->adapter, &info);
2372
2365
 			}
2373
2366
 		} else {
2374
2367
 			DRM_INFO("Unknown thermal controller type %d at 0x%02x %s fan control\n",