iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/dpio: move dpio_channel and dpio_phy enums to intel_dpio_phy.h

Browse Source 
Reduce the size of intel_display.h by moving out the dpio_channel and
dpio_phy enums.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7c3ee7a6482540a0267f7b2974d22cab8188707a.1667383630.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2022-11-02 12:08:14 +02:00
parent 2461bdb35e
commit 99417adb60
8 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/display/intel_display.h
View File

@ -261,17 +261,6 @@ enum tc_port_mode {
TC_PORT_LEGACY, TC_PORT_LEGACY,
}; };
enum dpio_channel {
DPIO_CH0,
DPIO_CH1
};
enum dpio_phy {
DPIO_PHY0,
DPIO_PHY1,
DPIO_PHY2,
};
enum aux_ch { enum aux_ch {
AUX_CH_A, AUX_CH_A,
AUX_CH_B, AUX_CH_B,

2
drivers/gpu/drm/i915/display/intel_display_power_well.h
View File

@ -7,8 +7,8 @@
#include <linux/types.h> #include <linux/types.h>
#include "intel_display.h"
#include "intel_display_power.h" #include "intel_display_power.h"
#include "intel_dpio_phy.h"
struct drm_i915_private; struct drm_i915_private;
struct i915_power_well; struct i915_power_well;

13
drivers/gpu/drm/i915/display/intel_dpio_phy.h
View File

@ -8,8 +8,6 @@
#include <linux/types.h> #include <linux/types.h>
enum dpio_channel;
enum dpio_phy;
enum pipe; enum pipe;
enum port; enum port;
struct drm_i915_private; struct drm_i915_private;
@ -17,6 +15,17 @@ struct intel_crtc_state;
struct intel_digital_port; struct intel_digital_port;
struct intel_encoder; struct intel_encoder;
enum dpio_channel {
DPIO_CH0,
DPIO_CH1,
};
enum dpio_phy {
DPIO_PHY0,
DPIO_PHY1,
DPIO_PHY2,
};
void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port, void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port,
enum dpio_phy *phy, enum dpio_channel *ch); enum dpio_phy *phy, enum dpio_channel *ch);
void bxt_ddi_phy_set_signal_levels(struct intel_encoder *encoder, void bxt_ddi_phy_set_signal_levels(struct intel_encoder *encoder,

2
drivers/gpu/drm/i915/gvt/display.c
View File

@ -36,6 +36,8 @@
#include "i915_reg.h" #include "i915_reg.h"
#include "gvt.h" #include "gvt.h"
#include "display/intel_dpio_phy.h"
static int get_edp_pipe(struct intel_vgpu *vgpu) static int get_edp_pipe(struct intel_vgpu *vgpu)
{ {
u32 data = vgpu_vreg(vgpu, _TRANS_DDI_FUNC_CTL_EDP); u32 data = vgpu_vreg(vgpu, _TRANS_DDI_FUNC_CTL_EDP);

1
drivers/gpu/drm/i915/gvt/handlers.c
View File

@ -43,6 +43,7 @@
#include "intel_mchbar_regs.h" #include "intel_mchbar_regs.h"
#include "display/intel_display_types.h" #include "display/intel_display_types.h"
#include "display/intel_dmc_regs.h" #include "display/intel_dmc_regs.h"
#include "display/intel_dpio_phy.h"
#include "display/intel_fbc.h" #include "display/intel_fbc.h"
#include "display/vlv_dsi_pll_regs.h" #include "display/vlv_dsi_pll_regs.h"
#include "gt/intel_gt_regs.h" #include "gt/intel_gt_regs.h"

1
drivers/gpu/drm/i915/gvt/mmio.c
View File

@ -37,6 +37,7 @@
#include "i915_reg.h" #include "i915_reg.h"
#include "gvt.h" #include "gvt.h"
#include "display/intel_dpio_phy.h"
#include "gt/intel_gt_regs.h" #include "gt/intel_gt_regs.h"
/** /**

1
drivers/gpu/drm/i915/intel_gvt_mmio_table.c
View File

@ -6,6 +6,7 @@
#include "display/intel_audio_regs.h" #include "display/intel_audio_regs.h"
#include "display/intel_backlight_regs.h" #include "display/intel_backlight_regs.h"
#include "display/intel_dmc_regs.h" #include "display/intel_dmc_regs.h"
#include "display/intel_dpio_phy.h"
#include "display/vlv_dsi_pll_regs.h" #include "display/vlv_dsi_pll_regs.h"
#include "gt/intel_gt_regs.h" #include "gt/intel_gt_regs.h"
#include "gvt/gvt.h" #include "gvt/gvt.h"

2
drivers/gpu/drm/i915/vlv_sideband.c
View File

@ -8,6 +8,8 @@
#include "i915_reg.h" #include "i915_reg.h"
#include "vlv_sideband.h" #include "vlv_sideband.h"
#include "display/intel_dpio_phy.h"
/* /*
* IOSF sideband, see VLV2_SidebandMsg_HAS.docx and * IOSF sideband, see VLV2_SidebandMsg_HAS.docx and
* VLV_VLV2_PUNIT_HAS_0.8.docx * VLV_VLV2_PUNIT_HAS_0.8.docx