drm/radeon: use kernel is_power_of_2 rather than local version
authorJonathan Gray <jsg@jsg.id.au>
Thu, 30 Dec 2021 05:00:19 +0000 (16:00 +1100)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Jan 2022 22:51:13 +0000 (17:51 -0500)
Follow the amdgpu change made in
7611750784664db46d0db95631e322aeb263dde7
and replace local radeon function with is_power_of_2().

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_device.c

index 4f0fbf6..15692cb 100644 (file)
@@ -1086,19 +1086,6 @@ static unsigned int radeon_vga_set_decode(struct pci_dev *pdev, bool state)
 }
 
 /**
- * radeon_check_pot_argument - check that argument is a power of two
- *
- * @arg: value to check
- *
- * Validates that a certain argument is a power of two (all asics).
- * Returns true if argument is valid.
- */
-static bool radeon_check_pot_argument(int arg)
-{
-       return (arg & (arg - 1)) == 0;
-}
-
-/**
  * radeon_gart_size_auto - Determine a sensible default GART size
  *                         according to ASIC family.
  *
@@ -1126,7 +1113,7 @@ static int radeon_gart_size_auto(enum radeon_family family)
 static void radeon_check_arguments(struct radeon_device *rdev)
 {
        /* vramlimit must be a power of two */
-       if (!radeon_check_pot_argument(radeon_vram_limit)) {
+       if (!is_power_of_2(radeon_vram_limit)) {
                dev_warn(rdev->dev, "vram limit (%d) must be a power of 2\n",
                                radeon_vram_limit);
                radeon_vram_limit = 0;
@@ -1140,7 +1127,7 @@ static void radeon_check_arguments(struct radeon_device *rdev)
                dev_warn(rdev->dev, "gart size (%d) too small\n",
                                radeon_gart_size);
                radeon_gart_size = radeon_gart_size_auto(rdev->family);
-       } else if (!radeon_check_pot_argument(radeon_gart_size)) {
+       } else if (!is_power_of_2(radeon_gart_size)) {
                dev_warn(rdev->dev, "gart size (%d) must be a power of 2\n",
                                radeon_gart_size);
                radeon_gart_size = radeon_gart_size_auto(rdev->family);
@@ -1163,7 +1150,7 @@ static void radeon_check_arguments(struct radeon_device *rdev)
                break;
        }
 
-       if (!radeon_check_pot_argument(radeon_vm_size)) {
+       if (!is_power_of_2(radeon_vm_size)) {
                dev_warn(rdev->dev, "VM size (%d) must be a power of 2\n",
                         radeon_vm_size);
                radeon_vm_size = 4;