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

Commit 596fee14 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract intel_sdvo.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.

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/c507e15fef019541da5bb33f2fbe920a5ad2f3dc.1554461791.git.jani.nikula@intel.com
parent f3e18947

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

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

	intel_lspcon.h \

	intel_psr.h \

	intel_sdvo.h \

	intel_workarounds_types.h



quiet_cmd_header_test = HDRTEST $@

drivers/gpu/drm/i915/intel_display.c

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

#include "intel_frontbuffer.h"

#include "intel_psr.h"

#include "intel_sdvo.h"



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

static const u32 i8xx_primary_formats[] = {

drivers/gpu/drm/i915/intel_drv.h

+0 −7
Original line number Diff line number Diff line
@@ -2314,13 +2314,6 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc, 
void intel_init_ipc(struct drm_i915_private *dev_priv);

void intel_enable_ipc(struct drm_i915_private *dev_priv);



/* intel_sdvo.c */

bool intel_sdvo_port_enabled(struct drm_i915_private *dev_priv,

			     i915_reg_t sdvo_reg, enum pipe *pipe);

bool intel_sdvo_init(struct drm_i915_private *dev_priv,

		     i915_reg_t reg, enum port port);





/* intel_sprite.c */

bool is_planar_yuv_format(u32 pixelformat);

int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,

drivers/gpu/drm/i915/intel_hdmi.c

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

#include "intel_drv.h"

#include "intel_lspcon.h"

#include "intel_sdvo.h"



static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)

{

drivers/gpu/drm/i915/intel_sdvo.c

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

#include "intel_connector.h"

#include "intel_drv.h"

#include "intel_sdvo.h"

#include "intel_sdvo_regs.h"



#define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)