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

Commit 05ca9306 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract intel_overlay.h from intel_drv.h and i915_drv.h 



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.

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/2e4fb1e67ed38870df3040bb0a1b1a58fd90cc86.1556540890.git.jani.nikula@intel.com
parent 220b92bf

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

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

	intel_lspcon.h \

	intel_lvds.h \

	intel_overlay.h \

	intel_panel.h \

	intel_pipe_crc.h \

	intel_pm.h \

drivers/gpu/drm/i915/gt/intel_reset.c

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



#include "intel_guc.h"

#include "intel_overlay.h"



#define RESET_MAX_RETRIES 3

drivers/gpu/drm/i915/i915_drv.c

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

#include "intel_fbdev.h"

#include "intel_hotplug.h"

#include "intel_overlay.h"

#include "intel_pm.h"

#include "intel_sprite.h"

#include "intel_uc.h"

drivers/gpu/drm/i915/i915_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -3320,12 +3320,6 @@ void intel_dsc_disable(const struct intel_crtc_state *crtc_state); 
int i915_reg_read_ioctl(struct drm_device *dev, void *data,

			struct drm_file *file);



/* overlay */

extern struct intel_overlay_error_state *

intel_overlay_capture_error_state(struct drm_i915_private *dev_priv);

extern void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e,

					    struct intel_overlay_error_state *error);



extern struct intel_display_error_state *

intel_display_capture_error_state(struct drm_i915_private *dev_priv);

extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,

drivers/gpu/drm/i915/i915_gpu_error.c

+2 −1
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ 


#include <drm/drm_print.h>



#include "i915_gpu_error.h"

#include "i915_drv.h"

#include "i915_gpu_error.h"

#include "intel_overlay.h"



static inline const struct intel_engine_cs *

engine_lookup(const struct drm_i915_private *i915, unsigned int id)