Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amd: Convert amdgpu_display from DRM_* to drm_ macros
drm_* macros show the device they were called with which is helpful
in multi-GPU systems.
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Mario Limonciello (AMD)
and committed by
Alex Deucher
d4b8d132
217737bb
+20
-20
+20
-20
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+20
-20
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
···
415
415
int i = 0;
416
416
417
417
drm_connector_list_iter_begin(dev, &iter);
418
-
DRM_INFO("AMDGPU Display Connectors\n");
418
+
drm_info(dev, "AMDGPU Display Connectors\n");
419
419
drm_for_each_connector_iter(connector, &iter) {
420
420
amdgpu_connector = to_amdgpu_connector(connector);
421
-
DRM_INFO("Connector %d:\n", i);
422
-
DRM_INFO(" %s\n", connector->name);
421
+
drm_info(dev, "Connector %d:\n", i);
422
+
drm_info(dev, " %s\n", connector->name);
423
423
if (amdgpu_connector->hpd.hpd != AMDGPU_HPD_NONE)
424
-
DRM_INFO(" %s\n", hpd_names[amdgpu_connector->hpd.hpd]);
424
+
drm_info(dev, " %s\n", hpd_names[amdgpu_connector->hpd.hpd]);
425
425
if (amdgpu_connector->ddc_bus) {
426
-
DRM_INFO(" DDC: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
426
+
drm_info(dev, " DDC: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
427
427
amdgpu_connector->ddc_bus->rec.mask_clk_reg,
428
428
amdgpu_connector->ddc_bus->rec.mask_data_reg,
429
429
amdgpu_connector->ddc_bus->rec.a_clk_reg,
···
433
433
amdgpu_connector->ddc_bus->rec.y_clk_reg,
434
434
amdgpu_connector->ddc_bus->rec.y_data_reg);
435
435
if (amdgpu_connector->router.ddc_valid)
436
-
DRM_INFO(" DDC Router 0x%x/0x%x\n",
436
+
drm_info(dev, " DDC Router 0x%x/0x%x\n",
437
437
amdgpu_connector->router.ddc_mux_control_pin,
438
438
amdgpu_connector->router.ddc_mux_state);
439
439
if (amdgpu_connector->router.cd_valid)
440
-
DRM_INFO(" Clock/Data Router 0x%x/0x%x\n",
440
+
drm_info(dev, " Clock/Data Router 0x%x/0x%x\n",
441
441
amdgpu_connector->router.cd_mux_control_pin,
442
442
amdgpu_connector->router.cd_mux_state);
443
443
} else {
···
447
447
connector->connector_type == DRM_MODE_CONNECTOR_DVIA ||
448
448
connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
449
449
connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
450
-
DRM_INFO(" DDC: no ddc bus - possible BIOS bug - please report to xorg-driver-ati@lists.x.org\n");
450
+
drm_info(dev, " DDC: no ddc bus - possible BIOS bug - please report to xorg-driver-ati@lists.x.org\n");
451
451
}
452
-
DRM_INFO(" Encoders:\n");
452
+
drm_info(dev, " Encoders:\n");
453
453
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
454
454
amdgpu_encoder = to_amdgpu_encoder(encoder);
455
455
devices = amdgpu_encoder->devices & amdgpu_connector->devices;
456
456
if (devices) {
457
457
if (devices & ATOM_DEVICE_CRT1_SUPPORT)
458
-
DRM_INFO(" CRT1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
458
+
drm_info(dev, " CRT1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
459
459
if (devices & ATOM_DEVICE_CRT2_SUPPORT)
460
-
DRM_INFO(" CRT2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
460
+
drm_info(dev, " CRT2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
461
461
if (devices & ATOM_DEVICE_LCD1_SUPPORT)
462
-
DRM_INFO(" LCD1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
462
+
drm_info(dev, " LCD1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
463
463
if (devices & ATOM_DEVICE_DFP1_SUPPORT)
464
-
DRM_INFO(" DFP1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
464
+
drm_info(dev, " DFP1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
465
465
if (devices & ATOM_DEVICE_DFP2_SUPPORT)
466
-
DRM_INFO(" DFP2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
466
+
drm_info(dev, " DFP2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
467
467
if (devices & ATOM_DEVICE_DFP3_SUPPORT)
468
-
DRM_INFO(" DFP3: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
468
+
drm_info(dev, " DFP3: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
469
469
if (devices & ATOM_DEVICE_DFP4_SUPPORT)
470
-
DRM_INFO(" DFP4: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
470
+
drm_info(dev, " DFP4: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
471
471
if (devices & ATOM_DEVICE_DFP5_SUPPORT)
472
-
DRM_INFO(" DFP5: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
472
+
drm_info(dev, " DFP5: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
473
473
if (devices & ATOM_DEVICE_DFP6_SUPPORT)
474
-
DRM_INFO(" DFP6: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
474
+
drm_info(dev, " DFP6: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
475
475
if (devices & ATOM_DEVICE_TV1_SUPPORT)
476
-
DRM_INFO(" TV1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
476
+
drm_info(dev, " TV1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
477
477
if (devices & ATOM_DEVICE_CV_SUPPORT)
478
-
DRM_INFO(" CV: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
478
+
drm_info(dev, " CV: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
479
479
}
480
480
}
481
481
i++;