drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/11 drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
By the Spec all CNL skus are GT2.
v2: Really include the PCI IDs to the picidlist[];
v3: Add the PCI Id for another SKU (Anusha).
v4: Update IDs, really include to pciidlists again.
v5: Unify all GT2 IDs.
v6: Unify in a way that we don't break early-quirks.c
--- drivers/gpu/drm/i915/i915_pci.c | 3 +-- include/drm/i915_pciids.h | 18 +++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_pci.c +1 -2
@@ -636,8 +636,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_CFL_U_GT1_IDS (&intel_coffeelake_gt1_info),INTEL_CFL_U_GT2_IDS (&intel_coffeelake_gt2_info),INTEL_CFL_U_GT3_IDS (&intel_coffeelake_gt3_info), -INTEL_CNL_U_GT2_IDS (&intel_cannonlake_gt2_info), -INTEL_CNL_Y_GT2_IDS (&intel_cannonlake_gt2_info), +INTEL_CNL_IDS (&intel_cannonlake_gt2_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);
include/drm/i915_pciids.h +7 -11
@@ -414,24 +414,20 @@INTEL_CFL_U_GT2_IDS (info), \INTEL_CFL_U_GT3_IDS (info) -/* CNL U 2+2 */ -#define INTEL_CNL_U_GT2_IDS (info) \ +/* CNL */ +#define INTEL_CNL_IDS (info) \ INTEL_VGA_DEVICE(0x5A52, info), \ INTEL_VGA_DEVICE(0x5A5A, info), \ INTEL_VGA_DEVICE(0x5A42, info), \ - INTEL_VGA_DEVICE(0x5A4A, info) - -/* CNL Y 2+2 */ -#define INTEL_CNL_Y_GT2_IDS (info) \ + INTEL_VGA_DEVICE(0x5A4A, info), \ INTEL_VGA_DEVICE(0x5A51, info), \ INTEL_VGA_DEVICE(0x5A59, info), \ INTEL_VGA_DEVICE(0x5A41, info), \ INTEL_VGA_DEVICE(0x5A49, info), \ INTEL_VGA_DEVICE(0x5A71, info), \ - INTEL_VGA_DEVICE(0x5A79, info) - -#define INTEL_CNL_IDS (info) \ - INTEL_CNL_U_GT2_IDS(info), \ - INTEL_CNL_Y_GT2_IDS(info) + INTEL_VGA_DEVICE(0x5A79, info), \ + INTEL_VGA_DEVICE(0x5A54, info), \ + INTEL_VGA_DEVICE(0x5A5C, info), \ + INTEL_VGA_DEVICE(0x5A44, info)#endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/11 drm/i915/cnl: Add Port F definition.
Some Cannonlake SKUs will come with a full split between port A and port E. This will be called port F although it is not a 6th port, but only a split.
v2: Fix size of dvo_ports found by Ander.
v3: Adding missing cases from intel_bios.c for Port_F
v4: Adding other missing cases and fix the commit message.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_bios.c | 9 +++++++++ drivers/gpu/drm/i915/intel_dp.c | 2 ++ drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++ include/drm/i915_component.h | 3 +-- 5 files changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -346,6 +346,7 @@ enum port {PORT_C ,PORT_D ,PORT_E , +PORT_F , I915_MAX_PORTS };#define port_name (p) ((p) + 'A')
drivers/gpu/drm/i915/intel_bios.c +9 -0
@@ -1140,6 +1140,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, {DVO_PORT_HDMIC, DVO_PORT_DPC, -1}, {DVO_PORT_HDMID, DVO_PORT_DPD, -1}, {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE}, + {DVO_PORT_HDMIF, DVO_PORT_DPF, -1}, };/*
@@ -1688,6 +1689,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por [PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, }, [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, }, [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, }, + [PORT_F] = { DVO_PORT_DPF, DVO_PORT_HDMIF, }, };int i;
@@ -1726,6 +1728,7 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port) [PORT_C] = DVO_PORT_DPC, [PORT_D] = DVO_PORT_DPD, [PORT_E] = DVO_PORT_DPE, + [PORT_F] = DVO_PORT_DPF, };int i;
@@ -1761,6 +1764,7 @@ static bool child_dev_is_dp_dual_mode(const struct child_device_config *child, [PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, }, [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, }, [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, }, + [PORT_F] = { DVO_PORT_DPF, DVO_PORT_HDMIF, }, };if (port ==PORT_A || port >=ARRAY_SIZE (port_mapping))
@@ -1927,6 +1931,11 @@ intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,if (port ==PORT_D )return true;break ; +case DVO_PORT_DPF : +case DVO_PORT_HDMIF : +if (port ==PORT_F ) +return true; +break ;default :break ; }
drivers/gpu/drm/i915/intel_dp.c +2 -0
@@ -1378,6 +1378,7 @@ static i915_reg_t skl_aux_ctl_reg(struct drm_i915_private *dev_priv,case PORT_B :case PORT_C :case PORT_D : +case PORT_F :return DP_AUX_CH_CTL (port);default :MISSING_CASE (port);
@@ -1393,6 +1394,7 @@ static i915_reg_t skl_aux_data_reg(struct drm_i915_private *dev_priv,case PORT_B :case PORT_C :case PORT_D : +case PORT_F :return DP_AUX_CH_DATA (port, index);default :MISSING_CASE (port);
drivers/gpu/drm/i915/intel_vbt_defs.h +2 -0
@@ -299,6 +299,8 @@ struct bdb_general_features {#define DVO_PORT_DPA 10#define DVO_PORT_DPE 11/* 193 */ #define DVO_PORT_HDMIE 12/* 193 */ +#define DVO_PORT_DPF 13 +#define DVO_PORT_HDMIF 14#define DVO_PORT_MIPIA 21/* 171 */ #define DVO_PORT_MIPIB 22/* 171 */ #define DVO_PORT_MIPIC 23/* 171 */
include/drm/i915_component.h +1 -2
@@ -26,9 +26,8 @@/* MAX_PORT is the number of port * It must be sync with I915_MAX_PORTS defined i915_drv.h -* 5 should be enough as only HSW, BDW, SKL need such fix. */ -#define MAX_PORTS 5 +#define MAX_PORTS 6/** * struct i915_audio_component_ops - Ops implemented by i915 driver, called by hda driver
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 3/11 drm/i915/cnl: Add AUX-F support
In reply to Rodrigo ViviOn some Cannonlake SKUs we have a dedicated Aux for port F, that is only the full split between port A and port E.
There is still no Aux E for Port E, as in previous platforms, because port_E still means shared lanes with port A.
v2: Rebase.
v3: Add couple missed PORT_F cases on intel_dp.
v4: Rebase and fix commit message.
v5: Squash Imre's "drm/i915: Add missing AUX_F power well string"
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_dp.c | 8 ++++++++ drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++++++++ 5 files changed, 37 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -397,6 +397,8 @@ enum intel_display_power_domain {POWER_DOMAIN_AUX_B ,POWER_DOMAIN_AUX_C ,POWER_DOMAIN_AUX_D , +POWER_DOMAIN_AUX_F , +POWER_DOMAIN_GMBUS ,POWER_DOMAIN_MODESET , POWER_DOMAIN_GT_IRQ,
@@ -1702,6 +1704,7 @@ enum modeset_restore {#define DP_AUX_B 0x10#define DP_AUX_C 0x20#define DP_AUX_D 0x30 +#define DP_AUX_F 0x50#define DDC_PIN_B 0x05#define DDC_PIN_C 0x04
drivers/gpu/drm/i915/i915_irq.c +6 -0
@@ -2579,6 +2579,9 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)GEN9_AUX_CHANNEL_C |GEN9_AUX_CHANNEL_D ; +if (IS_CANNONLAKE (dev_priv)) + tmp_mask |=CNL_AUX_CHANNEL_F ; +if (iir & tmp_mask) {dp_aux_irq_handler (dev_priv); found = true;
@@ -3611,6 +3614,9 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) de_pipe_masked |=GEN8_DE_PIPE_IRQ_FAULT_ERRORS ; } +if (IS_CANNONLAKE (dev_priv)) + de_port_masked |=CNL_AUX_CHANNEL_F ; + de_pipe_enables = de_pipe_masked |GEN8_PIPE_VBLANK |GEN8_PIPE_FIFO_UNDERRUN ;
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -1312,6 +1312,7 @@ enum i915_power_well_id {CNL_DISP_PW_AUX_B =GLK_DISP_PW_AUX_B ,CNL_DISP_PW_AUX_C =GLK_DISP_PW_AUX_C ,CNL_DISP_PW_AUX_D , +CNL_DISP_PW_AUX_F =13 ,SKL_DISP_PW_1 =14 , SKL_DISP_PW_2,
@@ -5272,6 +5273,13 @@ enum {#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510) +#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514) +#define _DPF_AUX_CH_DATA2 (dev_priv->info.display_mmio_offset + 0x64518) +#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c) +#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520) +#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */
@@ -6927,6 +6935,7 @@ enum {#define GEN8_DE_PORT_IMR _MMIO(0x44444)#define GEN8_DE_PORT_IIR _MMIO(0x44448)#define GEN8_DE_PORT_IER _MMIO(0x4444c) +#define CNL_AUX_CHANNEL_F (1 << 28)#define GEN9_AUX_CHANNEL_D (1 << 27)#define GEN9_AUX_CHANNEL_C (1 << 26)#define GEN9_AUX_CHANNEL_B (1 << 25)
drivers/gpu/drm/i915/intel_dp.c +8 -0
@@ -1298,6 +1298,9 @@ static enum port intel_aux_port(struct drm_i915_private *dev_priv,case DP_AUX_D : aux_port =PORT_D ;break ; +case DP_AUX_F : + aux_port =PORT_F ; +break ;default :MISSING_CASE (info->alternate_aux_channel); aux_port =PORT_A ;
@@ -1317,6 +1320,7 @@ static i915_reg_t g4x_aux_ctl_reg(struct drm_i915_private *dev_priv,case PORT_B :case PORT_C :case PORT_D : +case PORT_F :return DP_AUX_CH_CTL (port);default :MISSING_CASE (port);
@@ -1331,6 +1335,7 @@ static i915_reg_t g4x_aux_data_reg(struct drm_i915_private *dev_priv,case PORT_B :case PORT_C :case PORT_D : +case PORT_F :return DP_AUX_CH_DATA (port, index);default :MISSING_CASE (port);
@@ -5992,6 +5997,9 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port)/* FIXME: Check VBT for actual wiring of PORT E */ intel_dp->aux_power_domain =POWER_DOMAIN_AUX_D ;break ; +case PORT_F : + intel_dp->aux_power_domain =POWER_DOMAIN_AUX_F ; +break ;default :MISSING_CASE (encoder->port); }
drivers/gpu/drm/i915/intel_runtime_pm.c +11 -0
@@ -124,6 +124,8 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "AUX_C" ;case POWER_DOMAIN_AUX_D :return "AUX_D" ; +case POWER_DOMAIN_AUX_F : +return "AUX_F" ;case POWER_DOMAIN_GMBUS :return "GMBUS" ;case POWER_DOMAIN_INIT :
@@ -1835,6 +1837,9 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,#define CNL_DISPLAY_AUX_D_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_D) | \ BIT_ULL(POWER_DOMAIN_INIT)) +#define CNL_DISPLAY_AUX_F_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_AUX_F) | \ + BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ CNL_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ BIT_ULL(POWER_DOMAIN_MODESET) | \
@@ -2384,6 +2389,12 @@ static struct i915_power_well cnl_power_wells[] = { .ops = &hsw_power_well_ops, .id = SKL_DISP_PW_DDI_D, }, + { + .name = "AUX F", + .domains = CNL_DISPLAY_AUX_F_POWER_DOMAINS, + .ops = &hsw_power_well_ops, + .id = CNL_DISP_PW_AUX_F, + }, }; static int
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 4/11 drm/i915/cnl: Fix _CNL_PORT_TX_DW2_LN0_F definition.
In reply to Rodrigo ViviThis was wrong since its introduction on commit '04416108ccea ("drm/i915/cnl: Add registers related to voltage swing sequences.")'
But since no Port F was needed so far we don't need to propagate fixes back there.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1964,7 +1964,7 @@ enum i915_power_well_id {#define _CNL_PORT_TX_DW2_LN0_B 0x162648#define _CNL_PORT_TX_DW2_LN0_C 0x162C48#define _CNL_PORT_TX_DW2_LN0_D 0x162E48 -#define _CNL_PORT_TX_DW2_LN0_F 0x162A48 +#define _CNL_PORT_TX_DW2_LN0_F 0x162848#define CNL_PORT_TX_DW2_GRP (port) _MMIO_PORT6(port, \ _CNL_PORT_TX_DW2_GRP_AE, \ _CNL_PORT_TX_DW2_GRP_B, \
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 5/11 drm/i915: Fix DPLCLKA_CFGCR0 bits for Port F.
In reply to Rodrigo ViviSince when it got introduced with commit '555e38d27317 ("drm/i915/cnl: DDI - PLL mapping")' the support for Port F was wrong, because Port F bits are far from bits used for A to E.
Since Port F is not used so far we don't need to propagate Fixes back there.
--- drivers/gpu/drm/i915/i915_reg.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +8 -4
@@ -8661,10 +8661,14 @@ enum skl_power_gate {* CNL Clocks */ #define DPCLKA_CFGCR0 _MMIO(0x6C200) -#define DPCLKA_CFGCR0_DDI_CLK_OFF (port) (1 << ((port)+10)) -#define DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (port) (3 << ((port)*2)) -#define DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (port) ((port)*2) -#define DPCLKA_CFGCR0_DDI_CLK_SEL (pll, port) ((pll) << ((port)*2)) +#define DPCLKA_CFGCR0_DDI_CLK_OFF (port) (1 << ((port) == PORT_F ? 23 : \ + (port)+10)) +#define DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (port) (3 << ((port) == PORT_F ? 21 : \ + (port)*2)) +#define DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (port) ((port) == PORT_F ? 21 : \ + (port)*2) +#define DPCLKA_CFGCR0_DDI_CLK_SEL (pll, port) ((pll) << ((port) == PORT_F ? 21 : \ + (port)*2))/* CNL PLL */ #define DPLL0_ENABLE 0x46010
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 6/11 drm/i915/cnl: Add right GMBUS pin number for HDMI on Port F.
In reply to Rodrigo ViviOn CNP Pin 3 is for misc of Port F usage depending on the configuration. For CNL that uses Port F, pin 3 is the one.
v2: Make it more generic and update commit message.
--- drivers/gpu/drm/i915/intel_hdmi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
@@ -1924,6 +1924,9 @@ static u8 cnp_port_to_ddc_pin(struct drm_i915_private *dev_priv,case PORT_D : ddc_pin =GMBUS_PIN_4_CNP ;break ; +case PORT_F : + ddc_pin =GMBUS_PIN_3_BXT ; +break ;default :MISSING_CASE (port); ddc_pin =GMBUS_PIN_1_BXT ;
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 7/11 drm/i915: For HPD connected port use hpd_pin instead of port.
In reply to Rodrigo ViviLet's try to simplify this mapping to hpd_pin -> bit instead using port.
So for CNL with port F where we have this port using hdp_pin and bits of other ports we don't need to duplicated the mapping.
But for now this is only a re-org with no functional change expected.
--- drivers/gpu/drm/i915/intel_dp.c | 144 ++++++++++++++++++------------------ drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_lspcon.c | 3 +- 3 files changed, 72 insertions(+), 78 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +70 -74
@@ -4462,173 +4462,170 @@ edp_detect(struct intel_dp *intel_dp)return status; } -static bool ibx_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool ibx_digital_port_connected (struct intel_encoder *encoder) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);u32 bit; -switch (port->base.port) { -case PORT_B : +switch (encoder->hpd_pin) { +case HPD_PORT_B : bit =SDE_PORTB_HOTPLUG ;break ; -case PORT_C : +case HPD_PORT_C : bit =SDE_PORTC_HOTPLUG ;break ; -case PORT_D : +case HPD_PORT_D : bit =SDE_PORTD_HOTPLUG ;break ;default : -MISSING_CASE (port->base.port); +MISSING_CASE (encoder->hpd_pin);return false; }return I915_READ (SDEISR ) & bit; } -static bool cpt_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool cpt_digital_port_connected (struct intel_encoder *encoder) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);u32 bit; -switch (port->base.port) { -case PORT_B : +switch (encoder->hpd_pin) { +case HPD_PORT_B : bit =SDE_PORTB_HOTPLUG_CPT ;break ; -case PORT_C : +case HPD_PORT_C : bit =SDE_PORTC_HOTPLUG_CPT ;break ; -case PORT_D : +case HPD_PORT_D : bit =SDE_PORTD_HOTPLUG_CPT ;break ;default : -MISSING_CASE (port->base.port); +MISSING_CASE (encoder->hpd_pin);return false; }return I915_READ (SDEISR ) & bit; } -static bool spt_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool spt_digital_port_connected (struct intel_encoder *encoder) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);u32 bit; -switch (port->base.port) { -case PORT_A : +switch (encoder->hpd_pin) { +case HPD_PORT_A : bit =SDE_PORTA_HOTPLUG_SPT ;break ; -case PORT_E : +case HPD_PORT_E : bit =SDE_PORTE_HOTPLUG_SPT ;break ;default : -return cpt_digital_port_connected (dev_priv, port); +return cpt_digital_port_connected (encoder); }return I915_READ (SDEISR ) & bit; } -static bool g4x_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool g4x_digital_port_connected (struct intel_encoder *encoder) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);u32 bit; -switch (port->base.port) { -case PORT_B : +switch (encoder->hpd_pin) { +case HPD_PORT_B : bit =PORTB_HOTPLUG_LIVE_STATUS_G4X ;break ; -case PORT_C : +case HPD_PORT_C : bit =PORTC_HOTPLUG_LIVE_STATUS_G4X ;break ; -case PORT_D : +case HPD_PORT_D : bit =PORTD_HOTPLUG_LIVE_STATUS_G4X ;break ;default : -MISSING_CASE (port->base.port); +MISSING_CASE (encoder->hpd_pin);return false; }return I915_READ (PORT_HOTPLUG_STAT ) & bit; } -static bool gm45_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool gm45_digital_port_connected (struct intel_encoder *encoder) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);u32 bit; -switch (port->base.port) { -case PORT_B : +switch (encoder->hpd_pin) { +case HPD_PORT_B : bit =PORTB_HOTPLUG_LIVE_STATUS_GM45 ;break ; -case PORT_C : +case HPD_PORT_C : bit =PORTC_HOTPLUG_LIVE_STATUS_GM45 ;break ; -case PORT_D : +case HPD_PORT_D : bit =PORTD_HOTPLUG_LIVE_STATUS_GM45 ;break ;default : -MISSING_CASE (port->base.port); +MISSING_CASE (encoder->hpd_pin);return false; }return I915_READ (PORT_HOTPLUG_STAT ) & bit; } -static bool ilk_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool ilk_digital_port_connected (struct intel_encoder *encoder) { -if (port->base.port ==PORT_A ) +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +if (encoder->hpd_pin ==HPD_PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ;else -return ibx_digital_port_connected (dev_priv, port); +return ibx_digital_port_connected (encoder); } -static bool snb_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool snb_digital_port_connected (struct intel_encoder *encoder) { -if (port->base.port ==PORT_A ) +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +if (encoder->hpd_pin ==HPD_PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ;else -return cpt_digital_port_connected (dev_priv, port); +return cpt_digital_port_connected (encoder); } -static bool ivb_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool ivb_digital_port_connected (struct intel_encoder *encoder) { -if (port->base.port ==PORT_A ) +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +if (encoder->hpd_pin ==HPD_PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG_IVB ;else -return cpt_digital_port_connected (dev_priv, port); +return cpt_digital_port_connected (encoder); } -static bool bdw_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +static bool bdw_digital_port_connected (struct intel_encoder *encoder) { -if (port->base.port ==PORT_A ) +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +if (encoder->hpd_pin ==HPD_PORT_A )return I915_READ (GEN8_DE_PORT_ISR ) &GEN8_PORT_DP_A_HOTPLUG ;else -return cpt_digital_port_connected (dev_priv, port); +return cpt_digital_port_connected (encoder); } -static bool bxt_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *intel_dig_port) +static bool bxt_digital_port_connected (struct intel_encoder *encoder) { -struct intel_encoder *intel_encoder = &intel_dig_port->base; -enum port port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);u32 bit; - port =intel_hpd_pin_to_port (intel_encoder->hpd_pin); -switch (port) { -case PORT_A : +switch (encoder->hpd_pin) { +case HPD_PORT_A : bit =BXT_DE_PORT_HP_DDIA ;break ; -case PORT_B : +case HPD_PORT_B : bit =BXT_DE_PORT_HP_DDIB ;break ; -case PORT_C : +case HPD_PORT_C : bit =BXT_DE_PORT_HP_DDIC ;break ;default : -MISSING_CASE (port); +MISSING_CASE (encoder->hpd_pin);return false; }
@@ -4637,33 +4634,33 @@ static bool bxt_digital_port_connected(struct drm_i915_private *dev_priv,/* * intel_digital_port_connected - is the specified port connected? -* @dev_priv: i915 private structure -* @port: the port to test +* @encoder: intel_encoder * * Return %true if @port is connected, %false otherwise. */ -bool intel_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port) +bool intel_digital_port_connected (struct intel_encoder *encoder) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +if (HAS_GMCH_DISPLAY (dev_priv)) {if (IS_GM45 (dev_priv)) -return gm45_digital_port_connected (dev_priv, port); +return gm45_digital_port_connected (encoder);else -return g4x_digital_port_connected (dev_priv, port); +return g4x_digital_port_connected (encoder); }if (IS_GEN5 (dev_priv)) -return ilk_digital_port_connected (dev_priv, port); +return ilk_digital_port_connected (encoder);else if (IS_GEN6 (dev_priv)) -return snb_digital_port_connected (dev_priv, port); +return snb_digital_port_connected (encoder);else if (IS_GEN7 (dev_priv)) -return ivb_digital_port_connected (dev_priv, port); +return ivb_digital_port_connected (encoder);else if (IS_GEN8 (dev_priv)) -return bdw_digital_port_connected (dev_priv, port); +return bdw_digital_port_connected (encoder);else if (IS_GEN9_LP (dev_priv)) -return bxt_digital_port_connected (dev_priv, port); +return bxt_digital_port_connected (encoder);else -return spt_digital_port_connected (dev_priv, port); +return spt_digital_port_connected (encoder); } static struct edid *
@@ -4722,8 +4719,7 @@ intel_dp_long_pulse(struct intel_connector *connector)/* Can't disconnect eDP, but you can close the lid... */ if (intel_dp_is_edp (intel_dp)) status =edp_detect (intel_dp); -else if (intel_digital_port_connected (dev_priv, -dp_to_dig_port (intel_dp))) +else if (intel_digital_port_connected (&dp_to_dig_port (intel_dp)->base)) status =intel_dp_detect_dpcd (intel_dp);else status = connector_status_disconnected;
drivers/gpu/drm/i915/intel_drv.h +1 -2
@@ -1590,8 +1590,7 @@ static inline unsigned int intel_dp_unused_lane_mask(int lane_count)bool intel_dp_read_dpcd (struct intel_dp *intel_dp);int intel_dp_link_required (int pixel_clock,int bpp);int intel_dp_max_data_rate (int max_link_clock,int max_lanes); -bool intel_digital_port_connected (struct drm_i915_private *dev_priv, -struct intel_digital_port *port); +bool intel_digital_port_connected (struct intel_encoder *encoder);/* intel_dp_aux_backlight.c */ int intel_dp_aux_init_backlight_funcs (struct intel_connector *intel_connector);
drivers/gpu/drm/i915/intel_lspcon.c +1 -2
@@ -167,11 +167,10 @@ static void lspcon_resume_in_pcon_wa(struct intel_lspcon *lspcon) {struct intel_dp *intel_dp =lspcon_to_intel_dp (lspcon);struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev);unsigned long start = jiffies;while (1 ) { -if (intel_digital_port_connected (dev_priv, dig_port)) { +if (intel_digital_port_connected (&dig_port->base)) {DRM_DEBUG_KMS ("LSPCON recovering in PCON mode after %u ms\n" ,jiffies_to_msecs (jiffies - start));return ;
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 8/11 drm/i915/cnl: Add HPD support for Port F.
In reply to Rodrigo ViviOn CNP boards that are using DDI F,
bit 25 (SDE_PORTE_HOTPLUG_SPT) is representing the Digital Port F hotplug line when the Digital Port F hotplug detect input is enabled.
v2: Reuse all existent structure instead of adding a new HPD_PORT_F pointing to pin of port E.
v3: Use IS_CNL_WITH_PORT_F so we can start upstreaming
this right now. If that SKU ever get a proper name we come back and update it.
v4: Rebase on top of digital connected port using encoder
instead of port.
--- drivers/gpu/drm/i915/i915_drv.h | 8 ++++++-- drivers/gpu/drm/i915/i915_irq.c | 35 +++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_dp.c | 4 +++- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_hotplug.c | 19 +++++++++++++++---- 5 files changed, 44 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +6 -2
@@ -3093,6 +3093,8 @@ intel_info(const struct drm_i915_private *dev_priv) (dev_priv)->info.gt == 2)#define IS_CFL_GT3 (dev_priv) (IS_COFFEELAKE(dev_priv) && \ (dev_priv)->info.gt == 3) +#define IS_CNL_WITH_PORT_F (dev_priv) (IS_CANNONLAKE(dev_priv) && \ + (INTEL_DEVID(dev_priv) & 0x0004) == 0x0004)#define IS_ALPHA_SUPPORT (intel_info) ((intel_info)->is_alpha_support)
@@ -3397,8 +3399,10 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,void intel_hpd_init (struct drm_i915_private *dev_priv);void intel_hpd_init_work (struct drm_i915_private *dev_priv);void intel_hpd_cancel_work (struct drm_i915_private *dev_priv); -enum port intel_hpd_pin_to_port (enum hpd_pin pin); -enum hpd_pin intel_hpd_pin (enum port port); +enum port intel_hpd_pin_to_port (struct drm_i915_private *dev_priv, +enum hpd_pin pin); +enum hpd_pin intel_hpd_pin_default (struct drm_i915_private *dev_priv, +enum port port);bool intel_hpd_disable (struct drm_i915_private *dev_priv,enum hpd_pin pin);void intel_hpd_enable (struct drm_i915_private *dev_priv,enum hpd_pin pin);
drivers/gpu/drm/i915/i915_irq.c +19 -16
@@ -1568,10 +1568,11 @@ static bool i9xx_port_hotplug_long_detect(enum port port, u32 val)* * Note that the caller is expected to zero out the masks initially. */ -static void intel_get_hpd_pins (u32 *pin_mask,u32 *long_mask, -u32 hotplug_trigger,u32 dig_hotplug_reg, -const u32 hpd[HPD_NUM_PINS ], -bool long_pulse_detect (enum port port,u32 val)) +static void intel_get_hpd_pins (struct drm_i915_private *dev_priv, +u32 *pin_mask,u32 *long_mask, +u32 hotplug_trigger,u32 dig_hotplug_reg, +const u32 hpd[HPD_NUM_PINS ], +bool long_pulse_detect (enum port port,u32 val)) {enum port port;int i;
@@ -1582,7 +1583,7 @@ static void intel_get_hpd_pins(u32 *pin_mask, u32 *long_mask, *pin_mask |=BIT (i); - port =intel_hpd_pin_to_port (i); + port =intel_hpd_pin_to_port (dev_priv, i);if (port ==PORT_NONE )continue ;
@@ -1970,8 +1971,9 @@ static void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv,u32 hotplug_trigger = hotplug_status &HOTPLUG_INT_STATUS_G4X ;if (hotplug_trigger) { -intel_get_hpd_pins (&pin_mask, &long_mask, hotplug_trigger, - hotplug_trigger, hpd_status_g4x, +intel_get_hpd_pins (dev_priv, &pin_mask, &long_mask, + hotplug_trigger, hotplug_trigger, + hpd_status_g4x, i9xx_port_hotplug_long_detect);intel_hpd_irq_handler (dev_priv, pin_mask, long_mask);
@@ -1983,8 +1985,9 @@ static void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv,u32 hotplug_trigger = hotplug_status &HOTPLUG_INT_STATUS_I915 ;if (hotplug_trigger) { -intel_get_hpd_pins (&pin_mask, &long_mask, hotplug_trigger, - hotplug_trigger, hpd_status_i915, +intel_get_hpd_pins (dev_priv, &pin_mask, &long_mask, + hotplug_trigger, hotplug_trigger, + hpd_status_i915, i9xx_port_hotplug_long_detect);intel_hpd_irq_handler (dev_priv, pin_mask, long_mask); }
@@ -2185,7 +2188,7 @@ static void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv,if (!hotplug_trigger)return ; -intel_get_hpd_pins (&pin_mask, &long_mask, hotplug_trigger, +intel_get_hpd_pins (dev_priv, &pin_mask, &long_mask, hotplug_trigger, dig_hotplug_reg, hpd, pch_port_hotplug_long_detect);
@@ -2327,8 +2330,8 @@ static void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) dig_hotplug_reg =I915_READ (PCH_PORT_HOTPLUG );I915_WRITE (PCH_PORT_HOTPLUG , dig_hotplug_reg); -intel_get_hpd_pins (&pin_mask, &long_mask, hotplug_trigger, - dig_hotplug_reg, hpd_spt, +intel_get_hpd_pins (dev_priv, &pin_mask, &long_mask, + hotplug_trigger, dig_hotplug_reg, hpd_spt, spt_port_hotplug_long_detect); }
@@ -2338,8 +2341,8 @@ static void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir) dig_hotplug_reg =I915_READ (PCH_PORT_HOTPLUG2 );I915_WRITE (PCH_PORT_HOTPLUG2 , dig_hotplug_reg); -intel_get_hpd_pins (&pin_mask, &long_mask, hotplug2_trigger, - dig_hotplug_reg, hpd_spt, +intel_get_hpd_pins (dev_priv, &pin_mask, &long_mask, + hotplug2_trigger, dig_hotplug_reg, hpd_spt, spt_port_hotplug2_long_detect); }
@@ -2359,7 +2362,7 @@ static void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, dig_hotplug_reg =I915_READ (DIGITAL_PORT_HOTPLUG_CNTRL );I915_WRITE (DIGITAL_PORT_HOTPLUG_CNTRL , dig_hotplug_reg); -intel_get_hpd_pins (&pin_mask, &long_mask, hotplug_trigger, +intel_get_hpd_pins (dev_priv, &pin_mask, &long_mask, hotplug_trigger, dig_hotplug_reg, hpd, ilk_port_hotplug_long_detect);
@@ -2536,7 +2539,7 @@ static void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, dig_hotplug_reg =I915_READ (PCH_PORT_HOTPLUG );I915_WRITE (PCH_PORT_HOTPLUG , dig_hotplug_reg); -intel_get_hpd_pins (&pin_mask, &long_mask, hotplug_trigger, +intel_get_hpd_pins (dev_priv, &pin_mask, &long_mask, hotplug_trigger, dig_hotplug_reg, hpd, bxt_port_hotplug_long_detect);
drivers/gpu/drm/i915/intel_dp.c +3 -1
@@ -5973,8 +5973,10 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port) {struct intel_encoder *encoder = &intel_dig_port->base;struct intel_dp *intel_dp = &intel_dig_port->dp; +struct intel_encoder *intel_encoder = &intel_dig_port->base; +struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev); - encoder->hpd_pin =intel_hpd_pin (encoder->port); + encoder->hpd_pin =intel_hpd_pin_default (dev_priv, encoder->port);switch (encoder->port) {case PORT_A :
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -2047,7 +2047,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,if (WARN_ON (port ==PORT_A ))return ; - intel_encoder->hpd_pin =intel_hpd_pin (port); + intel_encoder->hpd_pin =intel_hpd_pin_default (dev_priv, port);if (HAS_DDI (dev_priv)) intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
drivers/gpu/drm/i915/intel_hotplug.c +15 -4
@@ -78,12 +78,14 @@/** * intel_hpd_port - return port hard associated with certain pin. +* @dev_priv: private driver data pointer * @pin: the hpd pin to get associated port * * Return port that is associatade with @pin and PORT_NONE if no port is * hard associated with that @pin. */ -enum port intel_hpd_pin_to_port (enum hpd_pin pin) +enum port intel_hpd_pin_to_port (struct drm_i915_private *dev_priv, +enum hpd_pin pin) {switch (pin) {case HPD_PORT_A :
@@ -95,6 +97,8 @@ enum port intel_hpd_pin_to_port(enum hpd_pin pin)case HPD_PORT_D :return PORT_D ;case HPD_PORT_E : +if (IS_CNL_WITH_PORT_F (dev_priv)) +return PORT_F ;return PORT_E ;default :return PORT_NONE ;/* no port for this pin */
@@ -102,13 +106,17 @@ enum port intel_hpd_pin_to_port(enum hpd_pin pin) }/** -* intel_hpd_pin - return pin hard associated with certain port. +* intel_hpd_pin_default - return default pin associated with certain port. +* @dev_priv: private driver data pointer * @port: the hpd port to get associated pin * +* It is only valid and used by digital port encoder. +* * Return pin that is associatade with @port and HDP_NONE if no pin is * hard associated with that @port. */ -enum hpd_pin intel_hpd_pin (enum port port) +enum hpd_pin intel_hpd_pin_default (struct drm_i915_private *dev_priv, +enum port port) {switch (port) {case PORT_A :
@@ -121,6 +129,9 @@ enum hpd_pin intel_hpd_pin(enum port port)return HPD_PORT_D ;case PORT_E :return HPD_PORT_E ; +case PORT_F : +if (IS_CNL_WITH_PORT_F (dev_priv)) +return HPD_PORT_E ;default :MISSING_CASE (port);return HPD_NONE ;
@@ -417,7 +428,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,if (!(BIT (i) & pin_mask))continue ; - port =intel_hpd_pin_to_port (i); + port =intel_hpd_pin_to_port (dev_priv, i); is_dig_port = port !=PORT_NONE && dev_priv->hotplug.irq_port[port];
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 9/11 drm/i915/cnl: Enable DDI-F on Cannonlake.
In reply to Rodrigo ViviNow let's finish the Port-F support by adding the proper port F detection, irq and power well support.
v2: Rebase
v3: Use BIT_ULL
v4: Cover missed case on ddi init.
v5: Update commit message.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ddi.c | 4 ++++ drivers/gpu/drm/i915/intel_display.c | 6 +++++- drivers/gpu/drm/i915/intel_runtime_pm.c | 13 +++++++++++++ 5 files changed, 26 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -382,11 +382,13 @@ enum intel_display_power_domain {POWER_DOMAIN_PORT_DDI_C_LANES ,POWER_DOMAIN_PORT_DDI_D_LANES ,POWER_DOMAIN_PORT_DDI_E_LANES , +POWER_DOMAIN_PORT_DDI_F_LANES ,POWER_DOMAIN_PORT_DDI_A_IO ,POWER_DOMAIN_PORT_DDI_B_IO ,POWER_DOMAIN_PORT_DDI_C_IO ,POWER_DOMAIN_PORT_DDI_D_IO ,POWER_DOMAIN_PORT_DDI_E_IO , +POWER_DOMAIN_PORT_DDI_F_IO ,POWER_DOMAIN_PORT_DSI ,POWER_DOMAIN_PORT_CRT , POWER_DOMAIN_PORT_OTHER,
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -1304,6 +1304,7 @@ enum i915_power_well_id {SKL_DISP_PW_DDI_B ,SKL_DISP_PW_DDI_C ,SKL_DISP_PW_DDI_D , +CNL_DISP_PW_DDI_F =6 ,GLK_DISP_PW_AUX_A =8 , GLK_DISP_PW_AUX_B,
@@ -8764,6 +8765,7 @@ enum skl_power_gate {#define SFUSE_STRAP_RAW_FREQUENCY (1<<8)#define SFUSE_STRAP_DISPLAY_DISABLED (1<<7)#define SFUSE_STRAP_CRT_DISABLED (1<<6) +#define SFUSE_STRAP_DDIF_DETECTED (1<<3)#define SFUSE_STRAP_DDIB_DETECTED (1<<2)#define SFUSE_STRAP_DDIC_DETECTED (1<<1)#define SFUSE_STRAP_DDID_DETECTED (1<<0)
drivers/gpu/drm/i915/intel_ddi.c +4 -0
@@ -2868,6 +2868,10 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) intel_dig_port->ddi_io_power_domain =POWER_DOMAIN_PORT_DDI_E_IO ;break ; +case PORT_F : + intel_dig_port->ddi_io_power_domain = +POWER_DOMAIN_PORT_DDI_F_IO ; +break ;default :MISSING_CASE (port); }
drivers/gpu/drm/i915/intel_display.c +5 -1
@@ -5641,6 +5641,8 @@ enum intel_display_power_domain intel_port_to_power_domain(enum port port)return POWER_DOMAIN_PORT_DDI_D_LANES ;case PORT_E :return POWER_DOMAIN_PORT_DDI_E_LANES ; +case PORT_F : +return POWER_DOMAIN_PORT_DDI_F_LANES ;default :MISSING_CASE (port);return POWER_DOMAIN_PORT_OTHER ;
@@ -13593,7 +13595,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)if (found ||IS_GEN9_BC (dev_priv))intel_ddi_init (dev_priv,PORT_A ); -/* DDI B, C and D detection is indicated by the SFUSE_STRAP +/* DDI B, C, D, and F detection is indicated by the SFUSE_STRAP * register */ found =I915_READ (SFUSE_STRAP );
@@ -13603,6 +13605,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)intel_ddi_init (dev_priv,PORT_C );if (found &SFUSE_STRAP_DDID_DETECTED )intel_ddi_init (dev_priv,PORT_D ); +if (found &SFUSE_STRAP_DDIF_DETECTED ) +intel_ddi_init (dev_priv,PORT_F );/* * On SKL we don't have a way to detect DDI-E so we rely on VBT. */
drivers/gpu/drm/i915/intel_runtime_pm.c +13 -0
@@ -94,6 +94,8 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "PORT_DDI_D_LANES" ;case POWER_DOMAIN_PORT_DDI_E_LANES :return "PORT_DDI_E_LANES" ; +case POWER_DOMAIN_PORT_DDI_F_LANES : +return "PORT_DDI_F_LANES" ;case POWER_DOMAIN_PORT_DDI_A_IO :return "PORT_DDI_A_IO" ;case POWER_DOMAIN_PORT_DDI_B_IO :
@@ -104,6 +106,8 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "PORT_DDI_D_IO" ;case POWER_DOMAIN_PORT_DDI_E_IO :return "PORT_DDI_E_IO" ; +case POWER_DOMAIN_PORT_DDI_F_IO : +return "PORT_DDI_F_IO" ;case POWER_DOMAIN_PORT_DSI :return "PORT_DSI" ;case POWER_DOMAIN_PORT_CRT :
@@ -1840,6 +1844,9 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,#define CNL_DISPLAY_AUX_F_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_F) | \ BIT_ULL(POWER_DOMAIN_INIT)) +#define CNL_DISPLAY_DDI_F_IO_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_F_IO) | \ + BIT_ULL(POWER_DOMAIN_INIT))#define CNL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ CNL_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ BIT_ULL(POWER_DOMAIN_MODESET) | \
@@ -2390,6 +2397,12 @@ static struct i915_power_well cnl_power_wells[] = { .id = SKL_DISP_PW_DDI_D, }, { + .name = "DDI F IO power well", + .domains = CNL_DISPLAY_DDI_F_IO_POWER_DOMAINS, + .ops = &hsw_power_well_ops, + .id = CNL_DISP_PW_DDI_F, + }, + { .name = "AUX F", .domains = CNL_DISPLAY_AUX_F_POWER_DOMAINS, .ops = &hsw_power_well_ops,
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 10/11 drm/i915/cnl: Fix DP max rate for Cannonlake with port F.
In reply to Rodrigo ViviOn CNL SKUs that uses port F, max DP rate is 8.1G for all ports when we have the elevated voltage.
v2: Make commit message more generic.
--- drivers/gpu/drm/i915/intel_dp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -2
@@ -238,8 +238,9 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) source_rates = cnl_rates; size =ARRAY_SIZE (cnl_rates); voltage =I915_READ (CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ; -if (port ==PORT_A || port ==PORT_D || - voltage ==VOLTAGE_INFO_0_85V ) +if (voltage ==VOLTAGE_INFO_0_85V || + (!IS_CNL_WITH_PORT_F (dev_priv) && (port ==PORT_A || + port ==PORT_D ))) size -=2 ; }else if (IS_GEN9_BC (dev_priv)) { source_rates = skl_rates;
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 11/11 drm/i915/cnl: Don't try to manage Port F power wells on all CNL.
In reply to Rodrigo ViviSKUs that lacks on the full port F split will just time out when touching this power well bits, causing a noisy warn.
This macro style is a deviation from the original definition in use for other platforms, but it at least avoid code duplication. Other smart alternatives like providing a joint list was also considered but it would require some extra memory handling that would be a deviation from the original simplistic definitions here anyways, plus requiring extra tests and possibly creating some corner cases for one single platform. So let's move with the simplest and safest approach.
--- drivers/gpu/drm/i915/intel_runtime_pm.c | 177 +++++++++++++++++--------------- 1 file changed, 94 insertions(+), 83 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +94 -83
@@ -2313,89 +2313,96 @@ static struct i915_power_well glk_power_wells[] = { }, }; +#define basic_cnl_power_wells \ + { \ + .name = "always-on", \ + .always_on = 1, \ + .domains = POWER_DOMAIN_MASK, \ + .ops = &i9xx_always_on_power_well_ops, \ + .id = I915_DISP_PW_ALWAYS_ON, \ + }, \ + { \ + .name = "power well 1", \ + /* Handled by the DMC firmware */ \ + .domains = 0, \ + .ops = &hsw_power_well_ops, \ + .id = SKL_DISP_PW_1, \ + { \ + .hsw.has_fuses = true, \ + }, \ + }, \ + { \ + .name = "AUX A", \ + .domains = CNL_DISPLAY_AUX_A_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = CNL_DISP_PW_AUX_A, \ + }, \ + { \ + .name = "AUX B", \ + .domains = CNL_DISPLAY_AUX_B_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = CNL_DISP_PW_AUX_B, \ + }, \ + { \ + .name = "AUX C", \ + .domains = CNL_DISPLAY_AUX_C_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = CNL_DISP_PW_AUX_C, \ + }, \ + { \ + .name = "AUX D", \ + .domains = CNL_DISPLAY_AUX_D_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = CNL_DISP_PW_AUX_D, \ + }, \ + { \ + .name = "DC off", \ + .domains = CNL_DISPLAY_DC_OFF_POWER_DOMAINS, \ + .ops = &gen9_dc_off_power_well_ops, \ + .id = SKL_DISP_PW_DC_OFF, \ + }, \ + { \ + .name = "power well 2", \ + .domains = CNL_DISPLAY_POWERWELL_2_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = SKL_DISP_PW_2, \ + { \ + .hsw.irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), \ + .hsw.has_vga = true, \ + .hsw.has_fuses = true, \ + }, \ + }, \ + { \ + .name = "DDI A IO power well", \ + .domains = CNL_DISPLAY_DDI_A_IO_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = CNL_DISP_PW_DDI_A, \ + }, \ + { \ + .name = "DDI B IO power well", \ + .domains = CNL_DISPLAY_DDI_B_IO_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = SKL_DISP_PW_DDI_B, \ + }, \ + { \ + .name = "DDI C IO power well", \ + .domains = CNL_DISPLAY_DDI_C_IO_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = SKL_DISP_PW_DDI_C, \ + }, \ + { \ + .name = "DDI D IO power well", \ + .domains = CNL_DISPLAY_DDI_D_IO_POWER_DOMAINS, \ + .ops = &hsw_power_well_ops, \ + .id = SKL_DISP_PW_DDI_D, \ + } +static struct i915_power_well cnl_power_wells[] = { - { - .name ="always-on" , - .always_on =1 , - .domains =POWER_DOMAIN_MASK , - .ops = &i9xx_always_on_power_well_ops, - .id =I915_DISP_PW_ALWAYS_ON , - }, - { - .name ="power well 1" , -/* Handled by the DMC firmware */ - .domains =0 , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_1 , - { - .hsw.has_fuses = true, - }, - }, - { - .name ="AUX A" , - .domains =CNL_DISPLAY_AUX_A_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =CNL_DISP_PW_AUX_A , - }, - { - .name ="AUX B" , - .domains =CNL_DISPLAY_AUX_B_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =CNL_DISP_PW_AUX_B , - }, - { - .name ="AUX C" , - .domains =CNL_DISPLAY_AUX_C_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =CNL_DISP_PW_AUX_C , - }, - { - .name ="AUX D" , - .domains =CNL_DISPLAY_AUX_D_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =CNL_DISP_PW_AUX_D , - }, - { - .name ="DC off" , - .domains =CNL_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_PW_DC_OFF , - }, - { - .name ="power well 2" , - .domains =CNL_DISPLAY_POWERWELL_2_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_2 , - { - .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), - .hsw.has_vga = true, - .hsw.has_fuses = true, - }, - }, - { - .name ="DDI A IO power well" , - .domains =CNL_DISPLAY_DDI_A_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =CNL_DISP_PW_DDI_A , - }, - { - .name ="DDI B IO power well" , - .domains =CNL_DISPLAY_DDI_B_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_DDI_B , - }, - { - .name ="DDI C IO power well" , - .domains =CNL_DISPLAY_DDI_C_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_DDI_C , - }, - { - .name ="DDI D IO power well" , - .domains =CNL_DISPLAY_DDI_D_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_DDI_D , - }, + basic_cnl_power_wells, +}; + +static struct i915_power_well cnl_power_wells_with_port_f[] = { + basic_cnl_power_wells, { .name ="DDI F IO power well" , .domains =CNL_DISPLAY_DDI_F_IO_POWER_DOMAINS ,
@@ -2522,7 +2529,11 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) }else if (IS_GEN9_BC (dev_priv)) {set_power_wells (power_domains, skl_power_wells); }else if (IS_CANNONLAKE (dev_priv)) { -set_power_wells (power_domains, cnl_power_wells); +if (IS_CNL_WITH_PORT_F (dev_priv)) +set_power_wells (power_domains, + cnl_power_wells_with_port_f); +else +set_power_wells (power_domains, cnl_power_wells); }else if (IS_BROXTON (dev_priv)) {set_power_wells (power_domains, bxt_power_wells); }else if (IS_GEMINILAKE (dev_priv)) {
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [01/11] drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [01/11] drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
URL : https://patchwork.freedesktop.org/series/35744/
State : failure
== Summary ==
Applying: drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
Applying: drm/i915/cnl: Add Port F definition.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Patch failed at 0002 drm/i915/cnl: Add Port F definition. The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: ✗ Fi.CI.BAT: failure for series starting with [01/11] drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
Quoted 6 lines · Patchwork
== Series Details ==
Series: series starting with [01/11] drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
URL : https://patchwork.freedesktop.org/series/35744/
State : failure
Quoted 7 lines
== Summary ==
Applying: drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
Applying: drm/i915/cnl: Add Port F definition.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
Mdrivers/gpu/drm/i915/i915_drv.h
Duh! I knew this conflict was comming,
I acked the header changes, I tagged it this morning,
but I forgot to rebase my patches from yesterday to today's drm-tip :/
Quoted 9 lines
Falling back to patching base and 3-way merge... Auto-merging
drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict indrivers/gpu/drm/i915/i915_drv.hPatch failed at 0002 drm/i915/cnl: Add Port F definition. The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx