.. | .. |
---|
23 | 23 | * Authors: Dave Airlie |
---|
24 | 24 | * Alex Deucher |
---|
25 | 25 | */ |
---|
26 | | -#include <linux/export.h> |
---|
27 | 26 | |
---|
28 | | -#include <drm/drmP.h> |
---|
| 27 | +#include <linux/export.h> |
---|
| 28 | +#include <linux/pci.h> |
---|
| 29 | + |
---|
29 | 30 | #include <drm/drm_edid.h> |
---|
30 | 31 | #include <drm/amdgpu_drm.h> |
---|
31 | 32 | #include "amdgpu.h" |
---|
.. | .. |
---|
39 | 40 | static int amdgpu_i2c_pre_xfer(struct i2c_adapter *i2c_adap) |
---|
40 | 41 | { |
---|
41 | 42 | 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); |
---|
43 | 44 | struct amdgpu_i2c_bus_rec *rec = &i2c->rec; |
---|
44 | 45 | uint32_t temp; |
---|
45 | 46 | |
---|
.. | .. |
---|
81 | 82 | static void amdgpu_i2c_post_xfer(struct i2c_adapter *i2c_adap) |
---|
82 | 83 | { |
---|
83 | 84 | 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); |
---|
85 | 86 | struct amdgpu_i2c_bus_rec *rec = &i2c->rec; |
---|
86 | 87 | uint32_t temp; |
---|
87 | 88 | |
---|
.. | .. |
---|
100 | 101 | static int amdgpu_i2c_get_clock(void *i2c_priv) |
---|
101 | 102 | { |
---|
102 | 103 | 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); |
---|
104 | 105 | struct amdgpu_i2c_bus_rec *rec = &i2c->rec; |
---|
105 | 106 | uint32_t val; |
---|
106 | 107 | |
---|
.. | .. |
---|
115 | 116 | static int amdgpu_i2c_get_data(void *i2c_priv) |
---|
116 | 117 | { |
---|
117 | 118 | 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); |
---|
119 | 120 | struct amdgpu_i2c_bus_rec *rec = &i2c->rec; |
---|
120 | 121 | uint32_t val; |
---|
121 | 122 | |
---|
.. | .. |
---|
129 | 130 | static void amdgpu_i2c_set_clock(void *i2c_priv, int clock) |
---|
130 | 131 | { |
---|
131 | 132 | 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); |
---|
133 | 134 | struct amdgpu_i2c_bus_rec *rec = &i2c->rec; |
---|
134 | 135 | uint32_t val; |
---|
135 | 136 | |
---|
.. | .. |
---|
142 | 143 | static void amdgpu_i2c_set_data(void *i2c_priv, int data) |
---|
143 | 144 | { |
---|
144 | 145 | 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); |
---|
146 | 147 | struct amdgpu_i2c_bus_rec *rec = &i2c->rec; |
---|
147 | 148 | uint32_t val; |
---|
148 | 149 | |
---|
.. | .. |
---|
252 | 253 | const struct amdgpu_i2c_bus_rec *rec, |
---|
253 | 254 | const char *name) |
---|
254 | 255 | { |
---|
255 | | - struct drm_device *dev = adev->ddev; |
---|
| 256 | + struct drm_device *dev = adev_to_drm(adev); |
---|
256 | 257 | int i; |
---|
257 | 258 | |
---|
258 | 259 | for (i = 0; i < AMDGPU_MAX_I2C_BUS; i++) { |
---|