On Fri, 05 Apr 2019, Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
> It used to be handy that we only had a couple of headers, but over time
> intel_drv.h has become unwieldy. Extract declarations to a separate
> header file corresponding to the implementation module, clarifying the
> modularity of the driver.
The tabs are a copy-paste fail that happen to align so that I didn't
spot them in either git log or looking at the patches before
sending. Ugh.
BR,
Jani.
>
> Ensure the new header is self-contained, and do so with minimal further
> includes, using forward declarations as needed. Include the new header
> only where needed, and sort the modified include directives while at it
> and as needed.
>
> No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/Makefile.header-test | 1 +
> drivers/gpu/drm/i915/intel_crt.c | 5 ++++-
> drivers/gpu/drm/i915/intel_crt.h | 21 +++++++++++++++++++++
> drivers/gpu/drm/i915/intel_display.c | 11 ++---------
> drivers/gpu/drm/i915/intel_drv.h | 6 ------
> drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +
> 6 files changed, 29 insertions(+), 16 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/intel_crt.h
>
> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
> index 09bba7c9376c..fd0f33ea896d 100644
> --- a/drivers/gpu/drm/i915/Makefile.header-test
> +++ b/drivers/gpu/drm/i915/Makefile.header-test
> @@ -10,6 +10,7 @@ header_test := \
> i915_timeline_types.h \
> intel_audio.h \
> intel_context_types.h \
> + intel_crt.h \
> intel_engine_types.h \
> intel_frontbuffer.h \
> intel_workarounds_types.h
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 50530e49982c..a14afbe51b08 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -27,13 +27,16 @@
> #include <linux/dmi.h>
> #include <linux/i2c.h>
> #include <linux/slab.h>
> +
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_crtc.h>
> #include <drm/drm_edid.h>
> #include <drm/drm_probe_helper.h>
> -#include "intel_drv.h"
> #include <drm/i915_drm.h>
> +
> #include "i915_drv.h"
> +#include "intel_crt.h"
> +#include "intel_drv.h"
>
> /* Here's the desired hotplug mode */
> #define ADPA_HOTPLUG_BITS (ADPA_CRT_HOTPLUG_PERIOD_128 | \
> diff --git a/drivers/gpu/drm/i915/intel_crt.h b/drivers/gpu/drm/i915/intel_crt.h
> new file mode 100644
> index 000000000000..1b3fba359efc
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/intel_crt.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2019 Intel Corporation
> + */
> +
> +#ifndef __INTEL_CRT_H__
> +#define __INTEL_CRT_H__
> +
> +#include "i915_reg.h"
> +
> +enum pipe;
> +struct drm_encoder;
> +struct drm_i915_private;
> +struct drm_i915_private;
> +
> +bool intel_crt_port_enabled(struct drm_i915_private *dev_priv,
> + i915_reg_t adpa_reg, enum pipe *pipe);
> +void intel_crt_init(struct drm_i915_private *dev_priv);
> +void intel_crt_reset(struct drm_encoder *encoder);
> +
> +#endif /* __INTEL_CRT_H__ */
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 7ecfb7d98839..5cf82dbead65 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -46,20 +46,13 @@
>
> #include "i915_drv.h"
> #include "i915_gem_clflush.h"
> +#include "i915_reset.h"
> #include "i915_trace.h"
> +#include "intel_crt.h"
> #include "intel_drv.h"
> #include "intel_dsi.h"
> #include "intel_frontbuffer.h"
>
> -#include "intel_drv.h"
> -#include "intel_dsi.h"
> -#include "intel_frontbuffer.h"
> -
> -#include "i915_drv.h"
> -#include "i915_gem_clflush.h"
> -#include "i915_reset.h"
> -#include "i915_trace.h"
> -
> /* Primary plane formats for gen <= 3 */
> static const u32 i8xx_primary_formats[] = {
> DRM_FORMAT_C8,
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 5dc434d74ada..847da5b24548 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1627,12 +1627,6 @@ void gen9_reset_guc_interrupts(struct drm_i915_private *dev_priv);
> void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv);
> void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv);
>
> -/* intel_crt.c */
> -bool intel_crt_port_enabled(struct drm_i915_private *dev_priv,
> - i915_reg_t adpa_reg, enum pipe *pipe);
> -void intel_crt_init(struct drm_i915_private *dev_priv);
> -void intel_crt_reset(struct drm_encoder *encoder);
> -
> /* intel_ddi.c */
> void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,
> const struct intel_crtc_state *old_crtc_state,
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 40ddfbb97acb..a9931081462b 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -32,6 +32,7 @@
> #include <drm/drm_print.h>
>
> #include "i915_drv.h"
> +#include "intel_crt.h"
> #include "intel_drv.h"
>
> /**
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
