Commit 98afa316 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract intel_fbc.h from intel_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.

v2: Remove stray newline (Chris)

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/db44ba199c86f24bfa9e490531eddf51cccd89da.1554461791.git.jani.nikula@intel.com
parent 174594db

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

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

	intel_ddi.h \

	intel_engine_types.h \

	intel_fbc.h \

	intel_frontbuffer.h \

	intel_workarounds_types.h

drivers/gpu/drm/i915/i915_debugfs.c

+5 −3
Original line number Diff line number Diff line
@@ -26,14 +26,16 @@ 
 *

 */



#include <linux/sort.h>

#include <linux/sched/mm.h>

#include <linux/sort.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_fourcc.h>

#include "intel_drv.h"

#include "intel_guc_submission.h"



#include "i915_reset.h"

#include "intel_drv.h"

#include "intel_fbc.h"

#include "intel_guc_submission.h"



static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)

{

drivers/gpu/drm/i915/i915_reset.h

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



struct drm_i915_private;

struct i915_request;

struct intel_engine_cs;

struct intel_guc;

drivers/gpu/drm/i915/i915_suspend.c

+3 −1
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ 
 */



#include <drm/i915_drm.h>

#include "intel_drv.h"



#include "i915_reg.h"

#include "intel_drv.h"

#include "intel_fbc.h"



static void i915_save_display(struct drm_i915_private *dev_priv)

{

drivers/gpu/drm/i915/intel_display.c

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

#include "intel_drv.h"

#include "intel_dsi.h"

#include "intel_fbc.h"

#include "intel_frontbuffer.h"



/* Primary plane formats for gen <= 3 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE