hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c
....@@ -23,7 +23,7 @@
2323 * Authors: Dave Airlie
2424 * Alex Deucher
2525 */
26
-#include <drm/drmP.h>
26
+
2727 #include <drm/drm_crtc_helper.h>
2828 #include <drm/amdgpu_drm.h>
2929 #include <drm/drm_fixed.h>
....@@ -41,7 +41,7 @@
4141 struct drm_display_mode *adjusted_mode)
4242 {
4343 struct drm_device *dev = crtc->dev;
44
- struct amdgpu_device *adev = dev->dev_private;
44
+ struct amdgpu_device *adev = drm_to_adev(dev);
4545 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
4646 SET_CRTC_OVERSCAN_PS_ALLOCATION args;
4747 int index = GetIndexIntoMasterTable(COMMAND, SetCRTC_OverScan);
....@@ -84,7 +84,7 @@
8484 void amdgpu_atombios_crtc_scaler_setup(struct drm_crtc *crtc)
8585 {
8686 struct drm_device *dev = crtc->dev;
87
- struct amdgpu_device *adev = dev->dev_private;
87
+ struct amdgpu_device *adev = drm_to_adev(dev);
8888 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
8989 ENABLE_SCALER_PS_ALLOCATION args;
9090 int index = GetIndexIntoMasterTable(COMMAND, EnableScaler);
....@@ -114,7 +114,7 @@
114114 {
115115 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
116116 struct drm_device *dev = crtc->dev;
117
- struct amdgpu_device *adev = dev->dev_private;
117
+ struct amdgpu_device *adev = drm_to_adev(dev);
118118 int index =
119119 GetIndexIntoMasterTable(COMMAND, UpdateCRTC_DoubleBufferRegisters);
120120 ENABLE_CRTC_PS_ALLOCATION args;
....@@ -131,7 +131,7 @@
131131 {
132132 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
133133 struct drm_device *dev = crtc->dev;
134
- struct amdgpu_device *adev = dev->dev_private;
134
+ struct amdgpu_device *adev = drm_to_adev(dev);
135135 int index = GetIndexIntoMasterTable(COMMAND, EnableCRTC);
136136 ENABLE_CRTC_PS_ALLOCATION args;
137137
....@@ -147,7 +147,7 @@
147147 {
148148 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
149149 struct drm_device *dev = crtc->dev;
150
- struct amdgpu_device *adev = dev->dev_private;
150
+ struct amdgpu_device *adev = drm_to_adev(dev);
151151 int index = GetIndexIntoMasterTable(COMMAND, BlankCRTC);
152152 BLANK_CRTC_PS_ALLOCATION args;
153153
....@@ -163,7 +163,7 @@
163163 {
164164 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
165165 struct drm_device *dev = crtc->dev;
166
- struct amdgpu_device *adev = dev->dev_private;
166
+ struct amdgpu_device *adev = drm_to_adev(dev);
167167 int index = GetIndexIntoMasterTable(COMMAND, EnableDispPowerGating);
168168 ENABLE_DISP_POWER_GATING_PS_ALLOCATION args;
169169
....@@ -192,7 +192,7 @@
192192 {
193193 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
194194 struct drm_device *dev = crtc->dev;
195
- struct amdgpu_device *adev = dev->dev_private;
195
+ struct amdgpu_device *adev = drm_to_adev(dev);
196196 SET_CRTC_USING_DTD_TIMING_PARAMETERS args;
197197 int index = GetIndexIntoMasterTable(COMMAND, SetCRTC_UsingDTDTiming);
198198 u16 misc = 0;
....@@ -307,7 +307,7 @@
307307 {
308308 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
309309 struct drm_device *dev = crtc->dev;
310
- struct amdgpu_device *adev = dev->dev_private;
310
+ struct amdgpu_device *adev = drm_to_adev(dev);
311311 struct drm_encoder *encoder = amdgpu_crtc->encoder;
312312 struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
313313 struct drm_connector *connector = amdgpu_get_connector_for_encoder(encoder);
....@@ -588,7 +588,7 @@
588588 struct amdgpu_atom_ss *ss)
589589 {
590590 struct drm_device *dev = crtc->dev;
591
- struct amdgpu_device *adev = dev->dev_private;
591
+ struct amdgpu_device *adev = drm_to_adev(dev);
592592 u8 frev, crev;
593593 int index = GetIndexIntoMasterTable(COMMAND, SetPixelClock);
594594 union set_pixel_clock args;
....@@ -749,7 +749,7 @@
749749 {
750750 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
751751 struct drm_device *dev = crtc->dev;
752
- struct amdgpu_device *adev = dev->dev_private;
752
+ struct amdgpu_device *adev = drm_to_adev(dev);
753753 struct amdgpu_encoder *amdgpu_encoder =
754754 to_amdgpu_encoder(amdgpu_crtc->encoder);
755755 int encoder_mode = amdgpu_atombios_encoder_get_encoder_mode(amdgpu_crtc->encoder);
....@@ -818,7 +818,7 @@
818818 {
819819 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
820820 struct drm_device *dev = crtc->dev;
821
- struct amdgpu_device *adev = dev->dev_private;
821
+ struct amdgpu_device *adev = drm_to_adev(dev);
822822 struct amdgpu_encoder *amdgpu_encoder =
823823 to_amdgpu_encoder(amdgpu_crtc->encoder);
824824 u32 pll_clock = mode->clock;