Now that the timeout-related functions were removed from drm_utils.h,
the header has exclusively panel orientation and backlight quirk
getters.
Therefore, rename the header accordingly and update all files that
include it. The files amdgpu_dm.c, amdgpu_dm_connector.c and
panthor_drv.c
include the header but don't use it, so drop the include there.
No functional change.
Suggested-by: Thomas Zimmermann <[email protected]>
Signed-off-by: Maíra Canal <[email protected]>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c | 1 -
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/drm_panel_backlight_quirks.c | 2 +-
drivers/gpu/drm/drm_panel_orientation_quirks.c | 2 +-
drivers/gpu/drm/panthor/panthor_drv.c | 1 -
drivers/video/fbdev/efifb.c | 2 +-
include/drm/{drm_utils.h => drm_panel_quirks.h} | 8 +++-----
9 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 4426e18f7543..5f20fff2d466 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -98,7 +98,6 @@
#include <drm/drm_edid.h>
#include <drm/drm_eld.h>
#include <drm/drm_mode.h>
-#include <drm/drm_utils.h>
#include <drm/drm_vblank.h>
#include <drm/drm_colorop.h>
#include <drm/drm_gem_atomic_helper.h>
diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c
index b9e90ea449ca..3211bd1472b2 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c
@@ -41,7 +41,7 @@
#include <linux/backlight.h>
#include <linux/power_supply.h>
#include <drm/drm_edid.h>
-#include <drm/drm_utils.h>
+#include <drm/drm_panel_quirks.h>
#include <acpi/video.h>
diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
index e7b555fa666f..9e43e70afe8d 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
@@ -62,7 +62,6 @@
#include <drm/drm_fixed.h>
#include <drm/drm_mode.h>
#include <drm/drm_probe_helper.h>
-#include <drm/drm_utils.h>
#include <drm/display/drm_dp_mst_helper.h>
#include <drm/display/drm_hdmi_helper.h>
#include <drm/drm_privacy_screen_consumer.h>
diff --git a/drivers/gpu/drm/drm_connector.c
b/drivers/gpu/drm/drm_connector.c
index 8b4baed060f3..c4d844205971 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -28,10 +28,10 @@
#include <drm/drm_file.h>
#include <drm/drm_managed.h>
#include <drm/drm_panel.h>
+#include <drm/drm_panel_quirks.h>
#include <drm/drm_print.h>
#include <drm/drm_privacy_screen_consumer.h>
#include <drm/drm_sysfs.h>
-#include <drm/drm_utils.h>
#include <linux/export.h>
#include <linux/platform_device.h>
diff --git a/drivers/gpu/drm/drm_panel_backlight_quirks.c
b/drivers/gpu/drm/drm_panel_backlight_quirks.c
index e417c7533053..dcb91e12bac6 100644
--- a/drivers/gpu/drm/drm_panel_backlight_quirks.c
+++ b/drivers/gpu/drm/drm_panel_backlight_quirks.c
@@ -5,7 +5,7 @@
#include <linux/export.h>
#include <linux/module.h>
#include <drm/drm_edid.h>
-#include <drm/drm_utils.h>
+#include <drm/drm_panel_quirks.h>
struct drm_panel_match {
enum dmi_field field;
diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c
b/drivers/gpu/drm/drm_panel_orientation_quirks.c
index 3a218fb592ce..813a204cd201 100644
--- a/drivers/gpu/drm/drm_panel_orientation_quirks.c
+++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c
@@ -12,7 +12,7 @@
#include <linux/export.h>
#include <linux/module.h>
#include <drm/drm_connector.h>
-#include <drm/drm_utils.h>
+#include <drm/drm_panel_quirks.h>
#ifdef CONFIG_DMI
diff --git a/drivers/gpu/drm/panthor/panthor_drv.c
b/drivers/gpu/drm/panthor/panthor_drv.c
index 46a3080b0b20..4bb74102acb1 100644
--- a/drivers/gpu/drm/panthor/panthor_drv.c
+++ b/drivers/gpu/drm/panthor/panthor_drv.c
@@ -25,7 +25,6 @@
#include <drm/drm_ioctl.h>
#include <drm/drm_print.h>
#include <drm/drm_syncobj.h>
-#include <drm/drm_utils.h>
#include <drm/gpu_scheduler.h>
#include <drm/panthor_drm.h>
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index ad8dec7807c3..3411be06d3e6 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -18,8 +18,8 @@
#include <linux/sysfb.h>
#include <video/vga.h>
#include <asm/efi.h>
-#include <drm/drm_utils.h> /* For drm_get_panel_orientation_quirk */
#include <drm/drm_connector.h> /* For DRM_MODE_PANEL_ORIENTATION_* */
+#include <drm/drm_panel_quirks.h> /* For
drm_get_panel_orientation_quirk */
struct bmp_file_header {
u16 id;
diff --git a/include/drm/drm_utils.h b/include/drm/drm_panel_quirks.h
similarity index 63%
rename from include/drm/drm_utils.h
rename to include/drm/drm_panel_quirks.h
index c61dee76451c..60711a49d403 100644
--- a/include/drm/drm_utils.h
+++ b/include/drm/drm_panel_quirks.h
@@ -1,14 +1,12 @@
/* SPDX-License-Identifier: MIT */
/*
- * Function prototypes for misc. drm utility functions.
- * Specifically this file is for function prototypes for functions
which
- * may also be used outside of drm code (e.g. in fbdev drivers).
+ * Function prototypes for panel-related quirks.
*
* Copyright (C) 2017 Hans de Goede <[email protected]>
*/
-#ifndef __DRM_UTILS_H__
-#define __DRM_UTILS_H__
+#ifndef __DRM_PANEL_QUIRKS_H__
+#define __DRM_PANEL_QUIRKS_H__
#include <linux/types.h>
