hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/gpu/drm/radeon/r300.c
....@@ -25,19 +25,25 @@
2525 * Alex Deucher
2626 * Jerome Glisse
2727 */
28
+
29
+#include <linux/pci.h>
2830 #include <linux/seq_file.h>
2931 #include <linux/slab.h>
30
-#include <drm/drmP.h>
32
+
3133 #include <drm/drm.h>
3234 #include <drm/drm_crtc_helper.h>
33
-#include "radeon_reg.h"
35
+#include <drm/drm_debugfs.h>
36
+#include <drm/drm_device.h>
37
+#include <drm/drm_file.h>
38
+#include <drm/radeon_drm.h>
39
+
40
+#include "r100_track.h"
41
+#include "r300_reg_safe.h"
42
+#include "r300d.h"
3443 #include "radeon.h"
3544 #include "radeon_asic.h"
36
-#include <drm/radeon_drm.h>
37
-#include "r100_track.h"
38
-#include "r300d.h"
45
+#include "radeon_reg.h"
3946 #include "rv350d.h"
40
-#include "r300_reg_safe.h"
4147
4248 /* This files gather functions specifics to: r300,r350,rv350,rv370,rv380
4349 *
....@@ -350,7 +356,7 @@
350356 if (tmp & R300_MC_IDLE) {
351357 return 0;
352358 }
353
- DRM_UDELAY(1);
359
+ udelay(1);
354360 }
355361 return -1;
356362 }
....@@ -814,7 +820,7 @@
814820 ((idx_value >> 21) & 0xF));
815821 return -EINVAL;
816822 }
817
- /* Pass through. */
823
+ fallthrough;
818824 case 6:
819825 track->cb[i].cpp = 4;
820826 break;
....@@ -965,7 +971,7 @@
965971 return -EINVAL;
966972 }
967973 /* The same rules apply as for DXT3/5. */
968
- /* Pass through. */
974
+ fallthrough;
969975 case R300_TX_FORMAT_DXT3:
970976 case R300_TX_FORMAT_DXT5:
971977 track->textures[i].cpp = 1;