drm/i915: reduce intel_wakeref.h dependencies

Forward declare struct drm_printer instead of including drm/drm_print.h,
as we only need the pointer. Turns out quite a few places depend on this
include implicitly. Make them explicit.

Some of the includes are just stale and unnecessary. Group the forward
declarations together while at it.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/20250326115452.2090275-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2025-03-26 13:54:52 +02:00
parent 6f5a3b9d6d
commit 513c1a2ec4
20 changed files with 35 additions and 7 deletions

View File

@ -25,6 +25,8 @@
*
*/
#include <drm/drm_print.h>
#include "intel_display_types.h"
#include "intel_dvo_dev.h"

View File

@ -26,6 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
#include <drm/drm_print.h>
#include "intel_display_types.h"
#include "intel_dvo_dev.h"

View File

@ -29,6 +29,8 @@
*
*/
#include <drm/drm_print.h>
#include "intel_display_types.h"
#include "intel_dvo_dev.h"

View File

@ -26,6 +26,8 @@
*
*/
#include <drm/drm_print.h>
#include "intel_display_types.h"
#include "intel_dvo_dev.h"

View File

@ -26,6 +26,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
#include <drm/drm_print.h>
#include "intel_display_types.h"
#include "intel_dvo_dev.h"

View File

@ -25,6 +25,8 @@
*
*/
#include <drm/drm_print.h>
#include "intel_display_types.h"
#include "intel_dvo_dev.h"

View File

@ -29,6 +29,7 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_fixed.h>
#include <drm/drm_mipi_dsi.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include "i915_reg.h"

View File

@ -22,6 +22,8 @@
*
*/
#include <drm/drm_print.h>
#include "i915_utils.h"
#include "i9xx_plane_regs.h"
#include "intel_color.h"

View File

@ -3,6 +3,8 @@
* Copyright © 2018 Intel Corporation
*/
#include <drm/drm_print.h>
#include "i915_reg.h"
#include "i915_utils.h"
#include "intel_combo_phy.h"

View File

@ -4,6 +4,7 @@
*/
#include <drm/drm_device.h>
#include <drm/drm_print.h>
#include "intel_de.h"
#include "intel_display.h"

View File

@ -31,6 +31,7 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include "i915_reg.h"

View File

@ -4,6 +4,7 @@
*/
#include <drm/drm_device.h>
#include <drm/drm_print.h>
#include "intel_de.h"
#include "intel_display.h"

View File

@ -6,6 +6,7 @@
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_atomic_uapi.h>
#include <drm/drm_print.h>
#include "intel_atomic.h"
#include "intel_crtc.h"

View File

@ -27,6 +27,7 @@
#include <drm/display/drm_hdmi_helper.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_edid.h>
#include <drm/drm_print.h>
#include "i915_reg.h"
#include "i915_utils.h"

View File

@ -5,6 +5,8 @@
#include <linux/bitops.h>
#include <drm/drm_print.h>
#include "i915_reg.h"
#include "i915_utils.h"
#include "intel_atomic.h"

View File

@ -5,6 +5,8 @@
#include <linux/math.h>
#include <drm/drm_print.h>
#include "i915_reg.h"
#include "i915_utils.h"
#include "intel_ddi.h"

View File

@ -3,6 +3,8 @@
* Copyright © 2019 Intel Corporation
*/
#include <drm/drm_print.h>
#include "i915_reg.h"
#include "i915_utils.h"
#include "intel_atomic.h"

View File

@ -9,6 +9,7 @@
#include <drm/display/drm_dsc_helper.h>
#include <drm/drm_fixed.h>
#include <drm/drm_print.h>
#include "i915_utils.h"
#include "intel_crtc.h"

View File

@ -4,6 +4,8 @@
*
*/
#include <drm/drm_print.h>
#include "i915_reg.h"
#include "intel_de.h"
#include "intel_display_types.h"

View File

@ -7,8 +7,6 @@
#ifndef INTEL_WAKEREF_H
#define INTEL_WAKEREF_H
#include <drm/drm_print.h>
#include <linux/atomic.h>
#include <linux/bitfield.h>
#include <linux/bits.h>
@ -16,11 +14,13 @@
#include <linux/mutex.h>
#include <linux/refcount.h>
#include <linux/ref_tracker.h>
#include <linux/slab.h>
#include <linux/stackdepot.h>
#include <linux/timer.h>
#include <linux/workqueue.h>
struct drm_printer;
struct intel_runtime_pm;
struct intel_wakeref;
typedef struct ref_tracker *intel_wakeref_t;
#define INTEL_REFTRACK_DEAD_COUNT 16
@ -32,9 +32,6 @@ typedef struct ref_tracker *intel_wakeref_t;
#define INTEL_WAKEREF_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
#endif
struct intel_runtime_pm;
struct intel_wakeref;
struct intel_wakeref_ops {
int (*get)(struct intel_wakeref *wf);
int (*put)(struct intel_wakeref *wf);