Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ca85295 authored by Joe Perches's avatar Joe Perches Committed by Alex Deucher
Browse files

gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> to pr_<level> 



Use a more common logging style.

Miscellanea:

o Coalesce formats and realign arguments
o Neaten a few macros now using pr_<level>

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eeca2324

drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c

+2 −2
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ static void amdgpu_afmt_calc_cts(uint32_t clock, int *CTS, int *N, int freq) 


	/* Check that we are in spec (not always possible) */

	if (n < (128*freq/1500))

		printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n");

		pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n");

	if (n > (128*freq/300))

		printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n");

		pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n");



	*N = n;

	*CTS = cts;

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c

+2 −2
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static bool amdgpu_atpx_detect(void) 


	if (has_atpx && vga_count == 2) {

		acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer);

		printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",

		pr_info("vga_switcheroo: detected switching method %s handle\n",

			acpi_method_name);

		amdgpu_atpx_priv.atpx_detected = true;

		amdgpu_atpx_priv.bridge_pm_usable = d3_supported;

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+2 −2
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero 
	if (state == VGA_SWITCHEROO_ON) {

		unsigned d3_delay = dev->pdev->d3_delay;



		printk(KERN_INFO "amdgpu: switched on\n");

		pr_info("amdgpu: switched on\n");

		/* don't suspend or resume card normally */

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
@@ -1070,7 +1070,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero 
		dev->switch_power_state = DRM_SWITCH_POWER_ON;

		drm_kms_helper_poll_enable(dev);

	} else {

		printk(KERN_INFO "amdgpu: switched off\n");

		pr_info("amdgpu: switched off\n");

		drm_kms_helper_poll_disable(dev);

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;

		amdgpu_device_suspend(dev, true, true);

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
				       AMDGPU_GEM_CREATE_VRAM_CLEARED,

				       true, &gobj);

	if (ret) {

		printk(KERN_ERR "failed to allocate framebuffer (%d)\n",

		       aligned_size);

		pr_err("failed to allocate framebuffer (%d)\n", aligned_size);

		return -ENOMEM;

	}

	abo = gem_to_amdgpu_bo(gobj);

drivers/gpu/drm/amd/amdgpu/amdgpu_test.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) 
out_cleanup:

	kfree(gtt_obj);

	if (r) {

		printk(KERN_WARNING "Error while testing BO move.\n");

		pr_warn("Error while testing BO move\n");

	}

}