hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
....@@ -23,9 +23,10 @@
2323 * Authors: Dave Airlie
2424 * Alex Deucher
2525 */
26
-#include <linux/export.h>
2726
28
-#include <drm/drmP.h>
27
+#include <linux/export.h>
28
+#include <linux/pci.h>
29
+
2930 #include <drm/drm_edid.h>
3031 #include <drm/amdgpu_drm.h>
3132 #include "amdgpu.h"
....@@ -39,7 +40,7 @@
3940 static int amdgpu_i2c_pre_xfer(struct i2c_adapter *i2c_adap)
4041 {
4142 struct amdgpu_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);
42
- struct amdgpu_device *adev = i2c->dev->dev_private;
43
+ struct amdgpu_device *adev = drm_to_adev(i2c->dev);
4344 struct amdgpu_i2c_bus_rec *rec = &i2c->rec;
4445 uint32_t temp;
4546
....@@ -81,7 +82,7 @@
8182 static void amdgpu_i2c_post_xfer(struct i2c_adapter *i2c_adap)
8283 {
8384 struct amdgpu_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);
84
- struct amdgpu_device *adev = i2c->dev->dev_private;
85
+ struct amdgpu_device *adev = drm_to_adev(i2c->dev);
8586 struct amdgpu_i2c_bus_rec *rec = &i2c->rec;
8687 uint32_t temp;
8788
....@@ -100,7 +101,7 @@
100101 static int amdgpu_i2c_get_clock(void *i2c_priv)
101102 {
102103 struct amdgpu_i2c_chan *i2c = i2c_priv;
103
- struct amdgpu_device *adev = i2c->dev->dev_private;
104
+ struct amdgpu_device *adev = drm_to_adev(i2c->dev);
104105 struct amdgpu_i2c_bus_rec *rec = &i2c->rec;
105106 uint32_t val;
106107
....@@ -115,7 +116,7 @@
115116 static int amdgpu_i2c_get_data(void *i2c_priv)
116117 {
117118 struct amdgpu_i2c_chan *i2c = i2c_priv;
118
- struct amdgpu_device *adev = i2c->dev->dev_private;
119
+ struct amdgpu_device *adev = drm_to_adev(i2c->dev);
119120 struct amdgpu_i2c_bus_rec *rec = &i2c->rec;
120121 uint32_t val;
121122
....@@ -129,7 +130,7 @@
129130 static void amdgpu_i2c_set_clock(void *i2c_priv, int clock)
130131 {
131132 struct amdgpu_i2c_chan *i2c = i2c_priv;
132
- struct amdgpu_device *adev = i2c->dev->dev_private;
133
+ struct amdgpu_device *adev = drm_to_adev(i2c->dev);
133134 struct amdgpu_i2c_bus_rec *rec = &i2c->rec;
134135 uint32_t val;
135136
....@@ -142,7 +143,7 @@
142143 static void amdgpu_i2c_set_data(void *i2c_priv, int data)
143144 {
144145 struct amdgpu_i2c_chan *i2c = i2c_priv;
145
- struct amdgpu_device *adev = i2c->dev->dev_private;
146
+ struct amdgpu_device *adev = drm_to_adev(i2c->dev);
146147 struct amdgpu_i2c_bus_rec *rec = &i2c->rec;
147148 uint32_t val;
148149
....@@ -252,7 +253,7 @@
252253 const struct amdgpu_i2c_bus_rec *rec,
253254 const char *name)
254255 {
255
- struct drm_device *dev = adev->ddev;
256
+ struct drm_device *dev = adev_to_drm(adev);
256257 int i;
257258
258259 for (i = 0; i < AMDGPU_MAX_I2C_BUS; i++) {