Skip to content

Commit fb1b5e1

Browse files
qlyjsldalexdeucher
qlyjsld
authored and
alexdeucher
committed
drm/radeon: change rdev->ddev to rdev_to_drm(rdev)
This patch changes the way "drm_device" is accessed. It uses "rdev_to_drm(rdev)" instead of accessing the struct member directly. Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Tested-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Wu Hoi Pok <wuhoipok@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent a6e23be commit fb1b5e1

36 files changed

+159
-159
lines changed

‎drivers/gpu/drm/radeon/atombios_encoders.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2179,7 +2179,7 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder, int fe_idx)
21792179
void
21802180
radeon_atom_encoder_init(struct radeon_device *rdev)
21812181
{
2182-
struct drm_device *dev = rdev->ddev;
2182+
struct drm_device *dev = rdev_to_drm(rdev);
21832183
struct drm_encoder *encoder;
21842184

21852185
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

‎drivers/gpu/drm/radeon/cik.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7585,7 +7585,7 @@ int cik_irq_process(struct radeon_device *rdev)
75857585
DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");
75867586

75877587
if (rdev->irq.crtc_vblank_int[0]) {
7588-
drm_handle_vblank(rdev->ddev, 0);
7588+
drm_handle_vblank(rdev_to_drm(rdev), 0);
75897589
rdev->pm.vblank_sync = true;
75907590
wake_up(&rdev->irq.vblank_queue);
75917591
}
@@ -7615,7 +7615,7 @@ int cik_irq_process(struct radeon_device *rdev)
76157615
DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");
76167616

76177617
if (rdev->irq.crtc_vblank_int[1]) {
7618-
drm_handle_vblank(rdev->ddev, 1);
7618+
drm_handle_vblank(rdev_to_drm(rdev), 1);
76197619
rdev->pm.vblank_sync = true;
76207620
wake_up(&rdev->irq.vblank_queue);
76217621
}
@@ -7645,7 +7645,7 @@ int cik_irq_process(struct radeon_device *rdev)
76457645
DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");
76467646

76477647
if (rdev->irq.crtc_vblank_int[2]) {
7648-
drm_handle_vblank(rdev->ddev, 2);
7648+
drm_handle_vblank(rdev_to_drm(rdev), 2);
76497649
rdev->pm.vblank_sync = true;
76507650
wake_up(&rdev->irq.vblank_queue);
76517651
}
@@ -7675,7 +7675,7 @@ int cik_irq_process(struct radeon_device *rdev)
76757675
DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");
76767676

76777677
if (rdev->irq.crtc_vblank_int[3]) {
7678-
drm_handle_vblank(rdev->ddev, 3);
7678+
drm_handle_vblank(rdev_to_drm(rdev), 3);
76797679
rdev->pm.vblank_sync = true;
76807680
wake_up(&rdev->irq.vblank_queue);
76817681
}
@@ -7705,7 +7705,7 @@ int cik_irq_process(struct radeon_device *rdev)
77057705
DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");
77067706

77077707
if (rdev->irq.crtc_vblank_int[4]) {
7708-
drm_handle_vblank(rdev->ddev, 4);
7708+
drm_handle_vblank(rdev_to_drm(rdev), 4);
77097709
rdev->pm.vblank_sync = true;
77107710
wake_up(&rdev->irq.vblank_queue);
77117711
}
@@ -7735,7 +7735,7 @@ int cik_irq_process(struct radeon_device *rdev)
77357735
DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");
77367736

77377737
if (rdev->irq.crtc_vblank_int[5]) {
7738-
drm_handle_vblank(rdev->ddev, 5);
7738+
drm_handle_vblank(rdev_to_drm(rdev), 5);
77397739
rdev->pm.vblank_sync = true;
77407740
wake_up(&rdev->irq.vblank_queue);
77417741
}
@@ -8581,7 +8581,7 @@ int cik_init(struct radeon_device *rdev)
85818581
/* Initialize surface registers */
85828582
radeon_surface_init(rdev);
85838583
/* Initialize clocks */
8584-
radeon_get_clock_info(rdev->ddev);
8584+
radeon_get_clock_info(rdev_to_drm(rdev));
85858585

85868586
/* Fence driver */
85878587
radeon_fence_driver_init(rdev);

‎drivers/gpu/drm/radeon/dce6_afmt.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct r600_audio_pin *dce6_audio_get_pin(struct radeon_device *rdev)
9191
pin = &rdev->audio.pin[i];
9292
pin_count = 0;
9393

94-
list_for_each_entry(encoder, &rdev->ddev->mode_config.encoder_list, head) {
94+
list_for_each_entry(encoder, &rdev_to_drm(rdev)->mode_config.encoder_list, head) {
9595
if (radeon_encoder_is_digital(encoder)) {
9696
radeon_encoder = to_radeon_encoder(encoder);
9797
dig = radeon_encoder->enc_priv;

‎drivers/gpu/drm/radeon/evergreen.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,7 +1673,7 @@ void evergreen_pm_misc(struct radeon_device *rdev)
16731673
*/
16741674
void evergreen_pm_prepare(struct radeon_device *rdev)
16751675
{
1676-
struct drm_device *ddev = rdev->ddev;
1676+
struct drm_device *ddev = rdev_to_drm(rdev);
16771677
struct drm_crtc *crtc;
16781678
struct radeon_crtc *radeon_crtc;
16791679
u32 tmp;
@@ -1698,7 +1698,7 @@ void evergreen_pm_prepare(struct radeon_device *rdev)
16981698
*/
16991699
void evergreen_pm_finish(struct radeon_device *rdev)
17001700
{
1701-
struct drm_device *ddev = rdev->ddev;
1701+
struct drm_device *ddev = rdev_to_drm(rdev);
17021702
struct drm_crtc *crtc;
17031703
struct radeon_crtc *radeon_crtc;
17041704
u32 tmp;
@@ -1763,7 +1763,7 @@ void evergreen_hpd_set_polarity(struct radeon_device *rdev,
17631763
*/
17641764
void evergreen_hpd_init(struct radeon_device *rdev)
17651765
{
1766-
struct drm_device *dev = rdev->ddev;
1766+
struct drm_device *dev = rdev_to_drm(rdev);
17671767
struct drm_connector *connector;
17681768
unsigned enabled = 0;
17691769
u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) |
@@ -1804,7 +1804,7 @@ void evergreen_hpd_init(struct radeon_device *rdev)
18041804
*/
18051805
void evergreen_hpd_fini(struct radeon_device *rdev)
18061806
{
1807-
struct drm_device *dev = rdev->ddev;
1807+
struct drm_device *dev = rdev_to_drm(rdev);
18081808
struct drm_connector *connector;
18091809
unsigned disabled = 0;
18101810

@@ -4753,7 +4753,7 @@ int evergreen_irq_process(struct radeon_device *rdev)
47534753
event_name = "vblank";
47544754

47554755
if (rdev->irq.crtc_vblank_int[crtc_idx]) {
4756-
drm_handle_vblank(rdev->ddev, crtc_idx);
4756+
drm_handle_vblank(rdev_to_drm(rdev), crtc_idx);
47574757
rdev->pm.vblank_sync = true;
47584758
wake_up(&rdev->irq.vblank_queue);
47594759
}
@@ -5211,7 +5211,7 @@ int evergreen_init(struct radeon_device *rdev)
52115211
/* Initialize surface registers */
52125212
radeon_surface_init(rdev);
52135213
/* Initialize clocks */
5214-
radeon_get_clock_info(rdev->ddev);
5214+
radeon_get_clock_info(rdev_to_drm(rdev));
52155215
/* Fence driver */
52165216
radeon_fence_driver_init(rdev);
52175217
/* initialize AGP */

‎drivers/gpu/drm/radeon/ni.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2360,7 +2360,7 @@ int cayman_init(struct radeon_device *rdev)
23602360
/* Initialize surface registers */
23612361
radeon_surface_init(rdev);
23622362
/* Initialize clocks */
2363-
radeon_get_clock_info(rdev->ddev);
2363+
radeon_get_clock_info(rdev_to_drm(rdev));
23642364
/* Fence driver */
23652365
radeon_fence_driver_init(rdev);
23662366
/* initialize memory controller */

‎drivers/gpu/drm/radeon/r100.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ void r100_pm_misc(struct radeon_device *rdev)
459459
*/
460460
void r100_pm_prepare(struct radeon_device *rdev)
461461
{
462-
struct drm_device *ddev = rdev->ddev;
462+
struct drm_device *ddev = rdev_to_drm(rdev);
463463
struct drm_crtc *crtc;
464464
struct radeon_crtc *radeon_crtc;
465465
u32 tmp;
@@ -490,7 +490,7 @@ void r100_pm_prepare(struct radeon_device *rdev)
490490
*/
491491
void r100_pm_finish(struct radeon_device *rdev)
492492
{
493-
struct drm_device *ddev = rdev->ddev;
493+
struct drm_device *ddev = rdev_to_drm(rdev);
494494
struct drm_crtc *crtc;
495495
struct radeon_crtc *radeon_crtc;
496496
u32 tmp;
@@ -603,7 +603,7 @@ void r100_hpd_set_polarity(struct radeon_device *rdev,
603603
*/
604604
void r100_hpd_init(struct radeon_device *rdev)
605605
{
606-
struct drm_device *dev = rdev->ddev;
606+
struct drm_device *dev = rdev_to_drm(rdev);
607607
struct drm_connector *connector;
608608
unsigned enable = 0;
609609

@@ -626,7 +626,7 @@ void r100_hpd_init(struct radeon_device *rdev)
626626
*/
627627
void r100_hpd_fini(struct radeon_device *rdev)
628628
{
629-
struct drm_device *dev = rdev->ddev;
629+
struct drm_device *dev = rdev_to_drm(rdev);
630630
struct drm_connector *connector;
631631
unsigned disable = 0;
632632

@@ -798,7 +798,7 @@ int r100_irq_process(struct radeon_device *rdev)
798798
/* Vertical blank interrupts */
799799
if (status & RADEON_CRTC_VBLANK_STAT) {
800800
if (rdev->irq.crtc_vblank_int[0]) {
801-
drm_handle_vblank(rdev->ddev, 0);
801+
drm_handle_vblank(rdev_to_drm(rdev), 0);
802802
rdev->pm.vblank_sync = true;
803803
wake_up(&rdev->irq.vblank_queue);
804804
}
@@ -807,7 +807,7 @@ int r100_irq_process(struct radeon_device *rdev)
807807
}
808808
if (status & RADEON_CRTC2_VBLANK_STAT) {
809809
if (rdev->irq.crtc_vblank_int[1]) {
810-
drm_handle_vblank(rdev->ddev, 1);
810+
drm_handle_vblank(rdev_to_drm(rdev), 1);
811811
rdev->pm.vblank_sync = true;
812812
wake_up(&rdev->irq.vblank_queue);
813813
}
@@ -1471,7 +1471,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
14711471
header = radeon_get_ib_value(p, h_idx);
14721472
crtc_id = radeon_get_ib_value(p, h_idx + 5);
14731473
reg = R100_CP_PACKET0_GET_REG(header);
1474-
crtc = drm_crtc_find(p->rdev->ddev, p->filp, crtc_id);
1474+
crtc = drm_crtc_find(rdev_to_drm(p->rdev), p->filp, crtc_id);
14751475
if (!crtc) {
14761476
DRM_ERROR("cannot find crtc %d\n", crtc_id);
14771477
return -ENOENT;
@@ -3059,7 +3059,7 @@ DEFINE_SHOW_ATTRIBUTE(r100_debugfs_mc_info);
30593059
void r100_debugfs_rbbm_init(struct radeon_device *rdev)
30603060
{
30613061
#if defined(CONFIG_DEBUG_FS)
3062-
struct dentry *root = rdev->ddev->primary->debugfs_root;
3062+
struct dentry *root = rdev_to_drm(rdev)->primary->debugfs_root;
30633063

30643064
debugfs_create_file("r100_rbbm_info", 0444, root, rdev,
30653065
&r100_debugfs_rbbm_info_fops);
@@ -3069,7 +3069,7 @@ void r100_debugfs_rbbm_init(struct radeon_device *rdev)
30693069
void r100_debugfs_cp_init(struct radeon_device *rdev)
30703070
{
30713071
#if defined(CONFIG_DEBUG_FS)
3072-
struct dentry *root = rdev->ddev->primary->debugfs_root;
3072+
struct dentry *root = rdev_to_drm(rdev)->primary->debugfs_root;
30733073

30743074
debugfs_create_file("r100_cp_ring_info", 0444, root, rdev,
30753075
&r100_debugfs_cp_ring_info_fops);
@@ -3081,7 +3081,7 @@ void r100_debugfs_cp_init(struct radeon_device *rdev)
30813081
void r100_debugfs_mc_info_init(struct radeon_device *rdev)
30823082
{
30833083
#if defined(CONFIG_DEBUG_FS)
3084-
struct dentry *root = rdev->ddev->primary->debugfs_root;
3084+
struct dentry *root = rdev_to_drm(rdev)->primary->debugfs_root;
30853085

30863086
debugfs_create_file("r100_mc_info", 0444, root, rdev,
30873087
&r100_debugfs_mc_info_fops);
@@ -3947,7 +3947,7 @@ int r100_resume(struct radeon_device *rdev)
39473947
RREG32(R_0007C0_CP_STAT));
39483948
}
39493949
/* post */
3950-
radeon_combios_asic_init(rdev->ddev);
3950+
radeon_combios_asic_init(rdev_to_drm(rdev));
39513951
/* Resume clock after posting */
39523952
r100_clock_startup(rdev);
39533953
/* Initialize surface registers */
@@ -4056,7 +4056,7 @@ int r100_init(struct radeon_device *rdev)
40564056
/* Set asic errata */
40574057
r100_errata(rdev);
40584058
/* Initialize clocks */
4059-
radeon_get_clock_info(rdev->ddev);
4059+
radeon_get_clock_info(rdev_to_drm(rdev));
40604060
/* initialize AGP */
40614061
if (rdev->flags & RADEON_IS_AGP) {
40624062
r = radeon_agp_init(rdev);

‎drivers/gpu/drm/radeon/r300.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ DEFINE_SHOW_ATTRIBUTE(rv370_debugfs_pcie_gart_info);
616616
static void rv370_debugfs_pcie_gart_info_init(struct radeon_device *rdev)
617617
{
618618
#if defined(CONFIG_DEBUG_FS)
619-
struct dentry *root = rdev->ddev->primary->debugfs_root;
619+
struct dentry *root = rdev_to_drm(rdev)->primary->debugfs_root;
620620

621621
debugfs_create_file("rv370_pcie_gart_info", 0444, root, rdev,
622622
&rv370_debugfs_pcie_gart_info_fops);
@@ -1452,7 +1452,7 @@ int r300_resume(struct radeon_device *rdev)
14521452
RREG32(R_0007C0_CP_STAT));
14531453
}
14541454
/* post */
1455-
radeon_combios_asic_init(rdev->ddev);
1455+
radeon_combios_asic_init(rdev_to_drm(rdev));
14561456
/* Resume clock after posting */
14571457
r300_clock_startup(rdev);
14581458
/* Initialize surface registers */
@@ -1538,7 +1538,7 @@ int r300_init(struct radeon_device *rdev)
15381538
/* Set asic errata */
15391539
r300_errata(rdev);
15401540
/* Initialize clocks */
1541-
radeon_get_clock_info(rdev->ddev);
1541+
radeon_get_clock_info(rdev_to_drm(rdev));
15421542
/* initialize AGP */
15431543
if (rdev->flags & RADEON_IS_AGP) {
15441544
r = radeon_agp_init(rdev);

‎drivers/gpu/drm/radeon/r420.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ int r420_resume(struct radeon_device *rdev)
322322
if (rdev->is_atom_bios) {
323323
atom_asic_init(rdev->mode_info.atom_context);
324324
} else {
325-
radeon_combios_asic_init(rdev->ddev);
325+
radeon_combios_asic_init(rdev_to_drm(rdev));
326326
}
327327
/* Resume clock after posting */
328328
r420_clock_resume(rdev);
@@ -414,7 +414,7 @@ int r420_init(struct radeon_device *rdev)
414414
return -EINVAL;
415415

416416
/* Initialize clocks */
417-
radeon_get_clock_info(rdev->ddev);
417+
radeon_get_clock_info(rdev_to_drm(rdev));
418418
/* initialize AGP */
419419
if (rdev->flags & RADEON_IS_AGP) {
420420
r = radeon_agp_init(rdev);
@@ -493,7 +493,7 @@ DEFINE_SHOW_ATTRIBUTE(r420_debugfs_pipes_info);
493493
void r420_debugfs_pipes_info_init(struct radeon_device *rdev)
494494
{
495495
#if defined(CONFIG_DEBUG_FS)
496-
struct dentry *root = rdev->ddev->primary->debugfs_root;
496+
struct dentry *root = rdev_to_drm(rdev)->primary->debugfs_root;
497497

498498
debugfs_create_file("r420_pipes_info", 0444, root, rdev,
499499
&r420_debugfs_pipes_info_fops);

‎drivers/gpu/drm/radeon/r520.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ int r520_init(struct radeon_device *rdev)
287287
atom_asic_init(rdev->mode_info.atom_context);
288288
}
289289
/* Initialize clocks */
290-
radeon_get_clock_info(rdev->ddev);
290+
radeon_get_clock_info(rdev_to_drm(rdev));
291291
/* initialize AGP */
292292
if (rdev->flags & RADEON_IS_AGP) {
293293
r = radeon_agp_init(rdev);

‎drivers/gpu/drm/radeon/r600.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ void r600_hpd_set_polarity(struct radeon_device *rdev,
950950

951951
void r600_hpd_init(struct radeon_device *rdev)
952952
{
953-
struct drm_device *dev = rdev->ddev;
953+
struct drm_device *dev = rdev_to_drm(rdev);
954954
struct drm_connector *connector;
955955
unsigned enable = 0;
956956

@@ -1017,7 +1017,7 @@ void r600_hpd_init(struct radeon_device *rdev)
10171017

10181018
void r600_hpd_fini(struct radeon_device *rdev)
10191019
{
1020-
struct drm_device *dev = rdev->ddev;
1020+
struct drm_device *dev = rdev_to_drm(rdev);
10211021
struct drm_connector *connector;
10221022
unsigned disable = 0;
10231023

@@ -3280,7 +3280,7 @@ int r600_init(struct radeon_device *rdev)
32803280
/* Initialize surface registers */
32813281
radeon_surface_init(rdev);
32823282
/* Initialize clocks */
3283-
radeon_get_clock_info(rdev->ddev);
3283+
radeon_get_clock_info(rdev_to_drm(rdev));
32843284
/* Fence driver */
32853285
radeon_fence_driver_init(rdev);
32863286
if (rdev->flags & RADEON_IS_AGP) {
@@ -4136,7 +4136,7 @@ int r600_irq_process(struct radeon_device *rdev)
41364136
DRM_DEBUG("IH: D1 vblank - IH event w/o asserted irq bit?\n");
41374137

41384138
if (rdev->irq.crtc_vblank_int[0]) {
4139-
drm_handle_vblank(rdev->ddev, 0);
4139+
drm_handle_vblank(rdev_to_drm(rdev), 0);
41404140
rdev->pm.vblank_sync = true;
41414141
wake_up(&rdev->irq.vblank_queue);
41424142
}
@@ -4166,7 +4166,7 @@ int r600_irq_process(struct radeon_device *rdev)
41664166
DRM_DEBUG("IH: D2 vblank - IH event w/o asserted irq bit?\n");
41674167

41684168
if (rdev->irq.crtc_vblank_int[1]) {
4169-
drm_handle_vblank(rdev->ddev, 1);
4169+
drm_handle_vblank(rdev_to_drm(rdev), 1);
41704170
rdev->pm.vblank_sync = true;
41714171
wake_up(&rdev->irq.vblank_queue);
41724172
}
@@ -4358,7 +4358,7 @@ DEFINE_SHOW_ATTRIBUTE(r600_debugfs_mc_info);
43584358
static void r600_debugfs_mc_info_init(struct radeon_device *rdev)
43594359
{
43604360
#if defined(CONFIG_DEBUG_FS)
4361-
struct dentry *root = rdev->ddev->primary->debugfs_root;
4361+
struct dentry *root = rdev_to_drm(rdev)->primary->debugfs_root;
43624362

43634363
debugfs_create_file("r600_mc_info", 0444, root, rdev,
43644364
&r600_debugfs_mc_info_fops);

0 commit comments

Comments
 (0)