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

Commit 56c5098f authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Separate sideband declarations to intel_sideband.h 



Split the sideback declarations out of the ginormous i915_drv.h

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190426081725.31217-5-chris@chris-wilson.co.uk
parent ebb5eb7d

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

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

	intel_pm.h \

	intel_psr.h \

	intel_sideband.h \

	intel_sdvo.h \

	intel_sprite.h \

	intel_tv.h \

drivers/gpu/drm/i915/i915_debugfs.c

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

#include "intel_pm.h"

#include "intel_psr.h"

#include "intel_sideband.h"



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

{

drivers/gpu/drm/i915/i915_drv.h

+0 −120
Original line number Diff line number Diff line
@@ -541,11 +541,6 @@ enum intel_pch { 
	PCH_ICP,	/* Ice Lake PCH */

};



enum intel_sbi_destination {

	SBI_ICLK,

	SBI_MPHY,

};



#define QUIRK_LVDS_SSC_DISABLE (1<<1)

#define QUIRK_INVERT_BRIGHTNESS (1<<2)

#define QUIRK_BACKLIGHT_PRESENT (1<<3)
@@ -3435,121 +3430,6 @@ int sandybridge_pcode_write_timeout(struct drm_i915_private *dev_priv, u32 mbox, 
int skl_pcode_request(struct drm_i915_private *dev_priv, u32 mbox, u32 request,

		      u32 reply_mask, u32 reply, int timeout_base_ms);



/* intel_sideband.c */



enum {

	VLV_IOSF_SB_BUNIT,

	VLV_IOSF_SB_CCK,

	VLV_IOSF_SB_CCU,

	VLV_IOSF_SB_DPIO,

	VLV_IOSF_SB_FLISDSI,

	VLV_IOSF_SB_GPIO,

	VLV_IOSF_SB_NC,

	VLV_IOSF_SB_PUNIT,

};



void vlv_iosf_sb_get(struct drm_i915_private *i915, unsigned long ports);

u32 vlv_iosf_sb_read(struct drm_i915_private *i915, u8 port, u32 reg);

void vlv_iosf_sb_write(struct drm_i915_private *i915,

		       u8 port, u32 reg, u32 val);

void vlv_iosf_sb_put(struct drm_i915_private *i915, unsigned long ports);



static inline void vlv_bunit_get(struct drm_i915_private *i915)

{

	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_BUNIT));

}



u32 vlv_bunit_read(struct drm_i915_private *i915, u32 reg);

void vlv_bunit_write(struct drm_i915_private *i915, u32 reg, u32 val);



static inline void vlv_bunit_put(struct drm_i915_private *i915)

{

	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_BUNIT));

}



static inline void vlv_cck_get(struct drm_i915_private *i915)

{

	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCK));

}



u32 vlv_cck_read(struct drm_i915_private *i915, u32 reg);

void vlv_cck_write(struct drm_i915_private *i915, u32 reg, u32 val);



static inline void vlv_cck_put(struct drm_i915_private *i915)

{

	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCK));

}



static inline void vlv_ccu_get(struct drm_i915_private *i915)

{

	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCU));

}



u32 vlv_ccu_read(struct drm_i915_private *i915, u32 reg);

void vlv_ccu_write(struct drm_i915_private *i915, u32 reg, u32 val);



static inline void vlv_ccu_put(struct drm_i915_private *i915)

{

	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCU));

}



static inline void vlv_dpio_get(struct drm_i915_private *i915)

{

	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_DPIO));

}



u32 vlv_dpio_read(struct drm_i915_private *i915, enum pipe pipe, int reg);

void vlv_dpio_write(struct drm_i915_private *i915,

		    enum pipe pipe, int reg, u32 val);



static inline void vlv_dpio_put(struct drm_i915_private *i915)

{

	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_DPIO));

}



static inline void vlv_flisdsi_get(struct drm_i915_private *i915)

{

	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_FLISDSI));

}



u32 vlv_flisdsi_read(struct drm_i915_private *i915, u32 reg);

void vlv_flisdsi_write(struct drm_i915_private *i915, u32 reg, u32 val);



static inline void vlv_flisdsi_put(struct drm_i915_private *i915)

{

	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_FLISDSI));

}



static inline void vlv_nc_get(struct drm_i915_private *i915)

{

	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_NC));

}



u32 vlv_nc_read(struct drm_i915_private *i915, u8 addr);



static inline void vlv_nc_put(struct drm_i915_private *i915)

{

	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_NC));

}



static inline void vlv_punit_get(struct drm_i915_private *i915)

{

	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT));

}



u32 vlv_punit_read(struct drm_i915_private *i915, u32 addr);

int vlv_punit_write(struct drm_i915_private *i915, u32 addr, u32 val);



static inline void vlv_punit_put(struct drm_i915_private *i915)

{

	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_PUNIT));

}



u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg,

		   enum intel_sbi_destination destination);

void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,

		     enum intel_sbi_destination destination);



/* intel_dpio_phy.c */

void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port,

			     enum dpio_phy *phy, enum dpio_channel *ch);

drivers/gpu/drm/i915/i915_sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
#include <linux/module.h>

#include <linux/stat.h>

#include <linux/sysfs.h>



#include "intel_drv.h"

#include "intel_sideband.h"

#include "i915_drv.h"



static inline struct drm_i915_private *kdev_minor_to_i915(struct device *kdev)

drivers/gpu/drm/i915/intel_cdclk.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include "intel_cdclk.h"

#include "intel_drv.h"

#include "intel_sideband.h"



/**

 * DOC: CDCLK / RAWCLK