Skip to content

Commit

Permalink
drm/i915: group i915_drv.h forward declarations together
Browse files Browse the repository at this point in the history
Group the forward declarations in i915_drv.h together near the top, like
in other header files, and sort.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/67f2ed8a9166daa891aa6d89f93eb629145d1c15.1643896905.git.jani.nikula@intel.com
  • Loading branch information
Jani Nikula committed Feb 9, 2022
1 parent 053f2b8 commit 2ecf64a
Showing 1 changed file with 19 additions and 25 deletions.
44 changes: 19 additions & 25 deletions drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,25 @@
#include "gt/intel_timeline.h"
#include "i915_vma.h"

struct dpll;
struct drm_i915_gem_object;
struct drm_i915_private;
struct intel_atomic_state;
struct intel_audio_funcs;
struct intel_cdclk_config;
struct intel_cdclk_funcs;
struct intel_cdclk_state;
struct intel_cdclk_vals;
struct intel_connector;
struct intel_crtc;
struct intel_dp;
struct intel_encoder;
struct intel_fbdev;
struct intel_initial_plane_config;
struct intel_limit;
struct intel_overlay;
struct intel_overlay_error_state;
struct vlv_s0ix_state;

/* General customization:
*/
Expand All @@ -115,8 +134,6 @@
#define DRIVER_DATE "20201103"
#define DRIVER_TIMESTAMP 1604406085

struct drm_i915_gem_object;

/* Threshold == 5 for long IRQs, 50 for short */
#define HPD_STORM_DEFAULT_THRESHOLD 50

Expand Down Expand Up @@ -166,8 +183,6 @@ struct i915_hotplug {
I915_GEM_DOMAIN_INSTRUCTION | \
I915_GEM_DOMAIN_VERTEX)

struct drm_i915_private;

struct drm_i915_file_private {
struct drm_i915_private *dev_priv;

Expand Down Expand Up @@ -274,9 +289,6 @@ struct drm_i915_file_private {
#define DRIVER_MINOR 6
#define DRIVER_PATCHLEVEL 0

struct intel_overlay;
struct intel_overlay_error_state;

struct sdvo_device_mapping {
u8 initialized;
u8 dvo_port;
Expand All @@ -286,18 +298,6 @@ struct sdvo_device_mapping {
u8 ddc_pin;
};

struct intel_connector;
struct intel_encoder;
struct intel_atomic_state;
struct intel_cdclk_config;
struct intel_cdclk_funcs;
struct intel_cdclk_state;
struct intel_cdclk_vals;
struct intel_initial_plane_config;
struct intel_crtc;
struct intel_limit;
struct dpll;

/* functions used internal in intel_pm.c */
struct drm_i915_clock_gating_funcs {
void (*init_clock_gating)(struct drm_i915_private *dev_priv);
Expand Down Expand Up @@ -385,7 +385,6 @@ enum drrs_support_type {
SEAMLESS_DRRS_SUPPORT = 2
};

struct intel_dp;
struct i915_drrs {
struct mutex mutex;
struct delayed_work work;
Expand All @@ -403,8 +402,6 @@ struct i915_drrs {
#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)
#define QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK (1<<8)

struct intel_fbdev;

struct intel_gmbus {
struct i2c_adapter adapter;
#define GMBUS_FORCE_BIT_RETRY (1U << 31)
Expand All @@ -423,8 +420,6 @@ struct i915_suspend_saved_registers {
u16 saveGCDGMBUS;
};

struct vlv_s0ix_state;

#define MAX_L3_SLICES 2
struct intel_l3_parity {
u32 *remap_info[MAX_L3_SLICES];
Expand Down Expand Up @@ -613,7 +608,6 @@ struct i915_selftest_stash {
};

/* intel_audio.c private */
struct intel_audio_funcs;
struct intel_audio_private {
/* Display internal audio functions */
const struct intel_audio_funcs *funcs;
Expand Down

0 comments on commit 2ecf64a

Please sign in to comment.