.. | .. |
---|
25 | 25 | * Alex Deucher |
---|
26 | 26 | * Jerome Glisse |
---|
27 | 27 | */ |
---|
| 28 | + |
---|
| 29 | +#include <linux/pci.h> |
---|
28 | 30 | #include <linux/seq_file.h> |
---|
29 | 31 | #include <linux/slab.h> |
---|
30 | | -#include <drm/drmP.h> |
---|
| 32 | + |
---|
31 | 33 | #include <drm/drm.h> |
---|
32 | 34 | #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" |
---|
34 | 43 | #include "radeon.h" |
---|
35 | 44 | #include "radeon_asic.h" |
---|
36 | | -#include <drm/radeon_drm.h> |
---|
37 | | -#include "r100_track.h" |
---|
38 | | -#include "r300d.h" |
---|
| 45 | +#include "radeon_reg.h" |
---|
39 | 46 | #include "rv350d.h" |
---|
40 | | -#include "r300_reg_safe.h" |
---|
41 | 47 | |
---|
42 | 48 | /* This files gather functions specifics to: r300,r350,rv350,rv370,rv380 |
---|
43 | 49 | * |
---|
.. | .. |
---|
350 | 356 | if (tmp & R300_MC_IDLE) { |
---|
351 | 357 | return 0; |
---|
352 | 358 | } |
---|
353 | | - DRM_UDELAY(1); |
---|
| 359 | + udelay(1); |
---|
354 | 360 | } |
---|
355 | 361 | return -1; |
---|
356 | 362 | } |
---|
.. | .. |
---|
814 | 820 | ((idx_value >> 21) & 0xF)); |
---|
815 | 821 | return -EINVAL; |
---|
816 | 822 | } |
---|
817 | | - /* Pass through. */ |
---|
| 823 | + fallthrough; |
---|
818 | 824 | case 6: |
---|
819 | 825 | track->cb[i].cpp = 4; |
---|
820 | 826 | break; |
---|
.. | .. |
---|
965 | 971 | return -EINVAL; |
---|
966 | 972 | } |
---|
967 | 973 | /* The same rules apply as for DXT3/5. */ |
---|
968 | | - /* Pass through. */ |
---|
| 974 | + fallthrough; |
---|
969 | 975 | case R300_TX_FORMAT_DXT3: |
---|
970 | 976 | case R300_TX_FORMAT_DXT5: |
---|
971 | 977 | track->textures[i].cpp = 1; |
---|