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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index b5d34797d6065aaf0348cbeb569c727490b074b5..c57cfd12470ab364fcd42463079313d7fbbc36c2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -415,15 +415,15 @@ void amdgpu_display_print_display_setup(struct drm_device *dev)
        int i = 0;
 
        drm_connector_list_iter_begin(dev, &iter);
-       DRM_INFO("AMDGPU Display Connectors\n");
+       drm_info(dev, "AMDGPU Display Connectors\n");
        drm_for_each_connector_iter(connector, &iter) {
                amdgpu_connector = to_amdgpu_connector(connector);
-               DRM_INFO("Connector %d:\n", i);
-               DRM_INFO("  %s\n", connector->name);
+               drm_info(dev, "Connector %d:\n", i);
+               drm_info(dev, "  %s\n", connector->name);
                if (amdgpu_connector->hpd.hpd != AMDGPU_HPD_NONE)
-                       DRM_INFO("  %s\n", hpd_names[amdgpu_connector->hpd.hpd]);
+                       drm_info(dev, "  %s\n", hpd_names[amdgpu_connector->hpd.hpd]);
                if (amdgpu_connector->ddc_bus) {
-                       DRM_INFO("  DDC: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
+                       drm_info(dev, "  DDC: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
                                 amdgpu_connector->ddc_bus->rec.mask_clk_reg,
                                 amdgpu_connector->ddc_bus->rec.mask_data_reg,
                                 amdgpu_connector->ddc_bus->rec.a_clk_reg,
@@ -433,11 +433,11 @@ void amdgpu_display_print_display_setup(struct drm_device *dev)
                                 amdgpu_connector->ddc_bus->rec.y_clk_reg,
                                 amdgpu_connector->ddc_bus->rec.y_data_reg);
                        if (amdgpu_connector->router.ddc_valid)
-                               DRM_INFO("  DDC Router 0x%x/0x%x\n",
+                               drm_info(dev, "  DDC Router 0x%x/0x%x\n",
                                         amdgpu_connector->router.ddc_mux_control_pin,
                                         amdgpu_connector->router.ddc_mux_state);
                        if (amdgpu_connector->router.cd_valid)
-                               DRM_INFO("  Clock/Data Router 0x%x/0x%x\n",
+                               drm_info(dev, "  Clock/Data Router 0x%x/0x%x\n",
                                         amdgpu_connector->router.cd_mux_control_pin,
                                         amdgpu_connector->router.cd_mux_state);
                } else {
@@ -447,35 +447,35 @@ void amdgpu_display_print_display_setup(struct drm_device *dev)
                            connector->connector_type == DRM_MODE_CONNECTOR_DVIA ||
                            connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
                            connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
-                               DRM_INFO("  DDC: no ddc bus - possible BIOS bug - please report to xorg-driver-ati@lists.x.org\n");
+                               drm_info(dev, "  DDC: no ddc bus - possible BIOS bug - please report to xorg-driver-ati@lists.x.org\n");
                }
-               DRM_INFO("  Encoders:\n");
+               drm_info(dev, "  Encoders:\n");
                list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                        amdgpu_encoder = to_amdgpu_encoder(encoder);
                        devices = amdgpu_encoder->devices & amdgpu_connector->devices;
                        if (devices) {
                                if (devices & ATOM_DEVICE_CRT1_SUPPORT)
-                                       DRM_INFO("    CRT1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    CRT1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_CRT2_SUPPORT)
-                                       DRM_INFO("    CRT2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    CRT2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_LCD1_SUPPORT)
-                                       DRM_INFO("    LCD1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    LCD1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_DFP1_SUPPORT)
-                                       DRM_INFO("    DFP1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    DFP1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_DFP2_SUPPORT)
-                                       DRM_INFO("    DFP2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    DFP2: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_DFP3_SUPPORT)
-                                       DRM_INFO("    DFP3: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    DFP3: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_DFP4_SUPPORT)
-                                       DRM_INFO("    DFP4: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    DFP4: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_DFP5_SUPPORT)
-                                       DRM_INFO("    DFP5: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    DFP5: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_DFP6_SUPPORT)
-                                       DRM_INFO("    DFP6: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    DFP6: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_TV1_SUPPORT)
-                                       DRM_INFO("    TV1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    TV1: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                                if (devices & ATOM_DEVICE_CV_SUPPORT)
-                                       DRM_INFO("    CV: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
+                                       drm_info(dev, "    CV: %s\n", encoder_names[amdgpu_encoder->encoder_id]);
                        }
                }
                i++;