Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2649b34 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract intel_lpe_audio.h from i915_drv.h 



It used to be handy that we only had a couple of headers, but over time
i915_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.

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.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9101a58b9f10bcf11332175e17b6e6e45f4ebd17.1556809195.git.jani.nikula@intel.com
parent b1ad4c39

drivers/gpu/drm/i915/Makefile.header-test

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ header_test := \ 
	intel_hdcp.h \

	intel_hdmi.h \

	intel_hotplug.h \

	intel_lpe_audio.h \

	intel_lspcon.h \

	intel_lvds.h \

	intel_overlay.h \

drivers/gpu/drm/i915/i915_drv.h

+0 −8
Original line number Diff line number Diff line
@@ -3247,14 +3247,6 @@ extern int i915_restore_state(struct drm_i915_private *dev_priv); 
void i915_setup_sysfs(struct drm_i915_private *dev_priv);

void i915_teardown_sysfs(struct drm_i915_private *dev_priv);



/* intel_lpe_audio.c */

int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);

void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);

void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);

void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,

			    enum pipe pipe, enum port port,

			    const void *eld, int ls_clock, bool dp_output);



/* intel_i2c.c */

extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);

extern void intel_teardown_gmbus(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_irq.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "intel_drv.h"

#include "intel_fifo_underrun.h"

#include "intel_hotplug.h"

#include "intel_lpe_audio.h"

#include "intel_psr.h"



/**

drivers/gpu/drm/i915/intel_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 


#include <drm/drm_edid.h>

#include <drm/i915_component.h>

#include <drm/intel_lpe_audio.h>



#include "i915_drv.h"

#include "intel_audio.h"

#include "intel_drv.h"

#include "intel_lpe_audio.h"



/**

 * DOC: High Definition Audio over HDMI and Display Port

drivers/gpu/drm/i915/intel_lpe_audio.c

+5 −3
Original line number Diff line number Diff line
@@ -61,16 +61,18 @@ 
 */



#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/irq.h>

#include <linux/pci.h>

#include <linux/pm_runtime.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>



#include "i915_drv.h"

#include <linux/delay.h>

#include <drm/intel_lpe_audio.h>



#include "i915_drv.h"

#include "intel_lpe_audio.h"



#define HAS_LPE_AUDIO(dev_priv) ((dev_priv)->lpe_audio.platdev != NULL)



static struct platform_device *