drm/i915/display: bunch of struct intel_display conversions
cover drm/i915/display: bunch of struct intel_display conversions
Convert a random bunch of files over to struct intel_display.
Jani Nikula (11):
drm/i915/gmbus: convert to struct intel_display drm/i915/cx0: convert to struct intel_display drm/i915/dpio: convert to struct intel_display drm/i915/hdcp: further conversion to struct intel_display drm/i915/dp/hdcp: convert to struct intel_display drm/i915/crt: convert to struct intel_display drm/i915/display: convert vlv_wait_port_ready() to struct
intel_display
drm/i915/power: convert assert_chv_phy_status() to struct
intel_display
drm/i915/ips: convert to struct intel_display drm/i915/dsi: convert to struct intel_display drm/i915/de: remove unnecessary generic wrappers
drivers/gpu/drm/i915/display/g4x_dp.c | 3 +- drivers/gpu/drm/i915/display/g4x_hdmi.c | 9 +- drivers/gpu/drm/i915/display/hsw_ips.c | 47 +- drivers/gpu/drm/i915/display/icl_dsi.c | 444 +++++++++--------- drivers/gpu/drm/i915/display/icl_dsi.h | 4 +- drivers/gpu/drm/i915/display/intel_bios.c | 6 +- drivers/gpu/drm/i915/display/intel_crt.c | 211 +++++---- drivers/gpu/drm/i915/display/intel_crt.h | 10 +- drivers/gpu/drm/i915/display/intel_cx0_phy.c | 308 ++++++------ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- drivers/gpu/drm/i915/display/intel_de.h | 46 +- drivers/gpu/drm/i915/display/intel_display.c | 30 +- drivers/gpu/drm/i915/display/intel_display.h | 2 +- .../drm/i915/display/intel_display_driver.c | 11 +- .../gpu/drm/i915/display/intel_display_irq.c | 11 +- .../i915/display/intel_display_power_well.c | 114 +++-- drivers/gpu/drm/i915/display/intel_dp.c | 3 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 93 ++-- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 158 +++---- drivers/gpu/drm/i915/display/intel_dpio_phy.h | 22 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 6 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 5 +- drivers/gpu/drm/i915/display/intel_dvo.c | 8 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 290 ++++++------ drivers/gpu/drm/i915/display/intel_gmbus.h | 15 +- .../gpu/drm/i915/display/intel_gmbus_regs.h | 16 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 30 +- drivers/gpu/drm/i915/display/intel_hdcp.h | 10 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 11 +- .../gpu/drm/i915/display/intel_hotplug_irq.c | 6 +- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- .../gpu/drm/i915/display/intel_pch_display.c | 3 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 9 +- drivers/gpu/drm/i915/i915_suspend.c | 2 +- drivers/gpu/drm/xe/display/xe_display.c | 4 +- 36 files changed, 1011 insertions(+), 948 deletions(-)
Signature · 1 line
2.39.5
PATCH 1/11 drm/i915/gmbus: convert to struct intel_display
struct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch gmbus code over to it.
--- drivers/gpu/drm/i915/display/intel_bios.c | 6 +- drivers/gpu/drm/i915/display/intel_crt.c | 6 +- .../drm/i915/display/intel_display_driver.c | 4 +- .../gpu/drm/i915/display/intel_display_irq.c | 11 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 5 +- drivers/gpu/drm/i915/display/intel_dvo.c | 8 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 290 +++++++++--------- drivers/gpu/drm/i915/display/intel_gmbus.h | 15 +- .../gpu/drm/i915/display/intel_gmbus_regs.h | 16 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 8 +- .../gpu/drm/i915/display/intel_hotplug_irq.c | 6 +- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 9 +- drivers/gpu/drm/i915/i915_suspend.c | 2 +- 14 files changed, 202 insertions(+), 186 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.c +2 -4
@@ -2796,7 +2796,6 @@ static bool child_device_size_valid(struct intel_display *display, int size)static void parse_general_definitions (struct intel_display *display) { -struct drm_i915_private *i915 =to_i915 (display->drm);const struct bdb_general_definitions *defs;struct intel_bios_encoder_data *devdata;const struct child_device_config *child;
@@ -2821,7 +2820,7 @@ parse_general_definitions(struct intel_display *display) bus_pin = defs->crt_ddc_gmbus_pin;drm_dbg_kms (display->drm,"crt_ddc_bus_pin: %d\n" , bus_pin); -if (intel_gmbus_is_valid_pin (i915, bus_pin)) +if (intel_gmbus_is_valid_pin (display, bus_pin)) display->vbt.crt_ddc_pin = bus_pin;if (!child_device_size_valid (display, defs->child_dev_size))
@@ -3338,7 +3337,6 @@ bool intel_bios_is_tv_present(struct intel_display *display)*/ bool intel_bios_is_lvds_present (struct intel_display *display,u8 *i2c_pin) { -struct drm_i915_private *i915 =to_i915 (display->drm);const struct intel_bios_encoder_data *devdata;if (list_empty (&display->vbt.display_devices))
@@ -3355,7 +3353,7 @@ bool intel_bios_is_lvds_present(struct intel_display *display, u8 *i2c_pin) child->device_type != DEVICE_TYPE_LFP)continue ; -if (intel_gmbus_is_valid_pin (i915, child->i2c_pin)) +if (intel_gmbus_is_valid_pin (display, child->i2c_pin)) *i2c_pin = child->i2c_pin;/* However, we cannot trust the BIOS writers to populate
drivers/gpu/drm/i915/display/intel_crt.c +4 -2
@@ -935,6 +935,7 @@ intel_crt_detect(struct drm_connector *connector,static int intel_crt_get_modes (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));
@@ -954,7 +955,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) goto out;/* Try to probe digital port for output in DVI-I -> VGA mode. */ - ddc =intel_gmbus_get_adapter (dev_priv,GMBUS_PIN_DPB ); + ddc =intel_gmbus_get_adapter (display,GMBUS_PIN_DPB ); ret =intel_crt_ddc_get_modes (connector, ddc); out:
@@ -1009,6 +1010,7 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = {void intel_crt_init (struct drm_i915_private *dev_priv) { +struct intel_display *display = &dev_priv->display;struct drm_connector *connector;struct intel_crt *crt;struct intel_connector *intel_connector;
@@ -1057,7 +1059,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)drm_connector_init_with_ddc (&dev_priv->drm, connector, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA , -intel_gmbus_get_adapter (dev_priv, ddc_pin)); +intel_gmbus_get_adapter (display, ddc_pin));drm_encoder_init (&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs,DRM_MODE_ENCODER_DAC ,"CRT" );
drivers/gpu/drm/i915/display/intel_display_driver.c +2 -2
@@ -432,7 +432,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)intel_pps_setup (display); -intel_gmbus_setup (i915); +intel_gmbus_setup (display); drm_dbg_kms(&i915->drm, "%d display pipe%s available.\n", INTEL_NUM_PIPES(i915),
@@ -608,7 +608,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)intel_overlay_cleanup (i915); -intel_gmbus_teardown (i915); +intel_gmbus_teardown (display);destroy_workqueue (i915->display.wq.flip);destroy_workqueue (i915->display.wq.modeset);
drivers/gpu/drm/i915/display/intel_display_irq.c +6 -5
@@ -543,12 +543,13 @@ void i965_pipestat_irq_handler(struct drm_i915_private *dev_priv,intel_opregion_asle_intr (display);if (pipe_stats[0 ] &PIPE_GMBUS_INTERRUPT_STATUS ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }void valleyview_pipestat_irq_handler (struct drm_i915_private *dev_priv,u32 pipe_stats[I915_MAX_PIPES ]) { +struct intel_display *display = &dev_priv->display;enum pipe pipe;for_each_pipe (dev_priv, pipe) {
@@ -566,7 +567,7 @@ void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv, }if (pipe_stats[0 ] &PIPE_GMBUS_INTERRUPT_STATUS ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }static void ibx_irq_handler (struct drm_i915_private *dev_priv,u32 pch_iir)
@@ -588,7 +589,7 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_dp_aux_irq_handler (display);if (pch_iir &SDE_GMBUS ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display);if (pch_iir &SDE_AUDIO_HDCP_MASK )drm_dbg (&dev_priv->drm,"PCH HDCP audio interrupt\n" );
@@ -677,7 +678,7 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_dp_aux_irq_handler (display);if (pch_iir &SDE_GMBUS_CPT ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display);if (pch_iir &SDE_AUDIO_CP_REQ_CPT )drm_dbg (&dev_priv->drm,"Audio CP request interrupt\n" );
@@ -1109,7 +1110,7 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)if ((IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) && (iir &BXT_DE_PORT_GMBUS )) { -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); found = true; }
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +3 -2
@@ -323,6 +323,7 @@ enum {static void icl_native_gpio_set_value (struct drm_i915_private *dev_priv,int gpio,bool value) { +struct intel_display *display = &dev_priv->display;int index;if (drm_WARN_ON (&dev_priv->drm,DISPLAY_VER (dev_priv) ==11 && gpio >=MIPI_RESET_2 ))
@@ -367,7 +368,7 @@ static void icl_native_gpio_set_value(struct drm_i915_private *dev_priv,case MIPI_AVEE_EN_2 : index = gpio ==MIPI_AVEE_EN_1 ?1 :2 ; -intel_de_rmw (dev_priv,GPIO (dev_priv, index), +intel_de_rmw (display,GPIO (display, index),GPIO_CLOCK_VAL_OUT ,GPIO_CLOCK_DIR_MASK |GPIO_CLOCK_DIR_OUT |GPIO_CLOCK_VAL_MASK | (value ?GPIO_CLOCK_VAL_OUT :0 ));
@@ -376,7 +377,7 @@ static void icl_native_gpio_set_value(struct drm_i915_private *dev_priv,case MIPI_VIO_EN_2 : index = gpio ==MIPI_VIO_EN_1 ?1 :2 ; -intel_de_rmw (dev_priv,GPIO (dev_priv, index), +intel_de_rmw (display,GPIO (display, index),GPIO_DATA_VAL_OUT ,GPIO_DATA_DIR_MASK |GPIO_DATA_DIR_OUT |GPIO_DATA_VAL_MASK | (value ?GPIO_DATA_VAL_OUT :0 ));
drivers/gpu/drm/i915/display/intel_dvo.c +5 -3
@@ -417,6 +417,7 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,struct intel_dvo *intel_dvo, const struct intel_dvo_device *dvo) { + struct intel_display *display = &dev_priv->display;struct i2c_adapter *i2c;u32 dpll[I915_MAX_PIPES ];enum pipe pipe;
@@ -428,7 +429,7 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,* special cases, but otherwise default to what's defined * in the spec. */ -if (intel_gmbus_is_valid_pin (dev_priv, dvo->gpio)) +if (intel_gmbus_is_valid_pin (display, dvo->gpio)) gpio = dvo->gpio;else if (dvo->type ==INTEL_DVO_CHIP_LVDS ) gpio =GMBUS_PIN_SSC ;
@@ -440,7 +441,7 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,* It appears that everything is on GPIOE except for panels * on i830 laptops, which are on GPIOB (DVOA). */ - i2c =intel_gmbus_get_adapter (dev_priv, gpio); + i2c =intel_gmbus_get_adapter (display, gpio); intel_dvo->dev = *dvo;
@@ -489,6 +490,7 @@ static bool intel_dvo_probe(struct drm_i915_private *i915,void intel_dvo_init (struct drm_i915_private *i915) { +struct intel_display *display = &i915->display;struct intel_connector *connector;struct intel_encoder *encoder;struct intel_dvo *intel_dvo;
@@ -549,7 +551,7 @@ void intel_dvo_init(struct drm_i915_private *i915)drm_connector_init_with_ddc (&i915->drm, &connector->base, &intel_dvo_connector_funcs,intel_dvo_connector_type (&intel_dvo->dev), -intel_gmbus_get_adapter (i915,GMBUS_PIN_DPC )); +intel_gmbus_get_adapter (display,GMBUS_PIN_DPC ));drm_connector_helper_add (&connector->base, &intel_dvo_connector_helper_funcs);
drivers/gpu/drm/i915/display/intel_gmbus.c +151 -139
756 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_gmbus.h +7 -8
@@ -8,8 +8,8 @@#include <linux/types.h> -struct drm_i915_private ;struct i2c_adapter ; +struct intel_display ;#define GMBUS_PIN_DISABLED 0#define GMBUS_PIN_SSC 1
@@ -34,18 +34,17 @@ struct i2c_adapter;#define GMBUS_NUM_PINS 15/* including 0 */ -int intel_gmbus_setup (struct drm_i915_private *dev_priv); -void intel_gmbus_teardown (struct drm_i915_private *dev_priv); -bool intel_gmbus_is_valid_pin (struct drm_i915_private *dev_priv, -unsigned int pin); +int intel_gmbus_setup (struct intel_display *display); +void intel_gmbus_teardown (struct intel_display *display); +bool intel_gmbus_is_valid_pin (struct intel_display *display,unsigned int pin);int intel_gmbus_output_aksv (struct i2c_adapter *adapter);struct i2c_adapter * -intel_gmbus_get_adapter (struct drm_i915_private *dev_priv,unsigned int pin); +intel_gmbus_get_adapter (struct intel_display *display,unsigned int pin);void intel_gmbus_force_bit (struct i2c_adapter *adapter,bool force_bit);bool intel_gmbus_is_forced_bit (struct i2c_adapter *adapter); -void intel_gmbus_reset (struct drm_i915_private *dev_priv); +void intel_gmbus_reset (struct intel_display *display); -void intel_gmbus_irq_handler (struct drm_i915_private *i915); +void intel_gmbus_irq_handler (struct intel_display *display);#endif /* __INTEL_GMBUS_H__ */
drivers/gpu/drm/i915/display/intel_gmbus_regs.h +8 -8
@@ -8,9 +8,9 @@#include "i915_reg_defs.h" -#define GMBUS_MMIO_BASE (__i915) ((__i915)->display.gmbus.mmio_base) +#define __GMBUS_MMIO_BASE (__display) ((__display)->gmbus.mmio_base) -#define GPIO (__i915, gpio) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5010 + 4 * (gpio)) +#define GPIO (__display, gpio) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5010 + 4 * (gpio))#define GPIO_CLOCK_DIR_MASK (1 << 0)#define GPIO_CLOCK_DIR_IN (0 << 1)#define GPIO_CLOCK_DIR_OUT (1 << 1)
@@ -27,7 +27,7 @@#define GPIO_DATA_PULLUP_DISABLE (1 << 13)/* clock/port select */ -#define GMBUS0 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5100) +#define GMBUS0 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5100)#define GMBUS_AKSV_SELECT (1 << 11)#define GMBUS_RATE_100KHZ (0 << 8)#define GMBUS_RATE_50KHZ (1 << 8)
@@ -37,7 +37,7 @@#define GMBUS_BYTE_CNT_OVERRIDE (1 << 6)/* command/status */ -#define GMBUS1 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5104) +#define GMBUS1 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5104)#define GMBUS_SW_CLR_INT (1 << 31)#define GMBUS_SW_RDY (1 << 30)#define GMBUS_ENT (1 << 29)/* enable timeout */
@@ -54,7 +54,7 @@#define GMBUS_SLAVE_WRITE (0 << 0)/* status */ -#define GMBUS2 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5108) +#define GMBUS2 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5108)#define GMBUS_INUSE (1 << 15)#define GMBUS_HW_WAIT_PHASE (1 << 14)#define GMBUS_STALL_TIMEOUT (1 << 13)
@@ -64,10 +64,10 @@#define GMBUS_ACTIVE (1 << 9)/* data buffer bytes 3-0 */ -#define GMBUS3 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x510c) +#define GMBUS3 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x510c)/* interrupt mask (Pineview+) */ -#define GMBUS4 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5110) +#define GMBUS4 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5110)#define GMBUS_SLAVE_TIMEOUT_EN (1 << 4)#define GMBUS_NAK_EN (1 << 3)#define GMBUS_IDLE_EN (1 << 2)
@@ -75,7 +75,7 @@#define GMBUS_HW_RDY_EN (1 << 0)/* byte index */ -#define GMBUS5 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5120) +#define GMBUS5 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5120)#define GMBUS_2BYTE_INDEX_EN (1 << 31)#endif /* __INTEL_GMBUS_REGS_H__ */
drivers/gpu/drm/i915/display/intel_hdmi.c +3 -5
@@ -2917,7 +2917,6 @@ static struct intel_encoder * get_encoder_by_ddc_pin(struct intel_encoder *encoder, u8 ddc_pin) {struct intel_display *display =to_intel_display (encoder); -struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_encoder *other;for_each_intel_encoder (display->drm, other) {
@@ -2931,7 +2930,7 @@ get_encoder_by_ddc_pin(struct intel_encoder *encoder, u8 ddc_pin) connector =enc_to_dig_port (other)->hdmi.attached_connector; -if (connector && connector->base.ddc ==intel_gmbus_get_adapter (i915, ddc_pin)) +if (connector && connector->base.ddc ==intel_gmbus_get_adapter (display, ddc_pin))return other; }
@@ -2941,7 +2940,6 @@ get_encoder_by_ddc_pin(struct intel_encoder *encoder, u8 ddc_pin)static u8 intel_hdmi_ddc_pin (struct intel_encoder *encoder) {struct intel_display *display =to_intel_display (encoder); -struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_encoder *other;const char *source;u8 ddc_pin;
@@ -2954,7 +2952,7 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder) source ="platform default" ; } -if (!intel_gmbus_is_valid_pin (i915, ddc_pin)) { +if (!intel_gmbus_is_valid_pin (display, ddc_pin)) {drm_dbg_kms (display->drm,"[ENCODER:%d:%s] Invalid DDC pin %d\n" , encoder->base.base.id, encoder->base.name, ddc_pin);
@@ -3052,7 +3050,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,drm_connector_init_with_ddc (dev, connector, &intel_hdmi_connector_funcs,DRM_MODE_CONNECTOR_HDMIA , -intel_gmbus_get_adapter (dev_priv, ddc_pin)); +intel_gmbus_get_adapter (display, ddc_pin));drm_connector_helper_add (connector, &intel_hdmi_connector_helper_funcs);
drivers/gpu/drm/i915/display/intel_hotplug_irq.c +4 -2
@@ -556,6 +556,7 @@ void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)void icp_irq_handler (struct drm_i915_private *dev_priv,u32 pch_iir) { +struct intel_display *display = &dev_priv->display;u32 ddi_hotplug_trigger = pch_iir &SDE_DDI_HOTPLUG_MASK_ICP ;u32 tc_hotplug_trigger = pch_iir &SDE_TC_HOTPLUG_MASK_ICP ;u32 pin_mask =0 , long_mask =0 ;
@@ -589,11 +590,12 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_hpd_irq_handler (dev_priv, pin_mask, long_mask);if (pch_iir &SDE_GMBUS_ICP ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }void spt_irq_handler (struct drm_i915_private *dev_priv,u32 pch_iir) { +struct intel_display *display = &dev_priv->display;u32 hotplug_trigger = pch_iir &SDE_HOTPLUG_MASK_SPT & ~SDE_PORTE_HOTPLUG_SPT ;u32 hotplug2_trigger = pch_iir &SDE_PORTE_HOTPLUG_SPT ;
@@ -625,7 +627,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_hpd_irq_handler (dev_priv, pin_mask, long_mask);if (pch_iir &SDE_GMBUS_CPT ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }void ilk_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 hotplug_trigger)
drivers/gpu/drm/i915/display/intel_lvds.c +1 -1
@@ -900,7 +900,7 @@ void intel_lvds_init(struct drm_i915_private *i915)drm_connector_init_with_ddc (&i915->drm, &connector->base, &intel_lvds_connector_funcs,DRM_MODE_CONNECTOR_LVDS , -intel_gmbus_get_adapter (i915, ddc_pin)); +intel_gmbus_get_adapter (display, ddc_pin));drm_encoder_init (&i915->drm, &encoder->base, &intel_lvds_enc_funcs,DRM_MODE_ENCODER_LVDS ,"LVDS" );
drivers/gpu/drm/i915/display/intel_sdvo.c +5 -4
@@ -2082,10 +2082,10 @@ intel_sdvo_get_edid(struct drm_connector *connector)static const struct drm_edid *intel_sdvo_get_analog_edid (struct drm_connector *connector) { -struct drm_i915_private *i915 =to_i915 (connector->dev); +struct intel_display *display =to_intel_display (connector->dev);struct i2c_adapter *ddc; - ddc =intel_gmbus_get_adapter (i915, i915->display.vbt.crt_ddc_pin); + ddc =intel_gmbus_get_adapter (display, display->vbt.crt_ddc_pin);if (!ddc)return NULL ;
@@ -2638,6 +2638,7 @@ intel_sdvo_select_ddc_bus(struct intel_sdvo *sdvo,static void intel_sdvo_select_i2c_bus (struct intel_sdvo *sdvo) { +struct intel_display *display =to_intel_display (&sdvo->base);struct drm_i915_private *dev_priv =to_i915 (sdvo->base.base.dev);const struct sdvo_device_mapping *mapping;u8 pin;
@@ -2648,7 +2649,7 @@ intel_sdvo_select_i2c_bus(struct intel_sdvo *sdvo) mapping = &dev_priv->display.vbt.sdvo_mappings[1 ];if (mapping->initialized && -intel_gmbus_is_valid_pin (dev_priv, mapping->i2c_pin)) +intel_gmbus_is_valid_pin (display, mapping->i2c_pin)) pin = mapping->i2c_pin;else pin =GMBUS_PIN_DPB ;
@@ -2657,7 +2658,7 @@ intel_sdvo_select_i2c_bus(struct intel_sdvo *sdvo) sdvo->base.base.base.id, sdvo->base.base.name, pin, sdvo->target_addr); - sdvo->i2c =intel_gmbus_get_adapter (dev_priv, pin); + sdvo->i2c =intel_gmbus_get_adapter (display, pin);/* * With gmbus we should be able to drive sdvo i2c at 2MHz, but somehow
drivers/gpu/drm/i915/i915_suspend.c +1 -1
@@ -137,5 +137,5 @@ void i915_restore_display(struct drm_i915_private *dev_priv)intel_vga_redisable (display); -intel_gmbus_reset (dev_priv); +intel_gmbus_reset (display); }
Signature · 1 line
2.39.5
Re: [PATCH 01/11] drm/i915/gmbus: convert to struct intel_display
Quoted 265 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch gmbus code over to it.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_bios.c | 6 +- drivers/gpu/drm/i915/display/intel_crt.c | 6 +- .../drm/i915/display/intel_display_driver.c | 4 +- .../gpu/drm/i915/display/intel_display_irq.c | 11 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 5 +- drivers/gpu/drm/i915/display/intel_dvo.c | 8 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 290 +++++++++--------- drivers/gpu/drm/i915/display/intel_gmbus.h | 15 +- .../gpu/drm/i915/display/intel_gmbus_regs.h | 16 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 8 +- .../gpu/drm/i915/display/intel_hotplug_irq.c | 6 +- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 9 +- drivers/gpu/drm/i915/i915_suspend.c | 2 +- 14 files changed, 202 insertions(+), 186 deletions(-)drivers/gpu/drm/i915/display/intel_bios.c +2
-4@@ -2796,7 +2796,6 @@ static bool child_device_size_valid(struct intel_display *display, int size)static void parse_general_definitions (struct intel_display *display) { -struct drm_i915_private *i915 =to_i915 (display->drm);const struct bdb_general_definitions *defs;struct intel_bios_encoder_data *devdata;const struct child_device_config *child;@@ -2821,7 +2820,7 @@ parse_general_definitions(struct intel_display *display) bus_pin = defs->crt_ddc_gmbus_pin;drm_dbg_kms (display->drm,"crt_ddc_bus_pin: %d\n" , bus_pin); -if (intel_gmbus_is_valid_pin (i915, bus_pin)) +if (intel_gmbus_is_valid_pin (display, bus_pin)) display->vbt.crt_ddc_pin = bus_pin;if (!child_device_size_valid (display, defs->child_dev_size))@@ -3338,7 +3337,6 @@ bool intel_bios_is_tv_present(struct intel_display *display)*/ bool intel_bios_is_lvds_present (struct intel_display *display,u8 *i2c_pin) { -struct drm_i915_private *i915 =to_i915 (display->drm);const struct intel_bios_encoder_data *devdata;if (list_empty (&display->vbt.display_devices))@@ -3355,7 +3353,7 @@ bool intel_bios_is_lvds_present(struct intel_display *display, u8 *i2c_pin) child->device_type != DEVICE_TYPE_LFP)continue ; -if (intel_gmbus_is_valid_pin (i915, child->i2c_pin)) +if (intel_gmbus_is_valid_pin (display, child->i2c_pin)) *i2c_pin = child->i2c_pin;/* However, we cannot trust the BIOS writers to populate drivers/gpu/drm/i915/display/intel_crt.c +4
-2@@ -935,6 +935,7 @@ intel_crt_detect(struct drm_connector *connector,static int intel_crt_get_modes (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));@@ -954,7 +955,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) goto out;/* Try to probe digital port for output in DVI-I -> VGA mode. */ - ddc =intel_gmbus_get_adapter (dev_priv,GMBUS_PIN_DPB ); + ddc =intel_gmbus_get_adapter (display,GMBUS_PIN_DPB ); ret =intel_crt_ddc_get_modes (connector, ddc); out:@@ -1009,6 +1010,7 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = {void intel_crt_init (struct drm_i915_private *dev_priv) { +struct intel_display *display = &dev_priv->display;struct drm_connector *connector;struct intel_crt *crt;struct intel_connector *intel_connector;@@ -1057,7 +1059,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)drm_connector_init_with_ddc (&dev_priv->drm, connector, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA , -intel_gmbus_get_adapter (dev_priv, ddc_pin)); +intel_gmbus_get_adapter (display, ddc_pin));drm_encoder_init (&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs,DRM_MODE_ENCODER_DAC ,"CRT" );drivers/gpu/drm/i915/display/intel_display_driver.c +2
-2@@ -432,7 +432,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)intel_pps_setup (display); -intel_gmbus_setup (i915); +intel_gmbus_setup (display); drm_dbg_kms(&i915->drm, "%d display pipe%s available.\n", INTEL_NUM_PIPES(i915),@@ -608,7 +608,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)intel_overlay_cleanup (i915); -intel_gmbus_teardown (i915); +intel_gmbus_teardown (display);destroy_workqueue (i915->display.wq.flip);destroy_workqueue (i915->display.wq.modeset);drivers/gpu/drm/i915/display/intel_display_irq.c +6
-5@@ -543,12 +543,13 @@ void i965_pipestat_irq_handler(struct drm_i915_private *dev_priv,intel_opregion_asle_intr (display);if (pipe_stats[0 ] &PIPE_GMBUS_INTERRUPT_STATUS ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }void valleyview_pipestat_irq_handler (struct drm_i915_private *dev_priv,u32 pipe_stats[I915_MAX_PIPES ]) { +struct intel_display *display = &dev_priv->display;enum pipe pipe;for_each_pipe (dev_priv, pipe) {@@ -566,7 +567,7 @@ void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv, }if (pipe_stats[0 ] &PIPE_GMBUS_INTERRUPT_STATUS ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }static void ibx_irq_handler (struct drm_i915_private *dev_priv,u32 pch_iir)@@ -588,7 +589,7 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_dp_aux_irq_handler (display);if (pch_iir &SDE_GMBUS ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display);if (pch_iir &SDE_AUDIO_HDCP_MASK )drm_dbg (&dev_priv->drm,"PCH HDCP audio interrupt\n" );@@ -677,7 +678,7 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_dp_aux_irq_handler (display);if (pch_iir &SDE_GMBUS_CPT ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display);if (pch_iir &SDE_AUDIO_CP_REQ_CPT )drm_dbg (&dev_priv->drm,"Audio CP request interrupt\n" );@@ -1109,7 +1110,7 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)if ((IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) && (iir &BXT_DE_PORT_GMBUS )) { -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); found = true; }drivers/gpu/drm/i915/display/intel_dsi_vbt.c +3
-2@@ -323,6 +323,7 @@ enum {static void icl_native_gpio_set_value (struct drm_i915_private *dev_priv,int gpio,bool value) { +struct intel_display *display = &dev_priv->display;int index;if (drm_WARN_ON (&dev_priv->drm,DISPLAY_VER (dev_priv) ==11 && gpio >=MIPI_RESET_2 ))@@ -367,7 +368,7 @@ static void icl_native_gpio_set_value(struct drm_i915_private *dev_priv,case MIPI_AVEE_EN_2 : index = gpio ==MIPI_AVEE_EN_1 ?1 :2 ; -intel_de_rmw (dev_priv,GPIO (dev_priv, index), +intel_de_rmw (display,GPIO (display, index),GPIO_CLOCK_VAL_OUT ,GPIO_CLOCK_DIR_MASK |GPIO_CLOCK_DIR_OUT |GPIO_CLOCK_VAL_MASK | (value ?GPIO_CLOCK_VAL_OUT :0 ));@@ -376,7 +377,7 @@ static void icl_native_gpio_set_value(struct drm_i915_private *dev_priv,case MIPI_VIO_EN_2 : index = gpio ==MIPI_VIO_EN_1 ?1 :2 ; -intel_de_rmw (dev_priv,GPIO (dev_priv, index), +intel_de_rmw (display,GPIO (display, index),GPIO_DATA_VAL_OUT ,GPIO_DATA_DIR_MASK |GPIO_DATA_DIR_OUT |GPIO_DATA_VAL_MASK | (value ?GPIO_DATA_VAL_OUT :0 ));drivers/gpu/drm/i915/display/intel_dvo.c +5
-3@@ -417,6 +417,7 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,struct intel_dvo *intel_dvo, const struct intel_dvo_device *dvo) { + struct intel_display *display = &dev_priv->display;struct i2c_adapter *i2c;u32 dpll[I915_MAX_PIPES ];enum pipe pipe;@@ -428,7 +429,7 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,* special cases, but otherwise default to what's defined * in the spec. */ -if (intel_gmbus_is_valid_pin (dev_priv, dvo->gpio)) +if (intel_gmbus_is_valid_pin (display, dvo->gpio)) gpio = dvo->gpio;else if (dvo->type ==INTEL_DVO_CHIP_LVDS ) gpio =GMBUS_PIN_SSC ;@@ -440,7 +441,7 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,* It appears that everything is on GPIOE except for panels * on i830 laptops, which are on GPIOB (DVOA). */ - i2c =intel_gmbus_get_adapter (dev_priv, gpio); + i2c =intel_gmbus_get_adapter (display, gpio); intel_dvo->dev = *dvo;@@ -489,6 +490,7 @@ static bool intel_dvo_probe(struct drm_i915_private *i915,void intel_dvo_init (struct drm_i915_private *i915) { +struct intel_display *display = &i915->display;struct intel_connector *connector;struct intel_encoder *encoder;struct intel_dvo *intel_dvo;@@ -549,7 +551,7 @@ void intel_dvo_init(struct drm_i915_private *i915)drm_connector_init_with_ddc (&i915->drm, &connector->base, &intel_dvo_connector_funcs,intel_dvo_connector_type (&intel_dvo->dev), -intel_gmbus_get_adapter (i915,GMBUS_PIN_DPC )); +intel_gmbus_get_adapter (display,GMBUS_PIN_DPC ));drm_connector_helper_add (&connector->base, &intel_dvo_connector_helper_funcs);drivers/gpu/drm/i915/display/intel_gmbus.c +1
-1@@ -48,7 +48,7 @@ struct intel_gmbus {u32 reg0;i915_reg_t gpio_reg;struct i2c_algo_bit_data bit_algo; -struct drm_i915_private *i915; +struct intel_display *display; };enum gmbus_gpio {
drivers/gpu/drm/i915/display/intel_gmbus.c static const struct gmbus_pin gmbus_pins_mtp[] = { · line 155
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_gmbus.c +2
-1@@ -149,9 +149,10 @@ static const struct gmbus_pin gmbus_pins_mtp[] = { [GMBUS_PIN_12_TC4_ICP] = { "tc4", GPIOM }, }; -static const struct gmbus_pin *get_gmbus_pin (struct drm_i915_private *i915, +static const struct gmbus_pin *get_gmbus_pin (struct intel_display *display,unsigned int pin) { +struct drm_i915_private *i915 =to_i915 (display->drm);
hmmm! Great idea!
So we the other conversion doesn't block this to go in parallel!
Quoted 1,035 lines
drivers/gpu/drm/i915/display/intel_gmbus.c +148
-137const struct gmbus_pin *pins;size_t size;@@ -173,7 +174,7 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *i915, }else if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) { pins = gmbus_pins_bxt; size =ARRAY_SIZE (gmbus_pins_bxt); - }else if (DISPLAY_VER (i915) ==9 ) { + }else if (DISPLAY_VER (display) ==9 ) { pins = gmbus_pins_skl; size =ARRAY_SIZE (gmbus_pins_skl); }else if (IS_BROADWELL (i915)) {@@ -190,9 +191,9 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *i915,return &pins[pin]; } -bool intel_gmbus_is_valid_pin (struct drm_i915_private *i915,unsigned int pin) +bool intel_gmbus_is_valid_pin (struct intel_display *display,unsigned int pin) { -return get_gmbus_pin (i915, pin); +return get_gmbus_pin (display, pin); }/* Intel GPIO access functions */ @@ -206,42 +207,45 @@ to_intel_gmbus(struct i2c_adapter *i2c) }void -intel_gmbus_reset (struct drm_i915_private *i915) +intel_gmbus_reset (struct intel_display *display) { -intel_de_write (i915,GMBUS0 (i915),0 ); -intel_de_write (i915,GMBUS4 (i915),0 ); +intel_de_write (display,GMBUS0 (display),0 ); +intel_de_write (display,GMBUS4 (display),0 ); } -static void pnv_gmbus_clock_gating (struct drm_i915_private *i915, +static void pnv_gmbus_clock_gating (struct intel_display *display,bool enable) {/* When using bit bashing for I2C, this bit needs to be set to 1 */ -intel_de_rmw (i915,DSPCLK_GATE_D (i915),PNV_GMBUSUNIT_CLOCK_GATE_DISABLE , +intel_de_rmw (display,DSPCLK_GATE_D (display), +PNV_GMBUSUNIT_CLOCK_GATE_DISABLE , !enable ?PNV_GMBUSUNIT_CLOCK_GATE_DISABLE :0 ); } -static void pch_gmbus_clock_gating (struct drm_i915_private *i915, +static void pch_gmbus_clock_gating (struct intel_display *display,bool enable) { -intel_de_rmw (i915,SOUTH_DSPCLK_GATE_D ,PCH_GMBUSUNIT_CLOCK_GATE_DISABLE , +intel_de_rmw (display,SOUTH_DSPCLK_GATE_D , +PCH_GMBUSUNIT_CLOCK_GATE_DISABLE , !enable ?PCH_GMBUSUNIT_CLOCK_GATE_DISABLE :0 ); } -static void bxt_gmbus_clock_gating (struct drm_i915_private *i915, +static void bxt_gmbus_clock_gating (struct intel_display *display,bool enable) { -intel_de_rmw (i915,GEN9_CLKGATE_DIS_4 ,BXT_GMBUS_GATING_DIS , +intel_de_rmw (display,GEN9_CLKGATE_DIS_4 ,BXT_GMBUS_GATING_DIS , !enable ?BXT_GMBUS_GATING_DIS :0 ); }static u32 get_reserved (struct intel_gmbus *bus) { -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; +struct drm_i915_private *i915 =to_i915 (display->drm);u32 reserved =0 ;/* On most chips, these bits must be preserved in software. */ if (!IS_I830 (i915) && !IS_I845G (i915)) - reserved =intel_de_read_notrace (i915, bus->gpio_reg) & + reserved =intel_de_read_notrace (display, bus->gpio_reg) & (GPIO_DATA_PULLUP_DISABLE |GPIO_CLOCK_PULLUP_DISABLE );return reserved;@@ -250,31 +254,31 @@ static u32 get_reserved(struct intel_gmbus *bus)static int get_clock (void *data) {struct intel_gmbus *bus = data; -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display;u32 reserved =get_reserved (bus); -intel_de_write_notrace (i915, bus->gpio_reg, reserved |GPIO_CLOCK_DIR_MASK ); -intel_de_write_notrace (i915, bus->gpio_reg, reserved); +intel_de_write_notrace (display, bus->gpio_reg, reserved |GPIO_CLOCK_DIR_MASK ); +intel_de_write_notrace (display, bus->gpio_reg, reserved); -return (intel_de_read_notrace (i915, bus->gpio_reg) &GPIO_CLOCK_VAL_IN ) !=0 ; +return (intel_de_read_notrace (display, bus->gpio_reg) &GPIO_CLOCK_VAL_IN ) !=0 ; }static int get_data (void *data) {struct intel_gmbus *bus = data; -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display;u32 reserved =get_reserved (bus); -intel_de_write_notrace (i915, bus->gpio_reg, reserved |GPIO_DATA_DIR_MASK ); -intel_de_write_notrace (i915, bus->gpio_reg, reserved); +intel_de_write_notrace (display, bus->gpio_reg, reserved |GPIO_DATA_DIR_MASK ); +intel_de_write_notrace (display, bus->gpio_reg, reserved); -return (intel_de_read_notrace (i915, bus->gpio_reg) &GPIO_DATA_VAL_IN ) !=0 ; +return (intel_de_read_notrace (display, bus->gpio_reg) &GPIO_DATA_VAL_IN ) !=0 ; }static void set_clock (void *data,int state_high) {struct intel_gmbus *bus = data; -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display;u32 reserved =get_reserved (bus);u32 clock_bits;@@ -284,14 +288,14 @@ static void set_clock(void *data, int state_high) clock_bits =GPIO_CLOCK_DIR_OUT |GPIO_CLOCK_DIR_MASK |GPIO_CLOCK_VAL_MASK ; -intel_de_write_notrace (i915, bus->gpio_reg, reserved | clock_bits); -intel_de_posting_read (i915, bus->gpio_reg); +intel_de_write_notrace (display, bus->gpio_reg, reserved | clock_bits); +intel_de_posting_read (display, bus->gpio_reg); }static void set_data (void *data,int state_high) {struct intel_gmbus *bus = data; -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display;u32 reserved =get_reserved (bus);u32 data_bits;@@ -301,20 +305,21 @@ static void set_data(void *data, int state_high) data_bits =GPIO_DATA_DIR_OUT |GPIO_DATA_DIR_MASK |GPIO_DATA_VAL_MASK ; -intel_de_write_notrace (i915, bus->gpio_reg, reserved | data_bits); -intel_de_posting_read (i915, bus->gpio_reg); +intel_de_write_notrace (display, bus->gpio_reg, reserved | data_bits); +intel_de_posting_read (display, bus->gpio_reg); }static int intel_gpio_pre_xfer (struct i2c_adapter *adapter) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; +struct drm_i915_private *i915 =to_i915 (display->drm); -intel_gmbus_reset (i915); +intel_gmbus_reset (display);if (IS_PINEVIEW (i915)) -pnv_gmbus_clock_gating (i915, false); +pnv_gmbus_clock_gating (display, false);set_data (bus,1 );set_clock (bus,1 );@@ -326,13 +331,14 @@ static void intel_gpio_post_xfer(struct i2c_adapter *adapter) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; +struct drm_i915_private *i915 =to_i915 (display->drm);set_data (bus,1 );set_clock (bus,1 );if (IS_PINEVIEW (i915)) -pnv_gmbus_clock_gating (i915, true); +pnv_gmbus_clock_gating (display, true); } static void@@ -355,16 +361,17 @@ intel_gpio_setup(struct intel_gmbus *bus, i915_reg_t gpio_reg) algo->data = bus; } -static bool has_gmbus_irq (struct drm_i915_private *i915) +static bool has_gmbus_irq (struct intel_display *display) { +struct drm_i915_private *i915 =to_i915 (display->drm);/* * encoder->shutdown() may want to use GMBUS * after irqs have already been disabled. */ -return HAS_GMBUS_IRQ (i915) &&intel_irqs_enabled (i915); +return HAS_GMBUS_IRQ (display) &&intel_irqs_enabled (i915); } -static int gmbus_wait (struct drm_i915_private *i915,u32 status,u32 irq_en) +static int gmbus_wait (struct intel_display *display,u32 status,u32 irq_en) {DEFINE_WAIT (wait);u32 gmbus2;@@ -374,21 +381,21 @@ static int gmbus_wait(struct drm_i915_private *i915, u32 status, u32 irq_en)* we also need to check for NAKs besides the hw ready/idle signal, we * need to wake up periodically and check that ourselves. */ -if (!has_gmbus_irq (i915)) +if (!has_gmbus_irq (display)) irq_en =0 ; -add_wait_queue (&i915->display.gmbus.wait_queue, &wait); -intel_de_write_fw (i915,GMBUS4 (i915), irq_en); +add_wait_queue (&display->gmbus.wait_queue, &wait); +intel_de_write_fw (display,GMBUS4 (display), irq_en); status |=GMBUS_SATOER ; - ret =wait_for_us ((gmbus2 =intel_de_read_fw (i915,GMBUS2 (i915))) & status, + ret =wait_for_us ((gmbus2 =intel_de_read_fw (display,GMBUS2 (display))) & status,2 );if (ret) - ret =wait_for ((gmbus2 =intel_de_read_fw (i915,GMBUS2 (i915))) & status, + ret =wait_for ((gmbus2 =intel_de_read_fw (display,GMBUS2 (display))) & status,50 ); -intel_de_write_fw (i915,GMBUS4 (i915),0 ); -remove_wait_queue (&i915->display.gmbus.wait_queue, &wait); +intel_de_write_fw (display,GMBUS4 (display),0 ); +remove_wait_queue (&display->gmbus.wait_queue, &wait);if (gmbus2 &GMBUS_SATOER )return -ENXIO ;@@ -397,7 +404,7 @@ static int gmbus_wait(struct drm_i915_private *i915, u32 status, u32 irq_en) }static int -gmbus_wait_idle (struct drm_i915_private *i915) +gmbus_wait_idle (struct intel_display *display) {DEFINE_WAIT (wait);u32 irq_enable;@@ -405,33 +412,33 @@ gmbus_wait_idle(struct drm_i915_private *i915)/* Important: The hw handles only the first bit, so set only one! */ irq_enable =0 ; -if (has_gmbus_irq (i915)) +if (has_gmbus_irq (display)) irq_enable =GMBUS_IDLE_EN ; -add_wait_queue (&i915->display.gmbus.wait_queue, &wait); -intel_de_write_fw (i915,GMBUS4 (i915), irq_enable); +add_wait_queue (&display->gmbus.wait_queue, &wait); +intel_de_write_fw (display,GMBUS4 (display), irq_enable); - ret =intel_de_wait_fw (i915,GMBUS2 (i915),GMBUS_ACTIVE ,0 ,10 ); + ret =intel_de_wait_fw (display,GMBUS2 (display),GMBUS_ACTIVE ,0 ,10 ); -intel_de_write_fw (i915,GMBUS4 (i915),0 ); -remove_wait_queue (&i915->display.gmbus.wait_queue, &wait); +intel_de_write_fw (display,GMBUS4 (display),0 ); +remove_wait_queue (&display->gmbus.wait_queue, &wait);return ret; } -static unsigned int gmbus_max_xfer_size (struct drm_i915_private *i915) +static unsigned int gmbus_max_xfer_size (struct intel_display *display) { -return DISPLAY_VER (i915) >=9 ?GEN9_GMBUS_BYTE_COUNT_MAX : +return DISPLAY_VER (display) >=9 ?GEN9_GMBUS_BYTE_COUNT_MAX :GMBUS_BYTE_COUNT_MAX ; }static int -gmbus_xfer_read_chunk (struct drm_i915_private *i915, +gmbus_xfer_read_chunk (struct intel_display *display,unsigned short addr,u8 *buf,unsigned int len,u32 gmbus0_reg,u32 gmbus1_index) {unsigned int size = len; -bool burst_read = len >gmbus_max_xfer_size (i915); +bool burst_read = len >gmbus_max_xfer_size (display);bool extra_byte_added = false;if (burst_read) {@@ -444,21 +451,21 @@ gmbus_xfer_read_chunk(struct drm_i915_private *i915, len++; } size = len %256 +256 ; -intel_de_write_fw (i915,GMBUS0 (i915), +intel_de_write_fw (display,GMBUS0 (display), gmbus0_reg |GMBUS_BYTE_CNT_OVERRIDE ); } -intel_de_write_fw (i915,GMBUS1 (i915), +intel_de_write_fw (display,GMBUS1 (display), gmbus1_index |GMBUS_CYCLE_WAIT | (size <<GMBUS_BYTE_COUNT_SHIFT ) | (addr <<GMBUS_SLAVE_ADDR_SHIFT ) |GMBUS_SLAVE_READ |GMBUS_SW_RDY );while (len) {int ret;u32 val, loop =0 ; - ret =gmbus_wait (i915,GMBUS_HW_RDY ,GMBUS_HW_RDY_EN ); + ret =gmbus_wait (display,GMBUS_HW_RDY ,GMBUS_HW_RDY_EN );if (ret)return ret; - val =intel_de_read_fw (i915,GMBUS3 (i915)); + val =intel_de_read_fw (display,GMBUS3 (display)); do { if (extra_byte_added && len == 1) break;@@ -469,7 +476,7 @@ gmbus_xfer_read_chunk(struct drm_i915_private *i915,if (burst_read && len == size -4 )/* Reset the override bit */ -intel_de_write_fw (i915,GMBUS0 (i915), gmbus0_reg); +intel_de_write_fw (display,GMBUS0 (display), gmbus0_reg); }return 0 ;@@ -486,9 +493,10 @@ gmbus_xfer_read_chunk(struct drm_i915_private *i915,#define INTEL_GMBUS_BURST_READ_MAX_LEN 767Ustatic int -gmbus_xfer_read (struct drm_i915_private *i915,struct i2c_msg *msg, +gmbus_xfer_read (struct intel_display *display,struct i2c_msg *msg,u32 gmbus0_reg,u32 gmbus1_index) { +struct drm_i915_private *i915 =to_i915 (display->drm);u8 *buf = msg->buf;unsigned int rx_size = msg->len;unsigned int len;@@ -498,9 +506,9 @@ gmbus_xfer_read(struct drm_i915_private *i915, struct i2c_msg *msg,if (HAS_GMBUS_BURST_READ (i915)) len =min (rx_size,INTEL_GMBUS_BURST_READ_MAX_LEN );else - len =min (rx_size,gmbus_max_xfer_size (i915)); + len =min (rx_size,gmbus_max_xfer_size (display)); - ret =gmbus_xfer_read_chunk (i915, msg->addr, buf, len, + ret =gmbus_xfer_read_chunk (display, msg->addr, buf, len, gmbus0_reg, gmbus1_index);if (ret)return ret;@@ -513,7 +521,7 @@ gmbus_xfer_read(struct drm_i915_private *i915, struct i2c_msg *msg, }static int -gmbus_xfer_write_chunk (struct drm_i915_private *i915, +gmbus_xfer_write_chunk (struct intel_display *display,unsigned short addr,u8 *buf,unsigned int len,u32 gmbus1_index) {@@ -526,8 +534,8 @@ gmbus_xfer_write_chunk(struct drm_i915_private *i915, len -=1 ; } -intel_de_write_fw (i915,GMBUS3 (i915), val); -intel_de_write_fw (i915,GMBUS1 (i915), +intel_de_write_fw (display,GMBUS3 (display), val); +intel_de_write_fw (display,GMBUS1 (display), gmbus1_index |GMBUS_CYCLE_WAIT | (chunk_size <<GMBUS_BYTE_COUNT_SHIFT ) | (addr <<GMBUS_SLAVE_ADDR_SHIFT ) |GMBUS_SLAVE_WRITE |GMBUS_SW_RDY );while (len) {int ret;@@ -537,9 +545,9 @@ gmbus_xfer_write_chunk(struct drm_i915_private *i915, val |= *buf++ << (8 * loop); }while (--len && ++loop <4 ); -intel_de_write_fw (i915,GMBUS3 (i915), val); +intel_de_write_fw (display,GMBUS3 (display), val); - ret =gmbus_wait (i915,GMBUS_HW_RDY ,GMBUS_HW_RDY_EN ); + ret =gmbus_wait (display,GMBUS_HW_RDY ,GMBUS_HW_RDY_EN );if (ret)return ret; }@@ -548,7 +556,7 @@ gmbus_xfer_write_chunk(struct drm_i915_private *i915, }static int -gmbus_xfer_write (struct drm_i915_private *i915,struct i2c_msg *msg, +gmbus_xfer_write (struct intel_display *display,struct i2c_msg *msg,u32 gmbus1_index) {u8 *buf = msg->buf;@@ -557,9 +565,9 @@ gmbus_xfer_write(struct drm_i915_private *i915, struct i2c_msg *msg,int ret; do { - len = min(tx_size, gmbus_max_xfer_size(i915)); + len = min(tx_size, gmbus_max_xfer_size(display)); - ret = gmbus_xfer_write_chunk(i915, msg->addr, buf, len, + ret = gmbus_xfer_write_chunk(display, msg->addr, buf, len, gmbus1_index); if (ret) return ret;@@ -586,7 +594,7 @@ gmbus_is_index_xfer(struct i2c_msg *msgs, int i, int num) }static int -gmbus_index_xfer (struct drm_i915_private *i915,struct i2c_msg *msgs, +gmbus_index_xfer (struct intel_display *display,struct i2c_msg *msgs,u32 gmbus0_reg) {u32 gmbus1_index =0 ;@@ -602,17 +610,17 @@ gmbus_index_xfer(struct drm_i915_private *i915, struct i2c_msg *msgs,/* GMBUS5 holds 16-bit index */ if (gmbus5) -intel_de_write_fw (i915,GMBUS5 (i915), gmbus5); +intel_de_write_fw (display,GMBUS5 (display), gmbus5);if (msgs[1 ].flags &I2C_M_RD ) - ret =gmbus_xfer_read (i915, &msgs[1 ], gmbus0_reg, + ret =gmbus_xfer_read (display, &msgs[1 ], gmbus0_reg, gmbus1_index);else - ret =gmbus_xfer_write (i915, &msgs[1 ], gmbus1_index); + ret =gmbus_xfer_write (display, &msgs[1 ], gmbus1_index);/* Clear GMBUS5 after each index transfer */ if (gmbus5) -intel_de_write_fw (i915,GMBUS5 (i915),0 ); +intel_de_write_fw (display,GMBUS5 (display),0 );return ret; }@@ -622,34 +630,35 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num, u32 gmbus0_source) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; +struct drm_i915_private *i915 =to_i915 (display->drm);int i =0 , inc, try =0 ;int ret =0 ;/* Display WA #0868: skl,bxt,kbl,cfl,glk */ if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) -bxt_gmbus_clock_gating (i915, false); +bxt_gmbus_clock_gating (display, false);else if (HAS_PCH_SPT (i915) ||HAS_PCH_CNP (i915)) -pch_gmbus_clock_gating (i915, false); +pch_gmbus_clock_gating (display, false); retry: -intel_de_write_fw (i915,GMBUS0 (i915), gmbus0_source | bus->reg0); +intel_de_write_fw (display,GMBUS0 (display), gmbus0_source | bus->reg0);for (; i < num; i += inc) { inc =1 ;if (gmbus_is_index_xfer (msgs, i, num)) { - ret =gmbus_index_xfer (i915, &msgs[i], + ret =gmbus_index_xfer (display, &msgs[i], gmbus0_source | bus->reg0); inc =2 ;/* an index transmission is two msgs */ }else if (msgs[i].flags &I2C_M_RD ) { - ret =gmbus_xfer_read (i915, &msgs[i], + ret =gmbus_xfer_read (display, &msgs[i], gmbus0_source | bus->reg0,0 ); }else { - ret =gmbus_xfer_write (i915, &msgs[i],0 ); + ret =gmbus_xfer_write (display, &msgs[i],0 ); }if (!ret) - ret =gmbus_wait (i915, + ret =gmbus_wait (display,GMBUS_HW_WAIT_PHASE ,GMBUS_HW_WAIT_EN );if (ret == -ETIMEDOUT ) goto timeout;@@ -661,19 +670,19 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* a STOP on the very first cycle. To simplify the code we * unconditionally generate the STOP condition with an additional gmbus * cycle. */ -intel_de_write_fw (i915,GMBUS1 (i915),GMBUS_CYCLE_STOP |GMBUS_SW_RDY ); +intel_de_write_fw (display,GMBUS1 (display),GMBUS_CYCLE_STOP |GMBUS_SW_RDY );/* Mark the GMBUS interface as disabled after waiting for idle. * We will re-enable it at the start of the next xfer, * till then let it sleep. */ -if (gmbus_wait_idle (i915)) { -drm_dbg_kms (&i915->drm, +if (gmbus_wait_idle (display)) { +drm_dbg_kms (display->drm,"GMBUS [%s] timed out waiting for idle\n" , adapter->name); ret = -ETIMEDOUT ; } -intel_de_write_fw (i915,GMBUS0 (i915),0 ); +intel_de_write_fw (display,GMBUS0 (display),0 ); ret = ret ?: i; goto out;@@ -692,8 +701,8 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* it's slow responding and only answers on the 2nd retry. */ ret = -ENXIO ; -if (gmbus_wait_idle (i915)) { -drm_dbg_kms (&i915->drm, +if (gmbus_wait_idle (display)) { +drm_dbg_kms (display->drm,"GMBUS [%s] timed out after NAK\n" , adapter->name); ret = -ETIMEDOUT ;@@ -703,11 +712,11 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* of resetting the GMBUS controller and so clearing the * BUS_ERROR raised by the target's NAK. */ -intel_de_write_fw (i915,GMBUS1 (i915),GMBUS_SW_CLR_INT ); -intel_de_write_fw (i915,GMBUS1 (i915),0 ); -intel_de_write_fw (i915,GMBUS0 (i915),0 ); +intel_de_write_fw (display,GMBUS1 (display),GMBUS_SW_CLR_INT ); +intel_de_write_fw (display,GMBUS1 (display),0 ); +intel_de_write_fw (display,GMBUS0 (display),0 ); -drm_dbg_kms (&i915->drm,"GMBUS [%s] NAK for addr: %04x %c(%d)\n" , +drm_dbg_kms (display->drm,"GMBUS [%s] NAK for addr: %04x %c(%d)\n" , adapter->name, msgs[i].addr, (msgs[i].flags &I2C_M_RD ) ?'r' :'w' , msgs[i].len);@@ -718,7 +727,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* drm_do_probe_ddc_edid, which bails out on the first -ENXIO. */ if (ret == -ENXIO && i ==0 && try++ ==0 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"GMBUS [%s] NAK on first message, retry\n" , adapter->name); goto retry;@@ -727,10 +736,10 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num, goto out; timeout: -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"GMBUS [%s] timed out, falling back to bit banging on pin %d\n" , bus->adapter.name, bus->reg0 &0xff ); -intel_de_write_fw (i915,GMBUS0 (i915),0 ); +intel_de_write_fw (display,GMBUS0 (display),0 );/* * Hardware may not support GMBUS over these pins? Try GPIO bitbanging @@ -741,9 +750,9 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num, out:/* Display WA #0868: skl,bxt,kbl,cfl,glk */ if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) -bxt_gmbus_clock_gating (i915, true); +bxt_gmbus_clock_gating (display, true);else if (HAS_PCH_SPT (i915) ||HAS_PCH_CNP (i915)) -pch_gmbus_clock_gating (i915, true); +pch_gmbus_clock_gating (display, true);return ret; }@@ -752,7 +761,8 @@ static int gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num) { struct intel_gmbus *bus = to_intel_gmbus(adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; +struct drm_i915_private *i915 =to_i915 (display->drm);intel_wakeref_t wakeref;int ret;@@ -776,7 +786,8 @@ gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)int intel_gmbus_output_aksv (struct i2c_adapter *adapter) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; +struct drm_i915_private *i915 =to_i915 (display->drm);u8 cmd =DRM_HDCP_DDC_AKSV ;u8 buf[DRM_HDCP_KSV_LEN ] = {};struct i2c_msg msgs[] = {@@ -797,7 +808,7 @@ int intel_gmbus_output_aksv(struct i2c_adapter *adapter)int ret; wakeref =intel_display_power_get (i915,POWER_DOMAIN_GMBUS ); -mutex_lock (&i915->display.gmbus.mutex); +mutex_lock (&display->gmbus.mutex);/* * In order to output Aksv to the receiver, use an indexed write to @@ -806,7 +817,7 @@ int intel_gmbus_output_aksv(struct i2c_adapter *adapter)*/ ret =do_gmbus_xfer (adapter, msgs,ARRAY_SIZE (msgs),GMBUS_AKSV_SELECT ); -mutex_unlock (&i915->display.gmbus.mutex); +mutex_unlock (&display->gmbus.mutex);intel_display_power_put (i915,POWER_DOMAIN_GMBUS , wakeref);return ret;@@ -830,27 +841,27 @@ static void gmbus_lock_bus(struct i2c_adapter *adapter, unsigned int flags) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; -mutex_lock (&i915->display.gmbus.mutex); +mutex_lock (&display->gmbus.mutex); }static int gmbus_trylock_bus (struct i2c_adapter *adapter,unsigned int flags) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; -return mutex_trylock (&i915->display.gmbus.mutex); +return mutex_trylock (&display->gmbus.mutex); }static void gmbus_unlock_bus (struct i2c_adapter *adapter,unsigned int flags) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; -mutex_unlock (&i915->display.gmbus.mutex); +mutex_unlock (&display->gmbus.mutex); }static const struct i2c_lock_operations gmbus_lock_ops = {@@ -861,31 +872,32 @@ static const struct i2c_lock_operations gmbus_lock_ops = {/** * intel_gmbus_setup - instantiate all Intel i2c GMBuses -* @i915: i915 device private +* @display: display device */ -int intel_gmbus_setup (struct drm_i915_private *i915) +int intel_gmbus_setup (struct intel_display *display) { -struct pci_dev *pdev =to_pci_dev (i915->drm.dev); +struct drm_i915_private *i915 =to_i915 (display->drm); +struct pci_dev *pdev =to_pci_dev (display->drm->dev);unsigned int pin;int ret;if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) - i915->display.gmbus.mmio_base =VLV_DISPLAY_BASE ; -else if (!HAS_GMCH (i915)) + display->gmbus.mmio_base =VLV_DISPLAY_BASE ; +else if (!HAS_GMCH (display))/* * Broxton uses the same PCH offsets for South Display Engine, * even though it doesn't have a PCH. */ - i915->display.gmbus.mmio_base =PCH_DISPLAY_BASE ; + display->gmbus.mmio_base =PCH_DISPLAY_BASE ; -mutex_init (&i915->display.gmbus.mutex); -init_waitqueue_head (&i915->display.gmbus.wait_queue); +mutex_init (&display->gmbus.mutex); +init_waitqueue_head (&display->gmbus.wait_queue); -for (pin =0 ; pin <ARRAY_SIZE (i915->display.gmbus.bus); pin++) { +for (pin =0 ; pin <ARRAY_SIZE (display->gmbus.bus); pin++) {const struct gmbus_pin *gmbus_pin;struct intel_gmbus *bus; - gmbus_pin =get_gmbus_pin (i915, pin); + gmbus_pin =get_gmbus_pin (display, pin);if (!gmbus_pin)continue ;@@ -901,7 +913,7 @@ int intel_gmbus_setup(struct drm_i915_private *i915) "i915 gmbus %s", gmbus_pin->name); bus->adapter.dev.parent = &pdev->dev; - bus->i915 = i915; + bus->display = display; bus->adapter.algo = &gmbus_algorithm; bus->adapter.lock_ops = &gmbus_lock_ops;@@ -919,7 +931,7 @@ int intel_gmbus_setup(struct drm_i915_private *i915)if (IS_I830 (i915)) bus->force_bit =1 ; -intel_gpio_setup (bus,GPIO (i915, gmbus_pin->gpio)); +intel_gpio_setup (bus,GPIO (display, gmbus_pin->gpio)); ret =i2c_add_adapter (&bus->adapter);if (ret) {@@ -927,43 +939,43 @@ int intel_gmbus_setup(struct drm_i915_private *i915) goto err; } - i915->display.gmbus.bus[pin] = bus; + display->gmbus.bus[pin] = bus; } -intel_gmbus_reset (i915); +intel_gmbus_reset (display);return 0 ; err: -intel_gmbus_teardown (i915); +intel_gmbus_teardown (display);return ret; } -struct i2c_adapter *intel_gmbus_get_adapter (struct drm_i915_private *i915, +struct i2c_adapter *intel_gmbus_get_adapter (struct intel_display *display,unsigned int pin) { -if (drm_WARN_ON (&i915->drm, pin >=ARRAY_SIZE (i915->display.gmbus.bus) || - !i915->display.gmbus.bus[pin])) +if (drm_WARN_ON (display->drm, pin >=ARRAY_SIZE (display->gmbus.bus) || + !display->gmbus.bus[pin]))return NULL ; -return &i915->display.gmbus.bus[pin]->adapter; +return &display->gmbus.bus[pin]->adapter; }void intel_gmbus_force_bit (struct i2c_adapter *adapter,bool force_bit) {struct intel_gmbus *bus =to_intel_gmbus (adapter); -struct drm_i915_private *i915 = bus->i915; +struct intel_display *display = bus->display; -mutex_lock (&i915->display.gmbus.mutex); +mutex_lock (&display->gmbus.mutex); bus->force_bit += force_bit ?1 :-1 ; -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"%sabling bit-banging on %s. force bit now %d\n" , force_bit ?"en" :"dis" , adapter->name, bus->force_bit); -mutex_unlock (&i915->display.gmbus.mutex); +mutex_unlock (&display->gmbus.mutex); }bool intel_gmbus_is_forced_bit (struct i2c_adapter *adapter)@@ -973,25 +985,25 @@ bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)return bus->force_bit; } -void intel_gmbus_teardown (struct drm_i915_private *i915) +void intel_gmbus_teardown (struct intel_display *display) {unsigned int pin; -for (pin =0 ; pin <ARRAY_SIZE (i915->display.gmbus.bus); pin++) { +for (pin =0 ; pin <ARRAY_SIZE (display->gmbus.bus); pin++) {struct intel_gmbus *bus; - bus = i915->display.gmbus.bus[pin]; + bus = display->gmbus.bus[pin];if (!bus)continue ;i2c_del_adapter (&bus->adapter);kfree (bus); - i915->display.gmbus.bus[pin] =NULL ; + display->gmbus.bus[pin] =NULL ; } } -void intel_gmbus_irq_handler (struct drm_i915_private *i915) +void intel_gmbus_irq_handler (struct intel_display *display) { -wake_up_all (&i915->display.gmbus.wait_queue); +wake_up_all (&display->gmbus.wait_queue); }drivers/gpu/drm/i915/display/intel_gmbus.h +7
-8@@ -8,8 +8,8 @@#include <linux/types.h> -struct drm_i915_private ;struct i2c_adapter ; +struct intel_display ;#define GMBUS_PIN_DISABLED 0#define GMBUS_PIN_SSC 1@@ -34,18 +34,17 @@ struct i2c_adapter;#define GMBUS_NUM_PINS 15/* including 0 */ -int intel_gmbus_setup (struct drm_i915_private *dev_priv); -void intel_gmbus_teardown (struct drm_i915_private *dev_priv); -bool intel_gmbus_is_valid_pin (struct drm_i915_private *dev_priv, -unsigned int pin); +int intel_gmbus_setup (struct intel_display *display); +void intel_gmbus_teardown (struct intel_display *display); +bool intel_gmbus_is_valid_pin (struct intel_display *display,unsigned int pin);int intel_gmbus_output_aksv (struct i2c_adapter *adapter);struct i2c_adapter * -intel_gmbus_get_adapter (struct drm_i915_private *dev_priv,unsigned int pin); +intel_gmbus_get_adapter (struct intel_display *display,unsigned int pin);void intel_gmbus_force_bit (struct i2c_adapter *adapter,bool force_bit);bool intel_gmbus_is_forced_bit (struct i2c_adapter *adapter); -void intel_gmbus_reset (struct drm_i915_private *dev_priv); +void intel_gmbus_reset (struct intel_display *display); -void intel_gmbus_irq_handler (struct drm_i915_private *i915); +void intel_gmbus_irq_handler (struct intel_display *display);#endif /* __INTEL_GMBUS_H__ */ drivers/gpu/drm/i915/display/intel_gmbus_regs.h +8
-8@@ -8,9 +8,9 @@#include "i915_reg_defs.h" -#define GMBUS_MMIO_BASE (__i915) ((__i915)->display.gmbus.mmio_base) +#define __GMBUS_MMIO_BASE (__display) ((__display)->gmbus.mmio_base) -#define GPIO (__i915, gpio) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5010 + 4 * (gpio)) +#define GPIO (__display, gpio) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5010 + 4 * (gpio))#define GPIO_CLOCK_DIR_MASK (1 << 0)#define GPIO_CLOCK_DIR_IN (0 << 1)#define GPIO_CLOCK_DIR_OUT (1 << 1)@@ -27,7 +27,7 @@#define GPIO_DATA_PULLUP_DISABLE (1 << 13)/* clock/port select */ -#define GMBUS0 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5100) +#define GMBUS0 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5100)#define GMBUS_AKSV_SELECT (1 << 11)#define GMBUS_RATE_100KHZ (0 << 8)#define GMBUS_RATE_50KHZ (1 << 8)@@ -37,7 +37,7 @@#define GMBUS_BYTE_CNT_OVERRIDE (1 << 6)/* command/status */ -#define GMBUS1 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5104) +#define GMBUS1 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5104)#define GMBUS_SW_CLR_INT (1 << 31)#define GMBUS_SW_RDY (1 << 30)#define GMBUS_ENT (1 << 29)/* enable timeout */ @@ -54,7 +54,7 @@#define GMBUS_SLAVE_WRITE (0 << 0)/* status */ -#define GMBUS2 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5108) +#define GMBUS2 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5108)#define GMBUS_INUSE (1 << 15)#define GMBUS_HW_WAIT_PHASE (1 << 14)#define GMBUS_STALL_TIMEOUT (1 << 13)@@ -64,10 +64,10 @@#define GMBUS_ACTIVE (1 << 9)/* data buffer bytes 3-0 */ -#define GMBUS3 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x510c) +#define GMBUS3 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x510c)/* interrupt mask (Pineview+) */ -#define GMBUS4 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5110) +#define GMBUS4 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5110)#define GMBUS_SLAVE_TIMEOUT_EN (1 << 4)#define GMBUS_NAK_EN (1 << 3)#define GMBUS_IDLE_EN (1 << 2)@@ -75,7 +75,7 @@#define GMBUS_HW_RDY_EN (1 << 0)/* byte index */ -#define GMBUS5 (__i915) _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5120) +#define GMBUS5 (__display) _MMIO(__GMBUS_MMIO_BASE(__display) + 0x5120)#define GMBUS_2BYTE_INDEX_EN (1 << 31)#endif /* __INTEL_GMBUS_REGS_H__ */ drivers/gpu/drm/i915/display/intel_hdmi.c +3
-5@@ -2917,7 +2917,6 @@ static struct intel_encoder * get_encoder_by_ddc_pin(struct intel_encoder *encoder, u8 ddc_pin) {struct intel_display *display =to_intel_display (encoder); -struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_encoder *other;for_each_intel_encoder (display->drm, other) {@@ -2931,7 +2930,7 @@ get_encoder_by_ddc_pin(struct intel_encoder *encoder, u8 ddc_pin) connector =enc_to_dig_port (other)->hdmi.attached_connector; -if (connector && connector->base.ddc ==intel_gmbus_get_adapter (i915, ddc_pin)) +if (connector && connector->base.ddc ==intel_gmbus_get_adapter (display, ddc_pin))return other; }@@ -2941,7 +2940,6 @@ get_encoder_by_ddc_pin(struct intel_encoder *encoder, u8 ddc_pin)static u8 intel_hdmi_ddc_pin (struct intel_encoder *encoder) {struct intel_display *display =to_intel_display (encoder); -struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_encoder *other;const char *source;u8 ddc_pin;@@ -2954,7 +2952,7 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder) source ="platform default" ; } -if (!intel_gmbus_is_valid_pin (i915, ddc_pin)) { +if (!intel_gmbus_is_valid_pin (display, ddc_pin)) {drm_dbg_kms (display->drm,"[ENCODER:%d:%s] Invalid DDC pin %d\n" , encoder->base.base.id, encoder->base.name, ddc_pin);@@ -3052,7 +3050,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,drm_connector_init_with_ddc (dev, connector, &intel_hdmi_connector_funcs,DRM_MODE_CONNECTOR_HDMIA , -intel_gmbus_get_adapter (dev_priv, ddc_pin)); +intel_gmbus_get_adapter (display, ddc_pin));drm_connector_helper_add (connector, &intel_hdmi_connector_helper_funcs);drivers/gpu/drm/i915/display/intel_hotplug_irq.c +4
-2@@ -556,6 +556,7 @@ void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)void icp_irq_handler (struct drm_i915_private *dev_priv,u32 pch_iir) { +struct intel_display *display = &dev_priv->display;u32 ddi_hotplug_trigger = pch_iir &SDE_DDI_HOTPLUG_MASK_ICP ;u32 tc_hotplug_trigger = pch_iir &SDE_TC_HOTPLUG_MASK_ICP ;u32 pin_mask =0 , long_mask =0 ;@@ -589,11 +590,12 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_hpd_irq_handler (dev_priv, pin_mask, long_mask);if (pch_iir &SDE_GMBUS_ICP ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }void spt_irq_handler (struct drm_i915_private *dev_priv,u32 pch_iir) { +struct intel_display *display = &dev_priv->display;u32 hotplug_trigger = pch_iir &SDE_HOTPLUG_MASK_SPT & ~SDE_PORTE_HOTPLUG_SPT ;u32 hotplug2_trigger = pch_iir &SDE_PORTE_HOTPLUG_SPT ;@@ -625,7 +627,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)intel_hpd_irq_handler (dev_priv, pin_mask, long_mask);if (pch_iir &SDE_GMBUS_CPT ) -intel_gmbus_irq_handler (dev_priv); +intel_gmbus_irq_handler (display); }void ilk_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 hotplug_trigger)drivers/gpu/drm/i915/display/intel_lvds.c +1
-1@@ -900,7 +900,7 @@ void intel_lvds_init(struct drm_i915_private *i915)drm_connector_init_with_ddc (&i915->drm, &connector->base, &intel_lvds_connector_funcs,DRM_MODE_CONNECTOR_LVDS , -intel_gmbus_get_adapter (i915, ddc_pin)); +intel_gmbus_get_adapter (display, ddc_pin));drm_encoder_init (&i915->drm, &encoder->base, &intel_lvds_enc_funcs,DRM_MODE_ENCODER_LVDS ,"LVDS" );drivers/gpu/drm/i915/display/intel_sdvo.c +5
-4@@ -2082,10 +2082,10 @@ intel_sdvo_get_edid(struct drm_connector *connector)static const struct drm_edid *intel_sdvo_get_analog_edid (struct drm_connector *connector) { -struct drm_i915_private *i915 =to_i915 (connector->dev); +struct intel_display *display =to_intel_display (connector->dev);struct i2c_adapter *ddc; - ddc =intel_gmbus_get_adapter (i915, i915->display.vbt.crt_ddc_pin); + ddc =intel_gmbus_get_adapter (display, display->vbt.crt_ddc_pin);if (!ddc)return NULL ;@@ -2638,6 +2638,7 @@ intel_sdvo_select_ddc_bus(struct intel_sdvo *sdvo,static void intel_sdvo_select_i2c_bus (struct intel_sdvo *sdvo) { +struct intel_display *display =to_intel_display (&sdvo->base);struct drm_i915_private *dev_priv =to_i915 (sdvo->base.base.dev);const struct sdvo_device_mapping *mapping;u8 pin;@@ -2648,7 +2649,7 @@ intel_sdvo_select_i2c_bus(struct intel_sdvo *sdvo) mapping = &dev_priv->display.vbt.sdvo_mappings[1 ];if (mapping->initialized && -intel_gmbus_is_valid_pin (dev_priv, mapping->i2c_pin)) +intel_gmbus_is_valid_pin (display, mapping->i2c_pin)) pin = mapping->i2c_pin;else pin =GMBUS_PIN_DPB ;@@ -2657,7 +2658,7 @@ intel_sdvo_select_i2c_bus(struct intel_sdvo *sdvo) sdvo->base.base.base.id, sdvo->base.base.name, pin, sdvo->target_addr); - sdvo->i2c =intel_gmbus_get_adapter (dev_priv, pin); + sdvo->i2c =intel_gmbus_get_adapter (display, pin);/* * With gmbus we should be able to drive sdvo i2c at 2MHz, but somehow drivers/gpu/drm/i915/i915_suspend.c +1
-1@@ -137,5 +137,5 @@ void i915_restore_display(struct drm_i915_private *dev_priv)intel_vga_redisable (display); -intel_gmbus_reset (dev_priv); +intel_gmbus_reset (display); }Signature · 1 line
2.39.5
PATCH 2/11 drm/i915/cx0: convert to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch Cx0 PHY code over to it.
--- drivers/gpu/drm/i915/display/intel_cx0_phy.c | 308 ++++++++++--------- drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- drivers/gpu/drm/i915/display/intel_display.c | 6 +- 3 files changed, 174 insertions(+), 148 deletions(-)
drivers/gpu/drm/i915/display/intel_cx0_phy.c +168 -140
@@ -65,22 +65,23 @@ static u8 intel_cx0_get_owned_lane_mask(struct intel_encoder *encoder) }static void -assert_dc_off (struct drm_i915_private *i915) +assert_dc_off (struct intel_display *display) { +struct drm_i915_private *i915 =to_i915 (display->drm);bool enabled; enabled =intel_display_power_is_enabled (i915,POWER_DOMAIN_DC_OFF ); -drm_WARN_ON (&i915->drm, !enabled); +drm_WARN_ON (display->drm, !enabled); }static void intel_cx0_program_msgbus_timer (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);int lane; -struct drm_i915_private *i915 =to_i915 (encoder->base.dev);for_each_cx0_lane_in_mask (INTEL_CX0_BOTH_LANES , lane) -intel_de_rmw (i915, -XELPDP_PORT_MSGBUS_TIMER (i915, encoder->port, lane), +intel_de_rmw (display, +XELPDP_PORT_MSGBUS_TIMER (display, encoder->port, lane),XELPDP_PORT_MSGBUS_TIMER_VAL_MASK ,XELPDP_PORT_MSGBUS_TIMER_VAL ); }
@@ -119,25 +120,29 @@ static void intel_cx0_phy_transaction_end(struct intel_encoder *encoder, intel_wstatic void intel_clear_response_ready_flag (struct intel_encoder *encoder,int lane) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -intel_de_rmw (i915,XELPDP_PORT_P2M_MSGBUS_STATUS (i915, encoder->port, lane), +intel_de_rmw (display, +XELPDP_PORT_P2M_MSGBUS_STATUS (i915, encoder->port, lane),0 ,XELPDP_PORT_P2M_RESPONSE_READY |XELPDP_PORT_P2M_ERROR_SET ); }static void intel_cx0_bus_reset (struct intel_encoder *encoder,int lane) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder); -intel_de_write (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +intel_de_write (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_RESET ); -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_RESET ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_err_once (&i915->drm,"Failed to bring PHY %c to idle.\n" ,phy_name (phy)); +drm_err_once (display->drm, +"Failed to bring PHY %c to idle.\n" , +phy_name (phy));return ; }
@@ -147,22 +152,23 @@ static void intel_cx0_bus_reset(struct intel_encoder *encoder, int lane)static int intel_cx0_wait_for_ack (struct intel_encoder *encoder,int command,int lane,u32 *val) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder); -if (intel_de_wait_custom (i915, -XELPDP_PORT_P2M_MSGBUS_STATUS (i915, port, lane), +if (intel_de_wait_custom (display, +XELPDP_PORT_P2M_MSGBUS_STATUS (display, port, lane),XELPDP_PORT_P2M_RESPONSE_READY ,XELPDP_PORT_P2M_RESPONSE_READY ,XELPDP_MSGBUS_TIMEOUT_FAST_US ,XELPDP_MSGBUS_TIMEOUT_SLOW , val)) { -drm_dbg_kms (&i915->drm,"PHY %c Timeout waiting for message ACK. Status: 0x%x\n" , +drm_dbg_kms (display->drm, +"PHY %c Timeout waiting for message ACK. Status: 0x%x\n" ,phy_name (phy), *val); -if (!(intel_de_read (i915,XELPDP_PORT_MSGBUS_TIMER (i915, port, lane)) & +if (!(intel_de_read (display,XELPDP_PORT_MSGBUS_TIMER (display, port, lane)) &XELPDP_PORT_MSGBUS_TIMER_TIMED_OUT )) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Hardware did not detect a timeout\n" ,phy_name (phy));
@@ -171,14 +177,18 @@ static int intel_cx0_wait_for_ack(struct intel_encoder *encoder, }if (*val &XELPDP_PORT_P2M_ERROR_SET ) { -drm_dbg_kms (&i915->drm,"PHY %c Error occurred during %s command. Status: 0x%x\n" ,phy_name (phy), +drm_dbg_kms (display->drm, +"PHY %c Error occurred during %s command. Status: 0x%x\n" , +phy_name (phy), command ==XELPDP_PORT_P2M_COMMAND_READ_ACK ?"read" :"write" , *val);intel_cx0_bus_reset (encoder, lane);return -EINVAL ; }if (REG_FIELD_GET (XELPDP_PORT_P2M_COMMAND_TYPE_MASK , *val) != command) { -drm_dbg_kms (&i915->drm,"PHY %c Not a %s response. MSGBUS Status: 0x%x.\n" ,phy_name (phy), +drm_dbg_kms (display->drm, +"PHY %c Not a %s response. MSGBUS Status: 0x%x.\n" , +phy_name (phy), command ==XELPDP_PORT_P2M_COMMAND_READ_ACK ?"read" :"write" , *val);intel_cx0_bus_reset (encoder, lane);return -EINVAL ;
@@ -190,22 +200,22 @@ static int intel_cx0_wait_for_ack(struct intel_encoder *encoder,static int __intel_cx0_read_once (struct intel_encoder *encoder,int lane,u16 addr) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder);int ack;u32 val; -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for previous transaction to complete. Reset the bus and retry.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -ETIMEDOUT ; } -intel_de_write (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +intel_de_write (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING |XELPDP_PORT_M2P_COMMAND_READ |XELPDP_PORT_M2P_ADDRESS (addr));
@@ -229,11 +239,11 @@ static int __intel_cx0_read_once(struct intel_encoder *encoder,static u8 __intel_cx0_read (struct intel_encoder *encoder,int lane,u16 addr) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);int i, status; -assert_dc_off (i915); +assert_dc_off (display);/* 3 tries is assumed to be enough to read successfully */ for (i =0 ; i <3 ; i++) {
@@ -243,7 +253,8 @@ static u8 __intel_cx0_read(struct intel_encoder *encoder,return status; } -drm_err_once (&i915->drm,"PHY %c Read %04x failed after %d retries.\n" , +drm_err_once (display->drm, +"PHY %c Read %04x failed after %d retries.\n" ,phy_name (phy), addr, i);return 0 ;
@@ -260,32 +271,32 @@ static u8 intel_cx0_read(struct intel_encoder *encoder,static int __intel_cx0_write_once (struct intel_encoder *encoder,int lane,u16 addr,u8 data,bool committed) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder);int ack;u32 val; -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for previous transaction to complete. Resetting the bus.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -ETIMEDOUT ; } -intel_de_write (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +intel_de_write (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING | (committed ?XELPDP_PORT_M2P_COMMAND_WRITE_COMMITTED :XELPDP_PORT_M2P_COMMAND_WRITE_UNCOMMITTED ) |XELPDP_PORT_M2P_DATA (data) |XELPDP_PORT_M2P_ADDRESS (addr)); -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for write to complete. Resetting the bus.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -ETIMEDOUT ;
@@ -295,9 +306,9 @@ static int __intel_cx0_write_once(struct intel_encoder *encoder, ack =intel_cx0_wait_for_ack (encoder,XELPDP_PORT_P2M_COMMAND_WRITE_ACK , lane, &val);if (ack <0 )return ack; - }else if ((intel_de_read (i915,XELPDP_PORT_P2M_MSGBUS_STATUS (i915, port, lane)) & + }else if ((intel_de_read (display,XELPDP_PORT_P2M_MSGBUS_STATUS (display, port, lane)) &XELPDP_PORT_P2M_ERROR_SET )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Error occurred during write command.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -EINVAL ;
@@ -318,11 +329,11 @@ static int __intel_cx0_write_once(struct intel_encoder *encoder,static void __intel_cx0_write (struct intel_encoder *encoder,int lane,u16 addr,u8 data,bool committed) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);int i, status; -assert_dc_off (i915); +assert_dc_off (display);/* 3 tries is assumed to be enough to write successfully */ for (i =0 ; i <3 ; i++) {
@@ -332,7 +343,7 @@ static void __intel_cx0_write(struct intel_encoder *encoder,return ; } -drm_err_once (&i915->drm, +drm_err_once (display->drm,"PHY %c Write %04x failed after %d retries.\n" ,phy_name (phy), addr, i); }
@@ -348,9 +359,9 @@ static void intel_cx0_write(struct intel_encoder *encoder,static void intel_c20_sram_write (struct intel_encoder *encoder,int lane,u16 addr,u16 data) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder); -assert_dc_off (i915); +assert_dc_off (display);intel_cx0_write (encoder, lane,PHY_C20_WR_ADDRESS_H , addr >>8 ,0 );intel_cx0_write (encoder, lane,PHY_C20_WR_ADDRESS_L , addr &0xff ,0 );
@@ -362,10 +373,10 @@ static void intel_c20_sram_write(struct intel_encoder *encoder,static u16 intel_c20_sram_read (struct intel_encoder *encoder,int lane,u16 addr) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);u16 val; -assert_dc_off (i915); +assert_dc_off (display);intel_cx0_write (encoder, lane,PHY_C20_RD_ADDRESS_H , addr >>8 ,0 );intel_cx0_write (encoder, lane,PHY_C20_RD_ADDRESS_L , addr &0xff ,1 );
@@ -429,7 +440,7 @@ static u8 intel_c10_get_tx_term_ctl(const struct intel_crtc_state *crtc_state)void intel_cx0_phy_set_signal_levels (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);const struct intel_ddi_buf_trans *trans;u8 owned_lane_mask;intel_wakeref_t wakeref;
@@ -444,7 +455,7 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, wakeref =intel_cx0_phy_transaction_begin (encoder); trans = encoder->get_buf_trans (encoder, crtc_state, &n_entries); -if (drm_WARN_ON_ONCE (&i915->drm, !trans)) { +if (drm_WARN_ON_ONCE (display->drm, !trans)) {intel_cx0_phy_transaction_end (encoder, wakeref);return ; }
@@ -2003,6 +2014,7 @@ intel_c10pll_tables_get(struct intel_crtc_state *crtc_state,static void intel_c10pll_update_pll (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (crtc_state);struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_cx0pll_state *pll_state = &crtc_state->dpll_hw_state.cx0pll;int i;
@@ -2019,7 +2031,7 @@ static void intel_c10pll_update_pll(struct intel_crtc_state *crtc_state,if (pll_state->ssc_enabled)return ; -drm_WARN_ON (&i915->drm,ARRAY_SIZE (pll_state->c10.pll) <9 ); +drm_WARN_ON (display->drm,ARRAY_SIZE (pll_state->c10.pll) <9 );for (i =4 ; i <9 ; i++) pll_state->c10.pll[i] =0 ; }
@@ -2073,7 +2085,7 @@ static void intel_c10pll_readout_hw_state(struct intel_encoder *encoder,intel_cx0_phy_transaction_end (encoder, wakeref); } -static void intel_c10_pll_program (struct drm_i915_private *i915, +static void intel_c10_pll_program (struct intel_display *display,const struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) {
@@ -2106,7 +2118,7 @@ static void intel_c10_pll_program(struct drm_i915_private *i915, MB_WRITE_COMMITTED); } -static void intel_c10pll_dump_hw_state (struct drm_i915_private *i915, +static void intel_c10pll_dump_hw_state (struct intel_display *display,const struct intel_c10pll_state *hw_state) {bool fracen;
@@ -2115,29 +2127,31 @@ static void intel_c10pll_dump_hw_state(struct drm_i915_private *i915,unsigned int multiplier, tx_clk_div; fracen = hw_state->pll[0 ] &C10_PLL0_FRACEN ; -drm_dbg_kms (&i915->drm,"c10pll_hw_state: fracen: %s, " , +drm_dbg_kms (display->drm,"c10pll_hw_state: fracen: %s, " ,str_yes_no (fracen));if (fracen) { frac_quot = hw_state->pll[12 ] <<8 | hw_state->pll[11 ]; frac_rem = hw_state->pll[14 ] <<8 | hw_state->pll[13 ]; frac_den = hw_state->pll[10 ] <<8 | hw_state->pll[9 ]; -drm_dbg_kms (&i915->drm,"quot: %u, rem: %u, den: %u,\n" , +drm_dbg_kms (display->drm,"quot: %u, rem: %u, den: %u,\n" , frac_quot, frac_rem, frac_den); } multiplier = (REG_FIELD_GET8 (C10_PLL3_MULTIPLIERH_MASK , hw_state->pll[3 ]) <<8 | hw_state->pll[2 ]) /2 +16 ; tx_clk_div =REG_FIELD_GET8 (C10_PLL15_TXCLKDIV_MASK , hw_state->pll[15 ]); -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"multiplier: %u, tx_clk_div: %u.\n" , multiplier, tx_clk_div); -drm_dbg_kms (&i915->drm,"c10pll_rawhw_state:" ); -drm_dbg_kms (&i915->drm,"tx: 0x%x, cmn: 0x%x\n" , hw_state->tx, hw_state->cmn); +drm_dbg_kms (display->drm,"c10pll_rawhw_state:" ); +drm_dbg_kms (display->drm,"tx: 0x%x, cmn: 0x%x\n" , hw_state->tx, + hw_state->cmn);BUILD_BUG_ON (ARRAY_SIZE (hw_state->pll) %4 );for (i =0 ; i <ARRAY_SIZE (hw_state->pll); i = i +4 ) -drm_dbg_kms (&i915->drm,"pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x\n" , +drm_dbg_kms (display->drm, +"pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x\n" , i, hw_state->pll[i], i +1 , hw_state->pll[i +1 ], i +2 , hw_state->pll[i +2 ], i +3 , hw_state->pll[i +3 ]); }
@@ -2239,13 +2253,13 @@ static const struct intel_c20pll_state * const * intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, struct intel_encoder *encoder) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(crtc_state);if (intel_crtc_has_dp_encoder (crtc_state)) {if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ))return xe2hpd_c20_edp_tables; -if (DISPLAY_VER_FULL (i915) ==IP_VER (14 ,1 )) +if (DISPLAY_VER_FULL (display) ==IP_VER (14 ,1 ))return xe2hpd_c20_dp_tables;else return mtl_c20_dp_tables;
@@ -2412,33 +2426,37 @@ static void intel_c20pll_readout_hw_state(struct intel_encoder *encoder,intel_cx0_phy_transaction_end (encoder, wakeref); } -static void intel_c20pll_dump_hw_state (struct drm_i915_private *i915, +static void intel_c20pll_dump_hw_state (struct intel_display *display,const struct intel_c20pll_state *hw_state) {int i; -drm_dbg_kms (&i915->drm,"c20pll_hw_state:\n" ); -drm_dbg_kms (&i915->drm,"tx[0] = 0x%.4x, tx[1] = 0x%.4x, tx[2] = 0x%.4x\n" , +drm_dbg_kms (display->drm,"c20pll_hw_state:\n" ); +drm_dbg_kms (display->drm, +"tx[0] = 0x%.4x, tx[1] = 0x%.4x, tx[2] = 0x%.4x\n" , hw_state->tx[0 ], hw_state->tx[1 ], hw_state->tx[2 ]); -drm_dbg_kms (&i915->drm,"cmn[0] = 0x%.4x, cmn[1] = 0x%.4x, cmn[2] = 0x%.4x, cmn[3] = 0x%.4x\n" , +drm_dbg_kms (display->drm, +"cmn[0] = 0x%.4x, cmn[1] = 0x%.4x, cmn[2] = 0x%.4x, cmn[3] = 0x%.4x\n" , hw_state->cmn[0 ], hw_state->cmn[1 ], hw_state->cmn[2 ], hw_state->cmn[3 ]);if (intel_c20phy_use_mpllb (hw_state)) {for (i =0 ; i <ARRAY_SIZE (hw_state->mpllb); i++) -drm_dbg_kms (&i915->drm,"mpllb[%d] = 0x%.4x\n" , i, hw_state->mpllb[i]); +drm_dbg_kms (display->drm,"mpllb[%d] = 0x%.4x\n" , i, + hw_state->mpllb[i]); }else {for (i =0 ; i <ARRAY_SIZE (hw_state->mplla); i++) -drm_dbg_kms (&i915->drm,"mplla[%d] = 0x%.4x\n" , i, hw_state->mplla[i]); +drm_dbg_kms (display->drm,"mplla[%d] = 0x%.4x\n" , i, + hw_state->mplla[i]); } } -void intel_cx0pll_dump_hw_state (struct drm_i915_private *i915, +void intel_cx0pll_dump_hw_state (struct intel_display *display,const struct intel_cx0pll_state *hw_state) {if (hw_state->use_c10) -intel_c10pll_dump_hw_state (i915, &hw_state->c10); +intel_c10pll_dump_hw_state (display, &hw_state->c10);else -intel_c20pll_dump_hw_state (i915, &hw_state->c20); +intel_c20pll_dump_hw_state (display, &hw_state->c20); }static u8 intel_c20_get_dp_rate (u32 clock)
@@ -2538,7 +2556,7 @@ static int intel_get_c20_custom_width(u32 clock, bool dp)return 0 ; } -static void intel_c20_pll_program (struct drm_i915_private *i915, +static void intel_c20_pll_program (struct intel_display *display,const struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) {
@@ -2571,11 +2589,11 @@ static void intel_c20_pll_program(struct drm_i915_private *i915,for (i =0 ; i <ARRAY_SIZE (pll_state->tx); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_TX_CNTX_CFG (i915, i), +PHY_C20_A_TX_CNTX_CFG (display, i), pll_state->tx[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_TX_CNTX_CFG (i915, i), +PHY_C20_B_TX_CNTX_CFG (display, i), pll_state->tx[i]); }
@@ -2583,11 +2601,11 @@ static void intel_c20_pll_program(struct drm_i915_private *i915,for (i =0 ; i <ARRAY_SIZE (pll_state->cmn); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_CMN_CNTX_CFG (i915, i), +PHY_C20_A_CMN_CNTX_CFG (display, i), pll_state->cmn[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_CMN_CNTX_CFG (i915, i), +PHY_C20_B_CMN_CNTX_CFG (display, i), pll_state->cmn[i]); }
@@ -2596,22 +2614,22 @@ static void intel_c20_pll_program(struct drm_i915_private *i915,for (i =0 ; i <ARRAY_SIZE (pll_state->mpllb); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_MPLLB_CNTX_CFG (i915, i), +PHY_C20_A_MPLLB_CNTX_CFG (display, i), pll_state->mpllb[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_MPLLB_CNTX_CFG (i915, i), +PHY_C20_B_MPLLB_CNTX_CFG (display, i), pll_state->mpllb[i]); } }else {for (i =0 ; i <ARRAY_SIZE (pll_state->mplla); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_MPLLA_CNTX_CFG (i915, i), +PHY_C20_A_MPLLA_CNTX_CFG (display, i), pll_state->mplla[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_MPLLA_CNTX_CFG (i915, i), +PHY_C20_B_MPLLA_CNTX_CFG (display, i), pll_state->mplla[i]); } }
@@ -2678,10 +2696,10 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, bool lane_reversal) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);u32 val =0 ; -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL1 (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_BUF_CTL1 (display, encoder->port),XELPDP_PORT_REVERSAL , lane_reversal ?XELPDP_PORT_REVERSAL :0 );
@@ -2703,7 +2721,7 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder,else val |= crtc_state->dpll_hw_state.cx0pll.ssc_enabled ?XELPDP_SSC_ENABLE_PLLB :0 ; -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_LANE1_PHY_CLOCK_SELECT |XELPDP_FORWARD_CLOCK_UNGATE |XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_SSC_ENABLE_PLLA |XELPDP_SSC_ENABLE_PLLB , val);
@@ -2734,48 +2752,49 @@ static u32 intel_cx0_get_powerdown_state(u8 lane_mask, u8 state)static void intel_cx0_powerdown_change_sequence (struct intel_encoder *encoder,u8 lane_mask,u8 state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder); -i915_reg_t buf_ctl2_reg =XELPDP_PORT_BUF_CTL2 (i915, port); +i915_reg_t buf_ctl2_reg =XELPDP_PORT_BUF_CTL2 (display, port);int lane; -intel_de_rmw (i915, buf_ctl2_reg, +intel_de_rmw (display, buf_ctl2_reg,intel_cx0_get_powerdown_state (INTEL_CX0_BOTH_LANES ,XELPDP_LANE_POWERDOWN_NEW_STATE_MASK ),intel_cx0_get_powerdown_state (lane_mask, state));/* Wait for pending transactions.*/ for_each_cx0_lane_in_mask (lane_mask, lane) -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for previous transaction to complete. Reset the bus.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane); } -intel_de_rmw (i915, buf_ctl2_reg, +intel_de_rmw (display, buf_ctl2_reg,intel_cx0_get_powerdown_update (INTEL_CX0_BOTH_LANES ),intel_cx0_get_powerdown_update (lane_mask));/* Update Timeout Value */ -if (intel_de_wait_custom (i915, buf_ctl2_reg, +if (intel_de_wait_custom (display, buf_ctl2_reg,intel_cx0_get_powerdown_update (lane_mask),0 ,XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to bring out of Lane reset after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of Lane reset after %dus.\n" ,phy_name (phy),XELPDP_PORT_RESET_START_TIMEOUT_US ); }static void intel_cx0_setup_powerdown (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port; -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL2 (i915, port), +intel_de_rmw (display,XELPDP_PORT_BUF_CTL2 (display, port),XELPDP_POWER_STATE_READY_MASK ,XELPDP_POWER_STATE_READY (CX0_P2_STATE_READY )); - intel_de_rmw(i915, XELPDP_PORT_BUF_CTL3(i915, port), + intel_de_rmw(display, XELPDP_PORT_BUF_CTL3(display, port), XELPDP_POWER_STATE_ACTIVE_MASK | XELPDP_PLL_LANE_STAGGERING_DELAY_MASK, XELPDP_POWER_STATE_ACTIVE(CX0_P0_STATE_ACTIVE) |
@@ -2807,7 +2826,7 @@ static u32 intel_cx0_get_pclk_refclk_ack(u8 lane_mask)static void intel_cx0_phy_lane_reset (struct intel_encoder *encoder,bool lane_reversal) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder);u8 owned_lane_mask =intel_cx0_get_owned_lane_mask (encoder);
@@ -2820,48 +2839,51 @@ static void intel_cx0_phy_lane_reset(struct intel_encoder *encoder, XELPDP_LANE_PHY_CURRENT_STATUS(1)) : XELPDP_LANE_PHY_CURRENT_STATUS(0); -if (intel_de_wait_custom (i915,XELPDP_PORT_BUF_CTL1 (i915, port), +if (intel_de_wait_custom (display,XELPDP_PORT_BUF_CTL1 (display, port),XELPDP_PORT_BUF_SOC_PHY_READY ,XELPDP_PORT_BUF_SOC_PHY_READY ,XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to bring out of SOC reset after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of SOC reset after %dus.\n" ,phy_name (phy),XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US ); -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL2 (i915, port), lane_pipe_reset, +intel_de_rmw (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_pipe_reset, lane_pipe_reset); -if (intel_de_wait_custom (i915,XELPDP_PORT_BUF_CTL2 (i915, port), +if (intel_de_wait_custom (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_phy_current_status, lane_phy_current_status,XELPDP_PORT_RESET_START_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to bring out of Lane reset after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of Lane reset after %dus.\n" ,phy_name (phy),XELPDP_PORT_RESET_START_TIMEOUT_US ); -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, port),intel_cx0_get_pclk_refclk_request (owned_lane_mask),intel_cx0_get_pclk_refclk_request (lane_mask)); -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, port),intel_cx0_get_pclk_refclk_ack (owned_lane_mask),intel_cx0_get_pclk_refclk_ack (lane_mask),XELPDP_REFCLK_ENABLE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to request refclk after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to request refclk after %dus.\n" ,phy_name (phy),XELPDP_REFCLK_ENABLE_TIMEOUT_US );intel_cx0_powerdown_change_sequence (encoder,INTEL_CX0_BOTH_LANES ,CX0_P2_STATE_RESET );intel_cx0_setup_powerdown (encoder); -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL2 (i915, port), lane_pipe_reset,0 ); +intel_de_rmw (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_pipe_reset,0 ); -if (intel_de_wait_for_clear (i915,XELPDP_PORT_BUF_CTL2 (i915, port), +if (intel_de_wait_for_clear (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_phy_current_status,XELPDP_PORT_RESET_END_TIMEOUT )) -drm_warn (&i915->drm,"PHY %c failed to bring out of Lane reset after %dms.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of Lane reset after %dms.\n" ,phy_name (phy),XELPDP_PORT_RESET_END_TIMEOUT ); } -static void intel_cx0_program_phy_lane (struct drm_i915_private *i915, -struct intel_encoder *encoder,int lane_count, +static void intel_cx0_program_phy_lane (struct intel_encoder *encoder,int lane_count,bool lane_reversal) {int i;
@@ -2930,7 +2952,7 @@ static u32 intel_cx0_get_pclk_pll_ack(u8 lane_mask)static void intel_cx0pll_enable (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder);bool lane_reversal = dig_port->saved_port_bits &DDI_BUF_PORT_REVERSAL ;
@@ -2962,15 +2984,15 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,/* 5. Program PHY internal PLL internal registers. */ if (intel_encoder_is_c10phy (encoder)) -intel_c10_pll_program (i915, crtc_state, encoder); +intel_c10_pll_program (display, crtc_state, encoder);else -intel_c20_pll_program (i915, crtc_state, encoder); +intel_c20_pll_program (display, crtc_state, encoder);/* * 6. Program the enabled and disabled owned PHY lane * transmitters over message bus */ -intel_cx0_program_phy_lane (i915, encoder, crtc_state->lane_count, lane_reversal); +intel_cx0_program_phy_lane (encoder, crtc_state->lane_count, lane_reversal);/* * 7. Follow the Display Voltage Frequency Switching - Sequence
@@ -2981,23 +3003,23 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,* 8. Program DDI_CLK_VALFREQ to match intended DDI * clock frequency. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port), +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port), crtc_state->port_clock);/* * 9. Set PORT_CLOCK_CTL register PCLK PLL Request * LN<Lane for maxPCLK> to "1" to enable PLL. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_request (INTEL_CX0_BOTH_LANES ),intel_cx0_get_pclk_pll_request (maxpclk_lane));/* 10. Poll on PORT_CLOCK_CTL PCLK PLL Ack LN<Lane for maxPCLK> == "1". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_ack (INTEL_CX0_BOTH_LANES ),intel_cx0_get_pclk_pll_ack (maxpclk_lane),XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"Port %c PLL not locked after %dus.\n" , +drm_warn (display->drm,"Port %c PLL not locked after %dus.\n" ,phy_name (phy),XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US );/*
@@ -3011,15 +3033,16 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,int intel_mtl_tbt_calc_port_clock (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -u32 clock; -u32 val =intel_de_read (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port)); +struct intel_display *display =to_intel_display (encoder); +u32 clock, val; + + val =intel_de_read (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port)); clock =REG_FIELD_GET (XELPDP_DDI_CLOCK_SELECT_MASK , val); -drm_WARN_ON (&i915->drm, !(val &XELPDP_FORWARD_CLOCK_UNGATE )); -drm_WARN_ON (&i915->drm, !(val &XELPDP_TBT_CLOCK_REQUEST )); -drm_WARN_ON (&i915->drm, !(val &XELPDP_TBT_CLOCK_ACK )); +drm_WARN_ON (display->drm, !(val &XELPDP_FORWARD_CLOCK_UNGATE )); +drm_WARN_ON (display->drm, !(val &XELPDP_TBT_CLOCK_REQUEST )); +drm_WARN_ON (display->drm, !(val &XELPDP_TBT_CLOCK_ACK ));switch (clock) {case XELPDP_DDI_CLOCK_SELECT_TBT_162 :
@@ -3036,7 +3059,7 @@ int intel_mtl_tbt_calc_port_clock(struct intel_encoder *encoder) } } -static int intel_mtl_tbt_clock_select (struct drm_i915_private *i915,int clock) +static int intel_mtl_tbt_clock_select (int clock) {switch (clock) {case 162000 :
@@ -3056,7 +3079,7 @@ static int intel_mtl_tbt_clock_select(struct drm_i915_private *i915, int clock)static void intel_mtl_tbt_pll_enable (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);u32 val =0 ;
@@ -3064,13 +3087,13 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,* 1. Program PORT_CLOCK_CTL REGISTER to configure * clock muxes, gating and SSC */ - val |=XELPDP_DDI_CLOCK_SELECT (intel_mtl_tbt_clock_select (i915, crtc_state->port_clock)); + val |=XELPDP_DDI_CLOCK_SELECT (intel_mtl_tbt_clock_select (crtc_state->port_clock)); val |=XELPDP_FORWARD_CLOCK_UNGATE ; -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_FORWARD_CLOCK_UNGATE , val);/* 2. Read back PORT_CLOCK_CTL REGISTER */ - val =intel_de_read (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port)); + val =intel_de_read (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port));/* * 3. Follow the Display Voltage Frequency Switching - Sequence
@@ -3081,14 +3104,15 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,* 4. Set PORT_CLOCK_CTL register TBT CLOCK Request to "1" to enable PLL. */ val |=XELPDP_TBT_CLOCK_REQUEST ; -intel_de_write (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), val); +intel_de_write (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port), val);/* 5. Poll on PORT_CLOCK_CTL TBT CLOCK Ack == "1". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_TBT_CLOCK_ACK ,XELPDP_TBT_CLOCK_ACK ,100 ,0 ,NULL )) -drm_warn (&i915->drm,"[ENCODER:%d:%s][%c] PHY PLL not locked after 100us.\n" , +drm_warn (display->drm, +"[ENCODER:%d:%s][%c] PHY PLL not locked after 100us.\n" , encoder->base.base.id, encoder->base.name,phy_name (phy));/*
@@ -3100,7 +3124,7 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,* 7. Program DDI_CLK_VALFREQ to match intended DDI * clock frequency. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port), +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port), crtc_state->port_clock); }
@@ -3130,7 +3154,7 @@ static u8 cx0_power_control_disable_val(struct intel_encoder *encoder)static void intel_cx0pll_disable (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);intel_wakeref_t wakeref =intel_cx0_phy_transaction_begin (encoder);
@@ -3147,21 +3171,22 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)* 3. Set PORT_CLOCK_CTL register PCLK PLL Request LN<Lane for maxPCLK> * to "0" to disable PLL. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_request (INTEL_CX0_BOTH_LANES ) |intel_cx0_get_pclk_refclk_request (INTEL_CX0_BOTH_LANES ),0 );/* 4. Program DDI_CLK_VALFREQ to 0. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port),0 ); +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port),0 );/* * 5. Poll on PORT_CLOCK_CTL PCLK PLL Ack LN<Lane for maxPCLK**> == "0". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_ack (INTEL_CX0_BOTH_LANES ) |intel_cx0_get_pclk_refclk_ack (INTEL_CX0_BOTH_LANES ),0 ,XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"Port %c PLL not unlocked after %dus.\n" , +drm_warn (display->drm, +"Port %c PLL not unlocked after %dus.\n" ,phy_name (phy),XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US );/*
@@ -3170,9 +3195,9 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)*/ /* 7. Program PORT_CLOCK_CTL register to disable and gate clocks. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_DDI_CLOCK_SELECT_MASK ,0 ); -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_FORWARD_CLOCK_UNGATE ,0 );intel_cx0_phy_transaction_end (encoder, wakeref);
@@ -3180,7 +3205,7 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)static void intel_mtl_tbt_pll_disable (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);/*
@@ -3191,13 +3216,14 @@ static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder)/* * 2. Set PORT_CLOCK_CTL register TBT CLOCK Request to "0" to disable PLL. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_TBT_CLOCK_REQUEST ,0 );/* 3. Poll on PORT_CLOCK_CTL TBT CLOCK Ack == "0". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_TBT_CLOCK_ACK ,0 ,10 ,0 ,NULL )) -drm_warn (&i915->drm,"[ENCODER:%d:%s][%c] PHY PLL not unlocked after 10us.\n" , +drm_warn (display->drm, +"[ENCODER:%d:%s][%c] PHY PLL not unlocked after 10us.\n" , encoder->base.base.id, encoder->base.name,phy_name (phy));/*
@@ -3208,12 +3234,12 @@ static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder)/* * 5. Program PORT CLOCK CTRL register to disable and gate clocks */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_FORWARD_CLOCK_UNGATE ,0 );/* 6. Program DDI_CLK_VALFREQ to 0. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port),0 ); +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port),0 ); }void intel_mtl_pll_disable (struct intel_encoder *encoder)
@@ -3230,13 +3256,15 @@ enum icl_port_dpll_id intel_mtl_port_pll_type(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder); +u32 val, clock; +/* * TODO: Determine the PLL type from the SW state, once MTL PLL * handling is done via the standard shared DPLL framework. */ -u32 val =intel_de_read (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port)); -u32 clock =REG_FIELD_GET (XELPDP_DDI_CLOCK_SELECT_MASK , val); + val =intel_de_read (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port)); + clock =REG_FIELD_GET (XELPDP_DDI_CLOCK_SELECT_MASK , val);if (clock ==XELPDP_DDI_CLOCK_SELECT_MAXPCLK || clock ==XELPDP_DDI_CLOCK_SELECT_DIV18CLK )
@@ -3408,13 +3436,13 @@ static void intel_c20pll_state_verify(const struct intel_crtc_state *state,void intel_cx0pll_state_verify (struct intel_atomic_state *state,struct intel_crtc *crtc) { -struct drm_i915_private *i915 =to_i915 (state->base.dev); +struct intel_display *display =to_intel_display (state);const struct intel_crtc_state *new_crtc_state =intel_atomic_get_new_crtc_state (state, crtc);struct intel_encoder *encoder;struct intel_cx0pll_state mpll_hw_state = {}; -if (DISPLAY_VER (i915) <14 ) +if (DISPLAY_VER (display) <14 )return ;if (!new_crtc_state->hw.active)
drivers/gpu/drm/i915/display/intel_cx0_phy.h +3 -5
@@ -7,17 +7,15 @@#define __INTEL_CX0_PHY_H__#include <linux/types.h> -#include <linux/bitfield.h> -#include <linux/bits.h> enum icl_port_dpll_id ; -struct drm_i915_private ;struct intel_atomic_state ;struct intel_c10pll_state ;struct intel_c20pll_state ; -struct intel_cx0pll_state ;struct intel_crtc ;struct intel_crtc_state ; +struct intel_cx0pll_state ; +struct intel_display ;struct intel_encoder ;struct intel_hdmi ;
@@ -35,7 +33,7 @@ void intel_cx0pll_readout_hw_state(struct intel_encoder *encoder,int intel_cx0pll_calc_port_clock (struct intel_encoder *encoder,const struct intel_cx0pll_state *pll_state); -void intel_cx0pll_dump_hw_state (struct drm_i915_private *dev_priv, +void intel_cx0pll_dump_hw_state (struct intel_display *display,const struct intel_cx0pll_state *hw_state);void intel_cx0pll_state_verify (struct intel_atomic_state *state,struct intel_crtc *crtc);
drivers/gpu/drm/i915/display/intel_display.c +3 -3
@@ -5305,15 +5305,15 @@ pipe_config_cx0pll_mismatch(struct drm_printer *p, bool fastset,const struct intel_cx0pll_state *a, const struct intel_cx0pll_state *b) { - struct drm_i915_private *i915 = to_i915(crtc->base.dev); + struct intel_display *display = to_intel_display(crtc);char *chipname = a->use_c10 ?"C10" :"C20" ;pipe_config_mismatch (p, fastset, crtc, name, chipname);drm_printf (p,"expected:\n" ); -intel_cx0pll_dump_hw_state (i915, a); +intel_cx0pll_dump_hw_state (display, a);drm_printf (p,"found:\n" ); -intel_cx0pll_dump_hw_state (i915, b); +intel_cx0pll_dump_hw_state (display, b); }bool
Signature · 1 line
2.39.5
Rodrigo Vivi
maintainerRe: [PATCH 02/11] drm/i915/cx0: convert to struct intel_display
Quoted 926 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch Cx0 PHY code over to it.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_cx0_phy.c | 308 ++++++++++--------- drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- drivers/gpu/drm/i915/display/intel_display.c | 6 +- 3 files changed, 174 insertions(+), 148 deletions(-)drivers/gpu/drm/i915/display/intel_cx0_phy.c +168
-140@@ -65,22 +65,23 @@ static u8 intel_cx0_get_owned_lane_mask(struct intel_encoder *encoder) }static void -assert_dc_off (struct drm_i915_private *i915) +assert_dc_off (struct intel_display *display) { +struct drm_i915_private *i915 =to_i915 (display->drm);bool enabled; enabled =intel_display_power_is_enabled (i915,POWER_DOMAIN_DC_OFF ); -drm_WARN_ON (&i915->drm, !enabled); +drm_WARN_ON (display->drm, !enabled); }static void intel_cx0_program_msgbus_timer (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);int lane; -struct drm_i915_private *i915 =to_i915 (encoder->base.dev);for_each_cx0_lane_in_mask (INTEL_CX0_BOTH_LANES , lane) -intel_de_rmw (i915, -XELPDP_PORT_MSGBUS_TIMER (i915, encoder->port, lane), +intel_de_rmw (display, +XELPDP_PORT_MSGBUS_TIMER (display, encoder->port, lane),XELPDP_PORT_MSGBUS_TIMER_VAL_MASK ,XELPDP_PORT_MSGBUS_TIMER_VAL ); }@@ -119,25 +120,29 @@ static void intel_cx0_phy_transaction_end(struct intel_encoder *encoder, intel_wstatic void intel_clear_response_ready_flag (struct intel_encoder *encoder,int lane) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -intel_de_rmw (i915,XELPDP_PORT_P2M_MSGBUS_STATUS (i915, encoder->port, lane), +intel_de_rmw (display, +XELPDP_PORT_P2M_MSGBUS_STATUS (i915, encoder->port, lane),0 ,XELPDP_PORT_P2M_RESPONSE_READY |XELPDP_PORT_P2M_ERROR_SET ); }static void intel_cx0_bus_reset (struct intel_encoder *encoder,int lane) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder); -intel_de_write (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +intel_de_write (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_RESET ); -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_RESET ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_err_once (&i915->drm,"Failed to bring PHY %c to idle.\n" ,phy_name (phy)); +drm_err_once (display->drm, +"Failed to bring PHY %c to idle.\n" , +phy_name (phy));return ; }@@ -147,22 +152,23 @@ static void intel_cx0_bus_reset(struct intel_encoder *encoder, int lane)static int intel_cx0_wait_for_ack (struct intel_encoder *encoder,int command,int lane,u32 *val) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder); -if (intel_de_wait_custom (i915, -XELPDP_PORT_P2M_MSGBUS_STATUS (i915, port, lane), +if (intel_de_wait_custom (display, +XELPDP_PORT_P2M_MSGBUS_STATUS (display, port, lane),XELPDP_PORT_P2M_RESPONSE_READY ,XELPDP_PORT_P2M_RESPONSE_READY ,XELPDP_MSGBUS_TIMEOUT_FAST_US ,XELPDP_MSGBUS_TIMEOUT_SLOW , val)) { -drm_dbg_kms (&i915->drm,"PHY %c Timeout waiting for message ACK. Status: 0x%x\n" , +drm_dbg_kms (display->drm, +"PHY %c Timeout waiting for message ACK. Status: 0x%x\n" ,phy_name (phy), *val); -if (!(intel_de_read (i915,XELPDP_PORT_MSGBUS_TIMER (i915, port, lane)) & +if (!(intel_de_read (display,XELPDP_PORT_MSGBUS_TIMER (display, port, lane)) &XELPDP_PORT_MSGBUS_TIMER_TIMED_OUT )) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Hardware did not detect a timeout\n" ,phy_name (phy));@@ -171,14 +177,18 @@ static int intel_cx0_wait_for_ack(struct intel_encoder *encoder, }if (*val &XELPDP_PORT_P2M_ERROR_SET ) { -drm_dbg_kms (&i915->drm,"PHY %c Error occurred during %s command. Status: 0x%x\n" ,phy_name (phy), +drm_dbg_kms (display->drm, +"PHY %c Error occurred during %s command. Status: 0x%x\n" , +phy_name (phy), command ==XELPDP_PORT_P2M_COMMAND_READ_ACK ?"read" :"write" , *val);intel_cx0_bus_reset (encoder, lane);return -EINVAL ; }if (REG_FIELD_GET (XELPDP_PORT_P2M_COMMAND_TYPE_MASK , *val) != command) { -drm_dbg_kms (&i915->drm,"PHY %c Not a %s response. MSGBUS Status: 0x%x.\n" ,phy_name (phy), +drm_dbg_kms (display->drm, +"PHY %c Not a %s response. MSGBUS Status: 0x%x.\n" , +phy_name (phy), command ==XELPDP_PORT_P2M_COMMAND_READ_ACK ?"read" :"write" , *val);intel_cx0_bus_reset (encoder, lane);return -EINVAL ;@@ -190,22 +200,22 @@ static int intel_cx0_wait_for_ack(struct intel_encoder *encoder,static int __intel_cx0_read_once (struct intel_encoder *encoder,int lane,u16 addr) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder);int ack;u32 val; -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for previous transaction to complete. Reset the bus and retry.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -ETIMEDOUT ; } -intel_de_write (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +intel_de_write (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING |XELPDP_PORT_M2P_COMMAND_READ |XELPDP_PORT_M2P_ADDRESS (addr));@@ -229,11 +239,11 @@ static int __intel_cx0_read_once(struct intel_encoder *encoder,static u8 __intel_cx0_read (struct intel_encoder *encoder,int lane,u16 addr) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);int i, status; -assert_dc_off (i915); +assert_dc_off (display);/* 3 tries is assumed to be enough to read successfully */ for (i =0 ; i <3 ; i++) {@@ -243,7 +253,8 @@ static u8 __intel_cx0_read(struct intel_encoder *encoder,return status; } -drm_err_once (&i915->drm,"PHY %c Read %04x failed after %d retries.\n" , +drm_err_once (display->drm, +"PHY %c Read %04x failed after %d retries.\n" ,phy_name (phy), addr, i);return 0 ;@@ -260,32 +271,32 @@ static u8 intel_cx0_read(struct intel_encoder *encoder,static int __intel_cx0_write_once (struct intel_encoder *encoder,int lane,u16 addr,u8 data,bool committed) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder);int ack;u32 val; -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for previous transaction to complete. Resetting the bus.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -ETIMEDOUT ; } -intel_de_write (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +intel_de_write (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING | (committed ?XELPDP_PORT_M2P_COMMAND_WRITE_COMMITTED :XELPDP_PORT_M2P_COMMAND_WRITE_UNCOMMITTED ) |XELPDP_PORT_M2P_DATA (data) |XELPDP_PORT_M2P_ADDRESS (addr)); -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for write to complete. Resetting the bus.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -ETIMEDOUT ;@@ -295,9 +306,9 @@ static int __intel_cx0_write_once(struct intel_encoder *encoder, ack =intel_cx0_wait_for_ack (encoder,XELPDP_PORT_P2M_COMMAND_WRITE_ACK , lane, &val);if (ack <0 )return ack; - }else if ((intel_de_read (i915,XELPDP_PORT_P2M_MSGBUS_STATUS (i915, port, lane)) & + }else if ((intel_de_read (display,XELPDP_PORT_P2M_MSGBUS_STATUS (display, port, lane)) &XELPDP_PORT_P2M_ERROR_SET )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Error occurred during write command.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane);return -EINVAL ;@@ -318,11 +329,11 @@ static int __intel_cx0_write_once(struct intel_encoder *encoder,static void __intel_cx0_write (struct intel_encoder *encoder,int lane,u16 addr,u8 data,bool committed) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);int i, status; -assert_dc_off (i915); +assert_dc_off (display);/* 3 tries is assumed to be enough to write successfully */ for (i =0 ; i <3 ; i++) {@@ -332,7 +343,7 @@ static void __intel_cx0_write(struct intel_encoder *encoder,return ; } -drm_err_once (&i915->drm, +drm_err_once (display->drm,"PHY %c Write %04x failed after %d retries.\n" ,phy_name (phy), addr, i); }@@ -348,9 +359,9 @@ static void intel_cx0_write(struct intel_encoder *encoder,static void intel_c20_sram_write (struct intel_encoder *encoder,int lane,u16 addr,u16 data) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder); -assert_dc_off (i915); +assert_dc_off (display);intel_cx0_write (encoder, lane,PHY_C20_WR_ADDRESS_H , addr >>8 ,0 );intel_cx0_write (encoder, lane,PHY_C20_WR_ADDRESS_L , addr &0xff ,0 );@@ -362,10 +373,10 @@ static void intel_c20_sram_write(struct intel_encoder *encoder,static u16 intel_c20_sram_read (struct intel_encoder *encoder,int lane,u16 addr) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);u16 val; -assert_dc_off (i915); +assert_dc_off (display);intel_cx0_write (encoder, lane,PHY_C20_RD_ADDRESS_H , addr >>8 ,0 );intel_cx0_write (encoder, lane,PHY_C20_RD_ADDRESS_L , addr &0xff ,1 );@@ -429,7 +440,7 @@ static u8 intel_c10_get_tx_term_ctl(const struct intel_crtc_state *crtc_state)void intel_cx0_phy_set_signal_levels (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);const struct intel_ddi_buf_trans *trans;u8 owned_lane_mask;intel_wakeref_t wakeref;@@ -444,7 +455,7 @@ void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, wakeref =intel_cx0_phy_transaction_begin (encoder); trans = encoder->get_buf_trans (encoder, crtc_state, &n_entries); -if (drm_WARN_ON_ONCE (&i915->drm, !trans)) { +if (drm_WARN_ON_ONCE (display->drm, !trans)) {intel_cx0_phy_transaction_end (encoder, wakeref);return ; }@@ -2003,6 +2014,7 @@ intel_c10pll_tables_get(struct intel_crtc_state *crtc_state,static void intel_c10pll_update_pll (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (crtc_state);struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_cx0pll_state *pll_state = &crtc_state->dpll_hw_state.cx0pll;int i;@@ -2019,7 +2031,7 @@ static void intel_c10pll_update_pll(struct intel_crtc_state *crtc_state,if (pll_state->ssc_enabled)return ; -drm_WARN_ON (&i915->drm,ARRAY_SIZE (pll_state->c10.pll) <9 ); +drm_WARN_ON (display->drm,ARRAY_SIZE (pll_state->c10.pll) <9 );for (i =4 ; i <9 ; i++) pll_state->c10.pll[i] =0 ; }@@ -2073,7 +2085,7 @@ static void intel_c10pll_readout_hw_state(struct intel_encoder *encoder,intel_cx0_phy_transaction_end (encoder, wakeref); } -static void intel_c10_pll_program (struct drm_i915_private *i915, +static void intel_c10_pll_program (struct intel_display *display,const struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) {@@ -2106,7 +2118,7 @@ static void intel_c10_pll_program(struct drm_i915_private *i915, MB_WRITE_COMMITTED); } -static void intel_c10pll_dump_hw_state (struct drm_i915_private *i915, +static void intel_c10pll_dump_hw_state (struct intel_display *display,const struct intel_c10pll_state *hw_state) {bool fracen;@@ -2115,29 +2127,31 @@ static void intel_c10pll_dump_hw_state(struct drm_i915_private *i915,unsigned int multiplier, tx_clk_div; fracen = hw_state->pll[0 ] &C10_PLL0_FRACEN ; -drm_dbg_kms (&i915->drm,"c10pll_hw_state: fracen: %s, " , +drm_dbg_kms (display->drm,"c10pll_hw_state: fracen: %s, " ,str_yes_no (fracen));if (fracen) { frac_quot = hw_state->pll[12 ] <<8 | hw_state->pll[11 ]; frac_rem = hw_state->pll[14 ] <<8 | hw_state->pll[13 ]; frac_den = hw_state->pll[10 ] <<8 | hw_state->pll[9 ]; -drm_dbg_kms (&i915->drm,"quot: %u, rem: %u, den: %u,\n" , +drm_dbg_kms (display->drm,"quot: %u, rem: %u, den: %u,\n" , frac_quot, frac_rem, frac_den); } multiplier = (REG_FIELD_GET8 (C10_PLL3_MULTIPLIERH_MASK , hw_state->pll[3 ]) <<8 | hw_state->pll[2 ]) /2 +16 ; tx_clk_div =REG_FIELD_GET8 (C10_PLL15_TXCLKDIV_MASK , hw_state->pll[15 ]); -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"multiplier: %u, tx_clk_div: %u.\n" , multiplier, tx_clk_div); -drm_dbg_kms (&i915->drm,"c10pll_rawhw_state:" ); -drm_dbg_kms (&i915->drm,"tx: 0x%x, cmn: 0x%x\n" , hw_state->tx, hw_state->cmn); +drm_dbg_kms (display->drm,"c10pll_rawhw_state:" ); +drm_dbg_kms (display->drm,"tx: 0x%x, cmn: 0x%x\n" , hw_state->tx, + hw_state->cmn);BUILD_BUG_ON (ARRAY_SIZE (hw_state->pll) %4 );for (i =0 ; i <ARRAY_SIZE (hw_state->pll); i = i +4 ) -drm_dbg_kms (&i915->drm,"pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x\n" , +drm_dbg_kms (display->drm, +"pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x, pll[%d] = 0x%x\n" , i, hw_state->pll[i], i +1 , hw_state->pll[i +1 ], i +2 , hw_state->pll[i +2 ], i +3 , hw_state->pll[i +3 ]); }@@ -2239,13 +2253,13 @@ static const struct intel_c20pll_state * const * intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, struct intel_encoder *encoder) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(crtc_state);if (intel_crtc_has_dp_encoder (crtc_state)) {if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ))return xe2hpd_c20_edp_tables; -if (DISPLAY_VER_FULL (i915) ==IP_VER (14 ,1 )) +if (DISPLAY_VER_FULL (display) ==IP_VER (14 ,1 ))return xe2hpd_c20_dp_tables;else return mtl_c20_dp_tables;@@ -2412,33 +2426,37 @@ static void intel_c20pll_readout_hw_state(struct intel_encoder *encoder,intel_cx0_phy_transaction_end (encoder, wakeref); } -static void intel_c20pll_dump_hw_state (struct drm_i915_private *i915, +static void intel_c20pll_dump_hw_state (struct intel_display *display,const struct intel_c20pll_state *hw_state) {int i; -drm_dbg_kms (&i915->drm,"c20pll_hw_state:\n" ); -drm_dbg_kms (&i915->drm,"tx[0] = 0x%.4x, tx[1] = 0x%.4x, tx[2] = 0x%.4x\n" , +drm_dbg_kms (display->drm,"c20pll_hw_state:\n" ); +drm_dbg_kms (display->drm, +"tx[0] = 0x%.4x, tx[1] = 0x%.4x, tx[2] = 0x%.4x\n" , hw_state->tx[0 ], hw_state->tx[1 ], hw_state->tx[2 ]); -drm_dbg_kms (&i915->drm,"cmn[0] = 0x%.4x, cmn[1] = 0x%.4x, cmn[2] = 0x%.4x, cmn[3] = 0x%.4x\n" , +drm_dbg_kms (display->drm, +"cmn[0] = 0x%.4x, cmn[1] = 0x%.4x, cmn[2] = 0x%.4x, cmn[3] = 0x%.4x\n" , hw_state->cmn[0 ], hw_state->cmn[1 ], hw_state->cmn[2 ], hw_state->cmn[3 ]);if (intel_c20phy_use_mpllb (hw_state)) {for (i =0 ; i <ARRAY_SIZE (hw_state->mpllb); i++) -drm_dbg_kms (&i915->drm,"mpllb[%d] = 0x%.4x\n" , i, hw_state->mpllb[i]); +drm_dbg_kms (display->drm,"mpllb[%d] = 0x%.4x\n" , i, + hw_state->mpllb[i]); }else {for (i =0 ; i <ARRAY_SIZE (hw_state->mplla); i++) -drm_dbg_kms (&i915->drm,"mplla[%d] = 0x%.4x\n" , i, hw_state->mplla[i]); +drm_dbg_kms (display->drm,"mplla[%d] = 0x%.4x\n" , i, + hw_state->mplla[i]); } } -void intel_cx0pll_dump_hw_state (struct drm_i915_private *i915, +void intel_cx0pll_dump_hw_state (struct intel_display *display,const struct intel_cx0pll_state *hw_state) {if (hw_state->use_c10) -intel_c10pll_dump_hw_state (i915, &hw_state->c10); +intel_c10pll_dump_hw_state (display, &hw_state->c10);else -intel_c20pll_dump_hw_state (i915, &hw_state->c20); +intel_c20pll_dump_hw_state (display, &hw_state->c20); }static u8 intel_c20_get_dp_rate (u32 clock)@@ -2538,7 +2556,7 @@ static int intel_get_c20_custom_width(u32 clock, bool dp)return 0 ; } -static void intel_c20_pll_program (struct drm_i915_private *i915, +static void intel_c20_pll_program (struct intel_display *display,const struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) {@@ -2571,11 +2589,11 @@ static void intel_c20_pll_program(struct drm_i915_private *i915,for (i =0 ; i <ARRAY_SIZE (pll_state->tx); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_TX_CNTX_CFG (i915, i), +PHY_C20_A_TX_CNTX_CFG (display, i), pll_state->tx[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_TX_CNTX_CFG (i915, i), +PHY_C20_B_TX_CNTX_CFG (display, i), pll_state->tx[i]); }@@ -2583,11 +2601,11 @@ static void intel_c20_pll_program(struct drm_i915_private *i915,for (i =0 ; i <ARRAY_SIZE (pll_state->cmn); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_CMN_CNTX_CFG (i915, i), +PHY_C20_A_CMN_CNTX_CFG (display, i), pll_state->cmn[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_CMN_CNTX_CFG (i915, i), +PHY_C20_B_CMN_CNTX_CFG (display, i), pll_state->cmn[i]); }@@ -2596,22 +2614,22 @@ static void intel_c20_pll_program(struct drm_i915_private *i915,for (i =0 ; i <ARRAY_SIZE (pll_state->mpllb); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_MPLLB_CNTX_CFG (i915, i), +PHY_C20_A_MPLLB_CNTX_CFG (display, i), pll_state->mpllb[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_MPLLB_CNTX_CFG (i915, i), +PHY_C20_B_MPLLB_CNTX_CFG (display, i), pll_state->mpllb[i]); } }else {for (i =0 ; i <ARRAY_SIZE (pll_state->mplla); i++) {if (cntx)intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_A_MPLLA_CNTX_CFG (i915, i), +PHY_C20_A_MPLLA_CNTX_CFG (display, i), pll_state->mplla[i]);else intel_c20_sram_write (encoder,INTEL_CX0_LANE0 , -PHY_C20_B_MPLLA_CNTX_CFG (i915, i), +PHY_C20_B_MPLLA_CNTX_CFG (display, i), pll_state->mplla[i]); } }@@ -2678,10 +2696,10 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, bool lane_reversal) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);u32 val =0 ; -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL1 (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_BUF_CTL1 (display, encoder->port),XELPDP_PORT_REVERSAL , lane_reversal ?XELPDP_PORT_REVERSAL :0 );@@ -2703,7 +2721,7 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder,else val |= crtc_state->dpll_hw_state.cx0pll.ssc_enabled ?XELPDP_SSC_ENABLE_PLLB :0 ; -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_LANE1_PHY_CLOCK_SELECT |XELPDP_FORWARD_CLOCK_UNGATE |XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_SSC_ENABLE_PLLA |XELPDP_SSC_ENABLE_PLLB , val);@@ -2734,48 +2752,49 @@ static u32 intel_cx0_get_powerdown_state(u8 lane_mask, u8 state)static void intel_cx0_powerdown_change_sequence (struct intel_encoder *encoder,u8 lane_mask,u8 state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder); -i915_reg_t buf_ctl2_reg =XELPDP_PORT_BUF_CTL2 (i915, port); +i915_reg_t buf_ctl2_reg =XELPDP_PORT_BUF_CTL2 (display, port);int lane; -intel_de_rmw (i915, buf_ctl2_reg, +intel_de_rmw (display, buf_ctl2_reg,intel_cx0_get_powerdown_state (INTEL_CX0_BOTH_LANES ,XELPDP_LANE_POWERDOWN_NEW_STATE_MASK ),intel_cx0_get_powerdown_state (lane_mask, state));/* Wait for pending transactions.*/ for_each_cx0_lane_in_mask (lane_mask, lane) -if (intel_de_wait_for_clear (i915,XELPDP_PORT_M2P_MSGBUS_CTL (i915, port, lane), +if (intel_de_wait_for_clear (display,XELPDP_PORT_M2P_MSGBUS_CTL (display, port, lane),XELPDP_PORT_M2P_TRANSACTION_PENDING ,XELPDP_MSGBUS_TIMEOUT_SLOW )) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"PHY %c Timeout waiting for previous transaction to complete. Reset the bus.\n" ,phy_name (phy));intel_cx0_bus_reset (encoder, lane); } -intel_de_rmw (i915, buf_ctl2_reg, +intel_de_rmw (display, buf_ctl2_reg,intel_cx0_get_powerdown_update (INTEL_CX0_BOTH_LANES ),intel_cx0_get_powerdown_update (lane_mask));/* Update Timeout Value */ -if (intel_de_wait_custom (i915, buf_ctl2_reg, +if (intel_de_wait_custom (display, buf_ctl2_reg,intel_cx0_get_powerdown_update (lane_mask),0 ,XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to bring out of Lane reset after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of Lane reset after %dus.\n" ,phy_name (phy),XELPDP_PORT_RESET_START_TIMEOUT_US ); }static void intel_cx0_setup_powerdown (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port; -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL2 (i915, port), +intel_de_rmw (display,XELPDP_PORT_BUF_CTL2 (display, port),XELPDP_POWER_STATE_READY_MASK ,XELPDP_POWER_STATE_READY (CX0_P2_STATE_READY )); - intel_de_rmw(i915, XELPDP_PORT_BUF_CTL3(i915, port), + intel_de_rmw(display, XELPDP_PORT_BUF_CTL3(display, port), XELPDP_POWER_STATE_ACTIVE_MASK | XELPDP_PLL_LANE_STAGGERING_DELAY_MASK, XELPDP_POWER_STATE_ACTIVE(CX0_P0_STATE_ACTIVE) |@@ -2807,7 +2826,7 @@ static u32 intel_cx0_get_pclk_refclk_ack(u8 lane_mask)static void intel_cx0_phy_lane_reset (struct intel_encoder *encoder,bool lane_reversal) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum phy phy =intel_encoder_to_phy (encoder);u8 owned_lane_mask =intel_cx0_get_owned_lane_mask (encoder);@@ -2820,48 +2839,51 @@ static void intel_cx0_phy_lane_reset(struct intel_encoder *encoder, XELPDP_LANE_PHY_CURRENT_STATUS(1)) : XELPDP_LANE_PHY_CURRENT_STATUS(0); -if (intel_de_wait_custom (i915,XELPDP_PORT_BUF_CTL1 (i915, port), +if (intel_de_wait_custom (display,XELPDP_PORT_BUF_CTL1 (display, port),XELPDP_PORT_BUF_SOC_PHY_READY ,XELPDP_PORT_BUF_SOC_PHY_READY ,XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to bring out of SOC reset after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of SOC reset after %dus.\n" ,phy_name (phy),XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US ); -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL2 (i915, port), lane_pipe_reset, +intel_de_rmw (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_pipe_reset, lane_pipe_reset); -if (intel_de_wait_custom (i915,XELPDP_PORT_BUF_CTL2 (i915, port), +if (intel_de_wait_custom (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_phy_current_status, lane_phy_current_status,XELPDP_PORT_RESET_START_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to bring out of Lane reset after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of Lane reset after %dus.\n" ,phy_name (phy),XELPDP_PORT_RESET_START_TIMEOUT_US ); -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, port),intel_cx0_get_pclk_refclk_request (owned_lane_mask),intel_cx0_get_pclk_refclk_request (lane_mask)); -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, port),intel_cx0_get_pclk_refclk_ack (owned_lane_mask),intel_cx0_get_pclk_refclk_ack (lane_mask),XELPDP_REFCLK_ENABLE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"PHY %c failed to request refclk after %dus.\n" , +drm_warn (display->drm, +"PHY %c failed to request refclk after %dus.\n" ,phy_name (phy),XELPDP_REFCLK_ENABLE_TIMEOUT_US );intel_cx0_powerdown_change_sequence (encoder,INTEL_CX0_BOTH_LANES ,CX0_P2_STATE_RESET );intel_cx0_setup_powerdown (encoder); -intel_de_rmw (i915,XELPDP_PORT_BUF_CTL2 (i915, port), lane_pipe_reset,0 ); +intel_de_rmw (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_pipe_reset,0 ); -if (intel_de_wait_for_clear (i915,XELPDP_PORT_BUF_CTL2 (i915, port), +if (intel_de_wait_for_clear (display,XELPDP_PORT_BUF_CTL2 (display, port), lane_phy_current_status,XELPDP_PORT_RESET_END_TIMEOUT )) -drm_warn (&i915->drm,"PHY %c failed to bring out of Lane reset after %dms.\n" , +drm_warn (display->drm, +"PHY %c failed to bring out of Lane reset after %dms.\n" ,phy_name (phy),XELPDP_PORT_RESET_END_TIMEOUT ); } -static void intel_cx0_program_phy_lane (struct drm_i915_private *i915, -struct intel_encoder *encoder,int lane_count, +static void intel_cx0_program_phy_lane (struct intel_encoder *encoder,int lane_count,bool lane_reversal) {int i;@@ -2930,7 +2952,7 @@ static u32 intel_cx0_get_pclk_pll_ack(u8 lane_mask)static void intel_cx0pll_enable (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder);bool lane_reversal = dig_port->saved_port_bits &DDI_BUF_PORT_REVERSAL ;@@ -2962,15 +2984,15 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,/* 5. Program PHY internal PLL internal registers. */ if (intel_encoder_is_c10phy (encoder)) -intel_c10_pll_program (i915, crtc_state, encoder); +intel_c10_pll_program (display, crtc_state, encoder);else -intel_c20_pll_program (i915, crtc_state, encoder); +intel_c20_pll_program (display, crtc_state, encoder);/* * 6. Program the enabled and disabled owned PHY lane * transmitters over message bus */ -intel_cx0_program_phy_lane (i915, encoder, crtc_state->lane_count, lane_reversal); +intel_cx0_program_phy_lane (encoder, crtc_state->lane_count, lane_reversal);/* * 7. Follow the Display Voltage Frequency Switching - Sequence @@ -2981,23 +3003,23 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,* 8. Program DDI_CLK_VALFREQ to match intended DDI * clock frequency. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port), +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port), crtc_state->port_clock);/* * 9. Set PORT_CLOCK_CTL register PCLK PLL Request * LN<Lane for maxPCLK> to "1" to enable PLL. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_request (INTEL_CX0_BOTH_LANES ),intel_cx0_get_pclk_pll_request (maxpclk_lane));/* 10. Poll on PORT_CLOCK_CTL PCLK PLL Ack LN<Lane for maxPCLK> == "1". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_ack (INTEL_CX0_BOTH_LANES ),intel_cx0_get_pclk_pll_ack (maxpclk_lane),XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"Port %c PLL not locked after %dus.\n" , +drm_warn (display->drm,"Port %c PLL not locked after %dus.\n" ,phy_name (phy),XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US );/* @@ -3011,15 +3033,16 @@ static void intel_cx0pll_enable(struct intel_encoder *encoder,int intel_mtl_tbt_calc_port_clock (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -u32 clock; -u32 val =intel_de_read (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port)); +struct intel_display *display =to_intel_display (encoder); +u32 clock, val; + + val =intel_de_read (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port)); clock =REG_FIELD_GET (XELPDP_DDI_CLOCK_SELECT_MASK , val); -drm_WARN_ON (&i915->drm, !(val &XELPDP_FORWARD_CLOCK_UNGATE )); -drm_WARN_ON (&i915->drm, !(val &XELPDP_TBT_CLOCK_REQUEST )); -drm_WARN_ON (&i915->drm, !(val &XELPDP_TBT_CLOCK_ACK )); +drm_WARN_ON (display->drm, !(val &XELPDP_FORWARD_CLOCK_UNGATE )); +drm_WARN_ON (display->drm, !(val &XELPDP_TBT_CLOCK_REQUEST )); +drm_WARN_ON (display->drm, !(val &XELPDP_TBT_CLOCK_ACK ));switch (clock) {case XELPDP_DDI_CLOCK_SELECT_TBT_162 :@@ -3036,7 +3059,7 @@ int intel_mtl_tbt_calc_port_clock(struct intel_encoder *encoder) } } -static int intel_mtl_tbt_clock_select (struct drm_i915_private *i915,int clock) +static int intel_mtl_tbt_clock_select (int clock) {switch (clock) {case 162000 :@@ -3056,7 +3079,7 @@ static int intel_mtl_tbt_clock_select(struct drm_i915_private *i915, int clock)static void intel_mtl_tbt_pll_enable (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);u32 val =0 ;@@ -3064,13 +3087,13 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,* 1. Program PORT_CLOCK_CTL REGISTER to configure * clock muxes, gating and SSC */ - val |=XELPDP_DDI_CLOCK_SELECT (intel_mtl_tbt_clock_select (i915, crtc_state->port_clock)); + val |=XELPDP_DDI_CLOCK_SELECT (intel_mtl_tbt_clock_select (crtc_state->port_clock)); val |=XELPDP_FORWARD_CLOCK_UNGATE ; -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_FORWARD_CLOCK_UNGATE , val);/* 2. Read back PORT_CLOCK_CTL REGISTER */ - val =intel_de_read (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port)); + val =intel_de_read (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port));/* * 3. Follow the Display Voltage Frequency Switching - Sequence @@ -3081,14 +3104,15 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,* 4. Set PORT_CLOCK_CTL register TBT CLOCK Request to "1" to enable PLL. */ val |=XELPDP_TBT_CLOCK_REQUEST ; -intel_de_write (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), val); +intel_de_write (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port), val);/* 5. Poll on PORT_CLOCK_CTL TBT CLOCK Ack == "1". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_TBT_CLOCK_ACK ,XELPDP_TBT_CLOCK_ACK ,100 ,0 ,NULL )) -drm_warn (&i915->drm,"[ENCODER:%d:%s][%c] PHY PLL not locked after 100us.\n" , +drm_warn (display->drm, +"[ENCODER:%d:%s][%c] PHY PLL not locked after 100us.\n" , encoder->base.base.id, encoder->base.name,phy_name (phy));/* @@ -3100,7 +3124,7 @@ static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,* 7. Program DDI_CLK_VALFREQ to match intended DDI * clock frequency. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port), +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port), crtc_state->port_clock); }@@ -3130,7 +3154,7 @@ static u8 cx0_power_control_disable_val(struct intel_encoder *encoder)static void intel_cx0pll_disable (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);intel_wakeref_t wakeref =intel_cx0_phy_transaction_begin (encoder);@@ -3147,21 +3171,22 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)* 3. Set PORT_CLOCK_CTL register PCLK PLL Request LN<Lane for maxPCLK> * to "0" to disable PLL. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_request (INTEL_CX0_BOTH_LANES ) |intel_cx0_get_pclk_refclk_request (INTEL_CX0_BOTH_LANES ),0 );/* 4. Program DDI_CLK_VALFREQ to 0. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port),0 ); +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port),0 );/* * 5. Poll on PORT_CLOCK_CTL PCLK PLL Ack LN<Lane for maxPCLK**> == "0". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),intel_cx0_get_pclk_pll_ack (INTEL_CX0_BOTH_LANES ) |intel_cx0_get_pclk_refclk_ack (INTEL_CX0_BOTH_LANES ),0 ,XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US ,0 ,NULL )) -drm_warn (&i915->drm,"Port %c PLL not unlocked after %dus.\n" , +drm_warn (display->drm, +"Port %c PLL not unlocked after %dus.\n" ,phy_name (phy),XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US );/* @@ -3170,9 +3195,9 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)*/ /* 7. Program PORT_CLOCK_CTL register to disable and gate clocks. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_DDI_CLOCK_SELECT_MASK ,0 ); -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_FORWARD_CLOCK_UNGATE ,0 );intel_cx0_phy_transaction_end (encoder, wakeref);@@ -3180,7 +3205,7 @@ static void intel_cx0pll_disable(struct intel_encoder *encoder)static void intel_mtl_tbt_pll_disable (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum phy phy =intel_encoder_to_phy (encoder);/* @@ -3191,13 +3216,14 @@ static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder)/* * 2. Set PORT_CLOCK_CTL register TBT CLOCK Request to "0" to disable PLL. */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_TBT_CLOCK_REQUEST ,0 );/* 3. Poll on PORT_CLOCK_CTL TBT CLOCK Ack == "0". */ -if (intel_de_wait_custom (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +if (intel_de_wait_custom (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_TBT_CLOCK_ACK ,0 ,10 ,0 ,NULL )) -drm_warn (&i915->drm,"[ENCODER:%d:%s][%c] PHY PLL not unlocked after 10us.\n" , +drm_warn (display->drm, +"[ENCODER:%d:%s][%c] PHY PLL not unlocked after 10us.\n" , encoder->base.base.id, encoder->base.name,phy_name (phy));/* @@ -3208,12 +3234,12 @@ static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder)/* * 5. Program PORT CLOCK CTRL register to disable and gate clocks */ -intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port), +intel_de_rmw (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port),XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_FORWARD_CLOCK_UNGATE ,0 );/* 6. Program DDI_CLK_VALFREQ to 0. */ -intel_de_write (i915,DDI_CLK_VALFREQ (encoder->port),0 ); +intel_de_write (display,DDI_CLK_VALFREQ (encoder->port),0 ); }void intel_mtl_pll_disable (struct intel_encoder *encoder)@@ -3230,13 +3256,15 @@ enum icl_port_dpll_id intel_mtl_port_pll_type(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder); +u32 val, clock; +/* * TODO: Determine the PLL type from the SW state, once MTL PLL * handling is done via the standard shared DPLL framework. */ -u32 val =intel_de_read (i915,XELPDP_PORT_CLOCK_CTL (i915, encoder->port)); -u32 clock =REG_FIELD_GET (XELPDP_DDI_CLOCK_SELECT_MASK , val); + val =intel_de_read (display,XELPDP_PORT_CLOCK_CTL (display, encoder->port)); + clock =REG_FIELD_GET (XELPDP_DDI_CLOCK_SELECT_MASK , val);if (clock ==XELPDP_DDI_CLOCK_SELECT_MAXPCLK || clock ==XELPDP_DDI_CLOCK_SELECT_DIV18CLK )@@ -3408,13 +3436,13 @@ static void intel_c20pll_state_verify(const struct intel_crtc_state *state,void intel_cx0pll_state_verify (struct intel_atomic_state *state,struct intel_crtc *crtc) { -struct drm_i915_private *i915 =to_i915 (state->base.dev); +struct intel_display *display =to_intel_display (state);const struct intel_crtc_state *new_crtc_state =intel_atomic_get_new_crtc_state (state, crtc);struct intel_encoder *encoder;struct intel_cx0pll_state mpll_hw_state = {}; -if (DISPLAY_VER (i915) <14 ) +if (DISPLAY_VER (display) <14 )return ;if (!new_crtc_state->hw.active)drivers/gpu/drm/i915/display/intel_cx0_phy.h +0
-0
drivers/gpu/drm/i915/display/intel_cx0_phy.h line 11
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.h +0
-2@@ -7,17 +7,15 @@#define __INTEL_CX0_PHY_H__#include <linux/types.h> -#include <linux/bitfield.h> -#include <linux/bits.h>
I believe this deserves a separate patch, no?!
Quoted 49 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.h +3
-3enum icl_port_dpll_id ; -struct drm_i915_private ;struct intel_atomic_state ;struct intel_c10pll_state ;struct intel_c20pll_state ; -struct intel_cx0pll_state ;struct intel_crtc ;struct intel_crtc_state ; +struct intel_cx0pll_state ; +struct intel_display ;struct intel_encoder ;struct intel_hdmi ;@@ -35,7 +33,7 @@ void intel_cx0pll_readout_hw_state(struct intel_encoder *encoder,int intel_cx0pll_calc_port_clock (struct intel_encoder *encoder,const struct intel_cx0pll_state *pll_state); -void intel_cx0pll_dump_hw_state (struct drm_i915_private *dev_priv, +void intel_cx0pll_dump_hw_state (struct intel_display *display,const struct intel_cx0pll_state *hw_state);void intel_cx0pll_state_verify (struct intel_atomic_state *state,struct intel_crtc *crtc);drivers/gpu/drm/i915/display/intel_display.c +3
-3@@ -5305,15 +5305,15 @@ pipe_config_cx0pll_mismatch(struct drm_printer *p, bool fastset,const struct intel_cx0pll_state *a, const struct intel_cx0pll_state *b) { - struct drm_i915_private *i915 = to_i915(crtc->base.dev); + struct intel_display *display = to_intel_display(crtc);char *chipname = a->use_c10 ?"C10" :"C20" ;pipe_config_mismatch (p, fastset, crtc, name, chipname);drm_printf (p,"expected:\n" ); -intel_cx0pll_dump_hw_state (i915, a); +intel_cx0pll_dump_hw_state (display, a);drm_printf (p,"found:\n" ); -intel_cx0pll_dump_hw_state (i915, b); +intel_cx0pll_dump_hw_state (display, b); }bool Signature · 1 line
2.39.5
PATCH 3/11 drm/i915/dpio: convert to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch DPIO PHY code over to it.
--- .../i915/display/intel_display_power_well.c | 19 ++- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 158 +++++++++--------- drivers/gpu/drm/i915/display/intel_dpio_phy.h | 22 +-- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 6 +- 4 files changed, 106 insertions(+), 99 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_well.c +13 -6
@@ -919,38 +919,45 @@ static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv,static void bxt_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -bxt_dpio_phy_init (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +bxt_dpio_phy_init (display,i915_power_well_instance (power_well)->bxt.phy); }static void bxt_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -bxt_dpio_phy_uninit (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +bxt_dpio_phy_uninit (display,i915_power_well_instance (power_well)->bxt.phy); }static bool bxt_dpio_cmn_power_well_enabled (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -return bxt_dpio_phy_is_enabled (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +return bxt_dpio_phy_is_enabled (display,i915_power_well_instance (power_well)->bxt.phy); }static void bxt_verify_dpio_phy_power_wells (struct drm_i915_private *dev_priv) { +struct intel_display *display = &dev_priv->display;struct i915_power_well *power_well; power_well =lookup_power_well (dev_priv,BXT_DISP_PW_DPIO_CMN_A );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy); power_well =lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy);if (IS_GEMINILAKE (dev_priv)) { power_well =lookup_power_well (dev_priv,GLK_DISP_PW_DPIO_CMN_C );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv, +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy); } }
drivers/gpu/drm/i915/display/intel_dpio_phy.c +78 -80
429 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dpio_phy.h +11 -11
@@ -10,9 +10,9 @@enum pipe ;enum port ; -struct drm_i915_private ;struct intel_crtc_state ;struct intel_digital_port ; +struct intel_display ;struct intel_encoder ;enum dpio_channel {
@@ -27,15 +27,15 @@ enum dpio_phy { };#ifdef I915 -void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch);void bxt_dpio_phy_set_signal_levels (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state); -void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy); -void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy); -bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy); +void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy); +bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy); -bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy);u8 bxt_dpio_phy_calc_lane_lat_optim_mask (u8 lane_count); void bxt_dpio_phy_set_lane_optim_mask(struct intel_encoder *encoder,
@@ -73,7 +73,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,void vlv_phy_reset_lanes (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state);#else -static inline void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +static inline void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch) { }
@@ -81,18 +81,18 @@ static inline void bxt_dpio_phy_set_signal_levels(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { } -static inline void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static inline void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy) { } -static inline void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static inline void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy) { } -static inline bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +static inline bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy) {return false; } -static inline bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +static inline bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy) {return true;
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +4 -2
@@ -2035,13 +2035,14 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *i915,struct intel_shared_dpll *pll, const struct intel_dpll_hw_state *dpll_hw_state) { + struct intel_display *display = &i915->display;const struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;enum port port = (enum port )pll->info->id;/* 1:1 port->PLL mapping */ enum dpio_phy phy;enum dpio_channel ch;u32 temp; -bxt_port_to_phy_channel (i915, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch);/* Non-SSC reference */ intel_de_rmw (i915,BXT_PORT_PLL_ENABLE (port),0 ,PORT_PLL_REF_SEL );
@@ -2157,6 +2158,7 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *i915,struct intel_shared_dpll *pll, struct intel_dpll_hw_state *dpll_hw_state) { + struct intel_display *display = &i915->display;struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;enum port port = (enum port )pll->info->id;/* 1:1 port->PLL mapping */ intel_wakeref_t wakeref;
@@ -2165,7 +2167,7 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *i915,u32 val;bool ret; -bxt_port_to_phy_channel (i915, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch); wakeref =intel_display_power_get_if_enabled (i915,POWER_DOMAIN_DISPLAY_CORE );
Signature · 1 line
2.39.5
Re: [PATCH 03/11] drm/i915/dpio: convert to struct intel_display
Quoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch DPIO PHY code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 618 lines
--- .../i915/display/intel_display_power_well.c | 19 ++- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 158 +++++++++--------- drivers/gpu/drm/i915/display/intel_dpio_phy.h | 22 +-- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 6 +- 4 files changed, 106 insertions(+), 99 deletions(-)drivers/gpu/drm/i915/display/intel_display_power_well.c +13
-6@@ -919,38 +919,45 @@ static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv,static void bxt_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -bxt_dpio_phy_init (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +bxt_dpio_phy_init (display,i915_power_well_instance (power_well)->bxt.phy); }static void bxt_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -bxt_dpio_phy_uninit (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +bxt_dpio_phy_uninit (display,i915_power_well_instance (power_well)->bxt.phy); }static bool bxt_dpio_cmn_power_well_enabled (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -return bxt_dpio_phy_is_enabled (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +return bxt_dpio_phy_is_enabled (display,i915_power_well_instance (power_well)->bxt.phy); }static void bxt_verify_dpio_phy_power_wells (struct drm_i915_private *dev_priv) { +struct intel_display *display = &dev_priv->display;struct i915_power_well *power_well; power_well =lookup_power_well (dev_priv,BXT_DISP_PW_DPIO_CMN_A );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy); power_well =lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy);if (IS_GEMINILAKE (dev_priv)) { power_well =lookup_power_well (dev_priv,GLK_DISP_PW_DPIO_CMN_C );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv, +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy); } }drivers/gpu/drm/i915/display/intel_dpio_phy.c +78
-80@@ -219,8 +219,10 @@ static const struct bxt_dpio_phy_info glk_dpio_phy_info[] = { };static const struct bxt_dpio_phy_info * -bxt_get_phy_list (struct drm_i915_private *dev_priv,int *count) +bxt_get_phy_list (struct intel_display *display,int *count) { +struct drm_i915_private *dev_priv =to_i915 (display->drm); +if (IS_GEMINILAKE (dev_priv)) { *count =ARRAY_SIZE (glk_dpio_phy_info);return glk_dpio_phy_info;@@ -231,22 +233,22 @@ bxt_get_phy_list(struct drm_i915_private *dev_priv, int *count) }static const struct bxt_dpio_phy_info * -bxt_get_phy_info (struct drm_i915_private *dev_priv,enum dpio_phy phy) +bxt_get_phy_info (struct intel_display *display,enum dpio_phy phy) {int count;const struct bxt_dpio_phy_info *phy_list = -bxt_get_phy_list (dev_priv, &count); +bxt_get_phy_list (display, &count);return &phy_list[phy]; } -void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch) {const struct bxt_dpio_phy_info *phy_info, *phys;int i, count; - phys =bxt_get_phy_list (dev_priv, &count); + phys =bxt_get_phy_list (display, &count);for (i =0 ; i < count; i++) { phy_info = &phys[i];@@ -265,7 +267,7 @@ void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port, } } -drm_WARN (&dev_priv->drm,1 ,"PHY not found for PORT %c" , +drm_WARN (display->drm,1 ,"PHY not found for PORT %c" ,port_name (port)); *phy =DPIO_PHY0 ; *ch =DPIO_CH0 ;@@ -275,16 +277,16 @@ void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port,* Like intel_de_rmw() but reads from a single per-lane register and * writes to the group register to write the same value to all the lanes. */ -static u32 bxt_dpio_phy_rmw_grp (struct drm_i915_private *i915, +static u32 bxt_dpio_phy_rmw_grp (struct intel_display *display,i915_reg_t reg_single,i915_reg_t reg_group,u32 clear,u32 set) {u32 old, val; - old =intel_de_read (i915, reg_single); + old =intel_de_read (display, reg_single); val = (old & ~clear) | set; -intel_de_write (i915, reg_group, val); +intel_de_write (display, reg_group, val);return old; }@@ -292,30 +294,30 @@ static u32 bxt_dpio_phy_rmw_grp(struct drm_i915_private *i915,void bxt_dpio_phy_set_signal_levels (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);const struct intel_ddi_buf_trans *trans;enum dpio_channel ch;enum dpio_phy phy;int lane, n_entries; trans = encoder->get_buf_trans (encoder, crtc_state, &n_entries); -if (drm_WARN_ON_ONCE (&dev_priv->drm, !trans)) +if (drm_WARN_ON_ONCE (display->drm, !trans))return ; -bxt_port_to_phy_channel (dev_priv, encoder->port, &phy, &ch); +bxt_port_to_phy_channel (display, encoder->port, &phy, &ch);/* * While we write to the group register to program all lanes at once we * can read only lane registers and we pick lanes 0/1 for that. */ -bxt_dpio_phy_rmw_grp (dev_priv,BXT_PORT_PCS_DW10_LN01 (phy, ch), +bxt_dpio_phy_rmw_grp (display,BXT_PORT_PCS_DW10_LN01 (phy, ch),BXT_PORT_PCS_DW10_GRP (phy, ch),TX2_SWING_CALC_INIT |TX1_SWING_CALC_INIT ,0 );for (lane =0 ; lane < crtc_state->lane_count; lane++) {int level =intel_ddi_level (encoder, crtc_state, lane); -intel_de_rmw (dev_priv,BXT_PORT_TX_DW2_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW2_LN (phy, ch, lane),MARGIN_000_MASK |UNIQ_TRANS_SCALE_MASK ,MARGIN_000 (trans->entries[level].bxt.margin) |UNIQ_TRANS_SCALE (trans->entries[level].bxt.scale));@@ -325,50 +327,50 @@ void bxt_dpio_phy_set_signal_levels(struct intel_encoder *encoder,int level =intel_ddi_level (encoder, crtc_state, lane);u32 val; -intel_de_rmw (dev_priv,BXT_PORT_TX_DW3_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW3_LN (phy, ch, lane),SCALE_DCOMP_METHOD , trans->entries[level].bxt.enable ?SCALE_DCOMP_METHOD :0 ); - val =intel_de_read (dev_priv,BXT_PORT_TX_DW3_LN (phy, ch, lane)); + val =intel_de_read (display,BXT_PORT_TX_DW3_LN (phy, ch, lane));if ((val &UNIQUE_TRANGE_EN_METHOD ) && !(val &SCALE_DCOMP_METHOD )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"Disabled scaling while ouniqetrangenmethod was set" ); }for (lane =0 ; lane < crtc_state->lane_count; lane++) {int level =intel_ddi_level (encoder, crtc_state, lane); -intel_de_rmw (dev_priv,BXT_PORT_TX_DW4_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW4_LN (phy, ch, lane),DE_EMPHASIS_MASK ,DE_EMPHASIS (trans->entries[level].bxt.deemphasis)); } -bxt_dpio_phy_rmw_grp (dev_priv,BXT_PORT_PCS_DW10_LN01 (phy, ch), +bxt_dpio_phy_rmw_grp (display,BXT_PORT_PCS_DW10_LN01 (phy, ch),BXT_PORT_PCS_DW10_GRP (phy, ch),0 ,TX2_SWING_CALC_INIT |TX1_SWING_CALC_INIT ); } -bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy); -if (!(intel_de_read (dev_priv,BXT_P_CR_GT_DISP_PWRON ) & phy_info->pwron_mask)) +if (!(intel_de_read (display,BXT_P_CR_GT_DISP_PWRON ) & phy_info->pwron_mask))return false; -if ((intel_de_read (dev_priv,BXT_PORT_CL1CM_DW0 (phy)) & +if ((intel_de_read (display,BXT_PORT_CL1CM_DW0 (phy)) & (PHY_POWER_GOOD |PHY_RESERVED )) !=PHY_POWER_GOOD ) { -drm_dbg (&dev_priv->drm, +drm_dbg (display->drm,"DDI PHY %d powered, but power hasn't settled\n" , phy);return false; } -if (!(intel_de_read (dev_priv,BXT_PHY_CTL_FAMILY (phy)) &COMMON_RESET_DIS )) { -drm_dbg (&dev_priv->drm, +if (!(intel_de_read (display,BXT_PHY_CTL_FAMILY (phy)) &COMMON_RESET_DIS )) { +drm_dbg (display->drm,"DDI PHY %d powered, but still in reset\n" , phy);return false;@@ -377,47 +379,44 @@ bool bxt_dpio_phy_is_enabled(struct drm_i915_private *dev_priv,return true; } -static u32 bxt_get_grc (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static u32 bxt_get_grc (struct intel_display *display,enum dpio_phy phy) { -u32 val =intel_de_read (dev_priv,BXT_PORT_REF_DW6 (phy)); +u32 val =intel_de_read (display,BXT_PORT_REF_DW6 (phy));return REG_FIELD_GET (GRC_CODE_MASK , val); } -static void bxt_phy_wait_grc_done (struct drm_i915_private *dev_priv, +static void bxt_phy_wait_grc_done (struct intel_display *display,enum dpio_phy phy) { -if (intel_de_wait_for_set (dev_priv,BXT_PORT_REF_DW3 (phy), -GRC_DONE ,10 )) -drm_err (&dev_priv->drm,"timeout waiting for PHY%d GRC\n" , - phy); +if (intel_de_wait_for_set (display,BXT_PORT_REF_DW3 (phy),GRC_DONE ,10 )) +drm_err (display->drm,"timeout waiting for PHY%d GRC\n" , phy); } -static void _bxt_dpio_phy_init (struct drm_i915_private *dev_priv, -enum dpio_phy phy) +static void _bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info;u32 val; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy); -if (bxt_dpio_phy_is_enabled (dev_priv, phy)) { +if (bxt_dpio_phy_is_enabled (display, phy)) {/* Still read out the GRC value for state verification */ if (phy_info->rcomp_phy !=-1 ) - dev_priv->display.state.bxt_phy_grc =bxt_get_grc (dev_priv, phy); + display->state.bxt_phy_grc =bxt_get_grc (display, phy); -if (bxt_dpio_phy_verify_state (dev_priv, phy)) { -drm_dbg (&dev_priv->drm,"DDI PHY %d already enabled, " +if (bxt_dpio_phy_verify_state (display, phy)) { +drm_dbg (display->drm,"DDI PHY %d already enabled, " "won't reprogram it\n" , phy);return ; } -drm_dbg (&dev_priv->drm, +drm_dbg (display->drm,"DDI PHY %d enabled with invalid state, " "force reprogramming it\n" , phy); } -intel_de_rmw (dev_priv,BXT_P_CR_GT_DISP_PWRON ,0 , phy_info->pwron_mask); +intel_de_rmw (display,BXT_P_CR_GT_DISP_PWRON ,0 , phy_info->pwron_mask);/* * The PHY registers start out inaccessible and respond to reads with @@ -427,92 +426,91 @@ static void _bxt_dpio_phy_init(struct drm_i915_private *dev_priv,* The flag should get set in 100us according to the HW team, but * use 1ms due to occasional timeouts observed with that. */ -if (intel_de_wait_fw (dev_priv,BXT_PORT_CL1CM_DW0 (phy), +if (intel_de_wait_fw (display,BXT_PORT_CL1CM_DW0 (phy),PHY_RESERVED |PHY_POWER_GOOD ,PHY_POWER_GOOD ,1 )) -drm_err (&dev_priv->drm,"timeout during PHY%d power on\n" , +drm_err (display->drm,"timeout during PHY%d power on\n" , phy);/* Program PLL Rcomp code offset */ -intel_de_rmw (dev_priv,BXT_PORT_CL1CM_DW9 (phy), +intel_de_rmw (display,BXT_PORT_CL1CM_DW9 (phy),IREF0RC_OFFSET_MASK ,IREF0RC_OFFSET (0xE4 )); -intel_de_rmw (dev_priv,BXT_PORT_CL1CM_DW10 (phy), +intel_de_rmw (display,BXT_PORT_CL1CM_DW10 (phy),IREF1RC_OFFSET_MASK ,IREF1RC_OFFSET (0xE4 ));/* Program power gating */ -intel_de_rmw (dev_priv,BXT_PORT_CL1CM_DW28 (phy),0 , +intel_de_rmw (display,BXT_PORT_CL1CM_DW28 (phy),0 ,OCL1_POWER_DOWN_EN |DW28_OLDO_DYN_PWR_DOWN_EN |SUS_CLK_CONFIG );if (phy_info->dual_channel) -intel_de_rmw (dev_priv,BXT_PORT_CL2CM_DW6 (phy),0 , +intel_de_rmw (display,BXT_PORT_CL2CM_DW6 (phy),0 ,DW6_OLDO_DYN_PWR_DOWN_EN );if (phy_info->rcomp_phy !=-1 ) {u32 grc_code; -bxt_phy_wait_grc_done (dev_priv, phy_info->rcomp_phy); +bxt_phy_wait_grc_done (display, phy_info->rcomp_phy);/* * PHY0 isn't connected to an RCOMP resistor so copy over * the corresponding calibrated value from PHY1, and disable * the automatic calibration on PHY0. */ - val =bxt_get_grc (dev_priv, phy_info->rcomp_phy); - dev_priv->display.state.bxt_phy_grc = val; + val =bxt_get_grc (display, phy_info->rcomp_phy); + display->state.bxt_phy_grc = val; grc_code =GRC_CODE_FAST (val) |GRC_CODE_SLOW (val) |GRC_CODE_NOM (val); -intel_de_write (dev_priv,BXT_PORT_REF_DW6 (phy), grc_code); -intel_de_rmw (dev_priv,BXT_PORT_REF_DW8 (phy), +intel_de_write (display,BXT_PORT_REF_DW6 (phy), grc_code); +intel_de_rmw (display,BXT_PORT_REF_DW8 (phy),0 ,GRC_DIS |GRC_RDY_OVRD ); }if (phy_info->reset_delay)udelay (phy_info->reset_delay); -intel_de_rmw (dev_priv,BXT_PHY_CTL_FAMILY (phy),0 ,COMMON_RESET_DIS ); +intel_de_rmw (display,BXT_PHY_CTL_FAMILY (phy),0 ,COMMON_RESET_DIS ); } -void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy) +void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy); -intel_de_rmw (dev_priv,BXT_PHY_CTL_FAMILY (phy),COMMON_RESET_DIS ,0 ); +intel_de_rmw (display,BXT_PHY_CTL_FAMILY (phy),COMMON_RESET_DIS ,0 ); -intel_de_rmw (dev_priv,BXT_P_CR_GT_DISP_PWRON , phy_info->pwron_mask,0 ); +intel_de_rmw (display,BXT_P_CR_GT_DISP_PWRON , phy_info->pwron_mask,0 ); } -void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy) +void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy) { -const struct bxt_dpio_phy_info *phy_info = -bxt_get_phy_info (dev_priv, phy); +const struct bxt_dpio_phy_info *phy_info =bxt_get_phy_info (display, phy);enum dpio_phy rcomp_phy = phy_info->rcomp_phy;bool was_enabled; -lockdep_assert_held (&dev_priv->display.power.domains.lock); +lockdep_assert_held (&display->power.domains.lock); was_enabled = true;if (rcomp_phy !=-1 ) - was_enabled =bxt_dpio_phy_is_enabled (dev_priv, rcomp_phy); + was_enabled =bxt_dpio_phy_is_enabled (display, rcomp_phy);/* * We need to copy the GRC calibration value from rcomp_phy, * so make sure it's powered up. */ if (!was_enabled) -_bxt_dpio_phy_init (dev_priv, rcomp_phy); +_bxt_dpio_phy_init (display, rcomp_phy); -_bxt_dpio_phy_init (dev_priv, phy); +_bxt_dpio_phy_init (display, phy);if (!was_enabled) -bxt_dpio_phy_uninit (dev_priv, rcomp_phy); +bxt_dpio_phy_uninit (display, rcomp_phy); } static bool __printf(6, 7) -__phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy, +__phy_reg_verify_state(struct intel_display *display, enum dpio_phy phy, i915_reg_t reg, u32 mask, u32 expected, const char *reg_fmt, ...) {@@ -520,7 +518,7 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,va_list args;u32 val; - val =intel_de_read (dev_priv, reg); + val =intel_de_read (display, reg);if ((val & mask) == expected)return true;@@ -528,7 +526,7 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy, vaf.fmt = reg_fmt; vaf.va = &args; -drm_dbg (&dev_priv->drm,"DDI PHY %d reg %pV [%08x] state mismatch: " +drm_dbg (display->drm,"DDI PHY %d reg %pV [%08x] state mismatch: " "current %08x, expected %08x (mask %08x)\n" , phy, &vaf, reg.reg, val, (val & ~mask) | expected, mask);@@ -538,20 +536,20 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,return false; } -bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info;u32 mask;bool ok; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy);#define _CHK (reg, mask, exp, fmt, ...) \ - __phy_reg_verify_state(dev_priv, phy, reg, mask, exp, fmt, \ + __phy_reg_verify_state(display, phy, reg, mask, exp, fmt, \ ## __VA_ARGS__) -if (!bxt_dpio_phy_is_enabled (dev_priv, phy)) +if (!bxt_dpio_phy_is_enabled (display, phy))return false; ok = true;@@ -575,7 +573,7 @@ bool bxt_dpio_phy_verify_state(struct drm_i915_private *dev_priv, "BXT_PORT_CL2CM_DW6(%d)", phy);if (phy_info->rcomp_phy !=-1 ) { -u32 grc_code = dev_priv->display.state.bxt_phy_grc; +u32 grc_code = display->state.bxt_phy_grc; grc_code =GRC_CODE_FAST (grc_code) | GRC_CODE_SLOW(grc_code) |@@ -614,20 +612,20 @@ bxt_dpio_phy_calc_lane_lat_optim_mask(u8 lane_count)void bxt_dpio_phy_set_lane_optim_mask (struct intel_encoder *encoder,u8 lane_lat_optim_mask) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane; -bxt_port_to_phy_channel (dev_priv, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch);for (lane =0 ; lane <4 ; lane++) {/* * Note that on CHV this flag is called UPAR, but has * the same function. */ -intel_de_rmw (dev_priv,BXT_PORT_TX_DW14_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW14_LN (phy, ch, lane),LATENCY_OPTIM , lane_lat_optim_mask &BIT (lane) ?LATENCY_OPTIM :0 ); }@@ -636,18 +634,18 @@ void bxt_dpio_phy_set_lane_optim_mask(struct intel_encoder *encoder,u8 bxt_dpio_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;u8 mask; -bxt_port_to_phy_channel (dev_priv, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch); mask =0 ;for (lane =0 ; lane <4 ; lane++) { -u32 val =intel_de_read (dev_priv, +u32 val =intel_de_read (display,BXT_PORT_TX_DW14_LN (phy, ch, lane));if (val &LATENCY_OPTIM )drivers/gpu/drm/i915/display/intel_dpio_phy.h +11
-11@@ -10,9 +10,9 @@enum pipe ;enum port ; -struct drm_i915_private ;struct intel_crtc_state ;struct intel_digital_port ; +struct intel_display ;struct intel_encoder ;enum dpio_channel {@@ -27,15 +27,15 @@ enum dpio_phy { };#ifdef I915 -void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch);void bxt_dpio_phy_set_signal_levels (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state); -void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy); -void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy); -bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy); +void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy); +bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy); -bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy);u8 bxt_dpio_phy_calc_lane_lat_optim_mask (u8 lane_count); void bxt_dpio_phy_set_lane_optim_mask(struct intel_encoder *encoder,@@ -73,7 +73,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,void vlv_phy_reset_lanes (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state);#else -static inline void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +static inline void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch) { }@@ -81,18 +81,18 @@ static inline void bxt_dpio_phy_set_signal_levels(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { } -static inline void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static inline void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy) { } -static inline void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static inline void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy) { } -static inline bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +static inline bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy) {return false; } -static inline bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +static inline bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy) {return true;drivers/gpu/drm/i915/display/intel_dpll_mgr.c +4
-2@@ -2035,13 +2035,14 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *i915,struct intel_shared_dpll *pll, const struct intel_dpll_hw_state *dpll_hw_state) { + struct intel_display *display = &i915->display;const struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;enum port port = (enum port )pll->info->id;/* 1:1 port->PLL mapping */ enum dpio_phy phy;enum dpio_channel ch;u32 temp; -bxt_port_to_phy_channel (i915, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch);/* Non-SSC reference */ intel_de_rmw (i915,BXT_PORT_PLL_ENABLE (port),0 ,PORT_PLL_REF_SEL );@@ -2157,6 +2158,7 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *i915,struct intel_shared_dpll *pll, struct intel_dpll_hw_state *dpll_hw_state) { + struct intel_display *display = &i915->display;struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;enum port port = (enum port )pll->info->id;/* 1:1 port->PLL mapping */ intel_wakeref_t wakeref;@@ -2165,7 +2167,7 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *i915,u32 val;bool ret; -bxt_port_to_phy_channel (i915, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch); wakeref =intel_display_power_get_if_enabled (i915,POWER_DOMAIN_DISPLAY_CORE );Signature · 1 line
2.39.5
PATCH 4/11 drm/i915/hdcp: further conversion to struct intel_display
In reply to Jani NikulaThere are some unconverted stragglers left in the HDCP API still using struct drm_i915_private. Convert to struct intel_display.
--- .../drm/i915/display/intel_display_driver.c | 7 +++-- drivers/gpu/drm/i915/display/intel_dp.c | 3 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 ++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 30 ++++++++----------- drivers/gpu/drm/i915/display/intel_hdcp.h | 10 +++---- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/xe/display/xe_display.c | 4 ++- 7 files changed, 30 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/display/intel_display_driver.c +4 -3
@@ -485,7 +485,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)return 0 ; err_hdcp: -intel_hdcp_component_fini (i915); +intel_hdcp_component_fini (display); err_mode_config:intel_mode_config_cleanup (i915);
@@ -495,6 +495,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)/* part #3: call after gem init */ int intel_display_driver_probe (struct drm_i915_private *i915) { +struct intel_display *display = &i915->display;int ret;if (!HAS_DISPLAY (i915))
@@ -505,7 +506,7 @@ int intel_display_driver_probe(struct drm_i915_private *i915)* the BIOS fb takeover and whatever else magic ggtt reservations * happen during gem/ggtt init. */ -intel_hdcp_component_init (i915); +intel_hdcp_component_init (display);/* * Force all active planes to recompute their states. So that on
@@ -600,7 +601,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)/* flush any delayed tasks or pending work */ flush_workqueue (i915->unordered_wq); -intel_hdcp_component_fini (i915); +intel_hdcp_component_fini (display);intel_mode_config_cleanup (i915);
drivers/gpu/drm/i915/display/intel_dp.c +2 -1
@@ -6415,6 +6415,7 @@ bool intel_dp_init_connector(struct intel_digital_port *dig_port, struct intel_connector *intel_connector) { + struct intel_display *display = to_intel_display(dig_port);struct drm_connector *connector = &intel_connector->base;struct intel_dp *intel_dp = &dig_port->dp;struct intel_encoder *intel_encoder = &dig_port->base;
@@ -6504,7 +6505,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,intel_dp_add_properties (intel_dp, connector); -if (is_hdcp_supported (dev_priv, port) && !intel_dp_is_edp (intel_dp)) { +if (is_hdcp_supported (display, port) && !intel_dp_is_edp (intel_dp)) {int ret =intel_dp_hdcp_init (dig_port, intel_connector);if (ret) drm_dbg_kms(&dev_priv->drm,
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +2 -3
@@ -873,13 +873,12 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = {int intel_dp_hdcp_init (struct intel_digital_port *dig_port,struct intel_connector *intel_connector) { -struct drm_device *dev = intel_connector->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (dig_port);struct intel_encoder *intel_encoder = &dig_port->base;enum port port = intel_encoder->port;struct intel_dp *intel_dp = &dig_port->dp; -if (!is_hdcp_supported (dev_priv, port)) +if (!is_hdcp_supported (display, port))return 0 ;if (intel_connector->mst_port)
drivers/gpu/drm/i915/display/intel_hdcp.c +13 -17
@@ -1192,10 +1192,10 @@ static void intel_hdcp_prop_work(struct work_struct *work)drm_connector_put (&connector->base); } -bool is_hdcp_supported (struct drm_i915_private *i915,enum port port) +bool is_hdcp_supported (struct intel_display *display,enum port port) { -return DISPLAY_RUNTIME_INFO (i915)->has_hdcp && - (DISPLAY_VER (i915) >=12 || port <PORT_E ); +return DISPLAY_RUNTIME_INFO (display)->has_hdcp && + (DISPLAY_VER (display) >=12 || port <PORT_E ); } static int
@@ -2301,9 +2301,9 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,return 0 ; } -static bool is_hdcp2_supported (struct drm_i915_private *i915) +static bool is_hdcp2_supported (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm); +struct drm_i915_private *i915 =to_i915 (display->drm);if (intel_hdcp_gsc_cs_required (display))return true;
@@ -2317,12 +2317,11 @@ static bool is_hdcp2_supported(struct drm_i915_private *i915) IS_COMETLAKE(i915)); } -void intel_hdcp_component_init (struct drm_i915_private *i915) +void intel_hdcp_component_init (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm);int ret; -if (!is_hdcp2_supported (i915)) +if (!is_hdcp2_supported (display))return ;mutex_lock (&display->hdcp.hdcp_mutex);
@@ -2367,19 +2366,18 @@ int intel_hdcp_init(struct intel_connector *connector,struct intel_digital_port *dig_port, const struct intel_hdcp_shim *shim) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_hdcp *hdcp = &connector->hdcp;int ret;if (!shim)return -EINVAL ; -if (is_hdcp2_supported (i915)) +if (is_hdcp2_supported (display))intel_hdcp2_init (connector, dig_port, shim); - ret = -drm_connector_attach_content_protection_property (&connector->base, - hdcp->hdcp2_supported); + ret =drm_connector_attach_content_protection_property (&connector->base, + hdcp->hdcp2_supported);if (ret) { hdcp->hdcp2_supported = false;kfree (dig_port->hdcp_port_data.streams);
@@ -2432,7 +2430,7 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state, hdcp->stream_transcoder =INVALID_TRANSCODER ; } -if (DISPLAY_VER (i915) >=12 ) +if (DISPLAY_VER (display) >=12 ) dig_port->hdcp_port_data.hdcp_transcoder =intel_get_hdcp_transcoder (hdcp->cpu_transcoder);
@@ -2583,10 +2581,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,_intel_hdcp_enable (state, encoder, crtc_state, conn_state); } -void intel_hdcp_component_fini (struct drm_i915_private *i915) +void intel_hdcp_component_fini (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm); -mutex_lock (&display->hdcp.hdcp_mutex);if (!display->hdcp.comp_added) {mutex_unlock (&display->hdcp.hdcp_mutex);
drivers/gpu/drm/i915/display/intel_hdcp.h +5 -5
@@ -12,13 +12,13 @@struct drm_connector ;struct drm_connector_state ; -struct drm_i915_private ;struct intel_atomic_state ;struct intel_connector ;struct intel_crtc_state ; +struct intel_digital_port ; +struct intel_display ;struct intel_encoder ;struct intel_hdcp_shim ; -struct intel_digital_port ;enum port ;enum transcoder ;
@@ -37,14 +37,14 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state); -bool is_hdcp_supported (struct drm_i915_private *i915,enum port port); +bool is_hdcp_supported (struct intel_display *display,enum port port);bool intel_hdcp_get_capability (struct intel_connector *connector);bool intel_hdcp2_get_capability (struct intel_connector *connector);void intel_hdcp_get_remote_capability (struct intel_connector *connector,bool *hdcp_capable,bool *hdcp2_capable); -void intel_hdcp_component_init (struct drm_i915_private *i915); -void intel_hdcp_component_fini (struct drm_i915_private *i915); +void intel_hdcp_component_init (struct intel_display *display); +void intel_hdcp_component_fini (struct intel_display *display);void intel_hdcp_cleanup (struct intel_connector *connector);void intel_hdcp_handle_cp_irq (struct intel_connector *connector);
drivers/gpu/drm/i915/display/intel_hdmi.c +1 -2
@@ -3025,7 +3025,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,struct intel_hdmi *intel_hdmi = &dig_port->hdmi;struct intel_encoder *intel_encoder = &dig_port->base;struct drm_device *dev = intel_encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_encoder->port;struct cec_connector_info conn_info;u8 ddc_pin;
@@ -3075,7 +3074,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,intel_connector_attach_encoder (intel_connector, intel_encoder); intel_hdmi->attached_connector = intel_connector; -if (is_hdcp_supported (dev_priv, port)) { +if (is_hdcp_supported (display, port)) {int ret =intel_hdcp_init (intel_connector, dig_port, &intel_hdmi_hdcp_shim);if (ret)
drivers/gpu/drm/xe/display/xe_display.c +3 -1
@@ -202,12 +202,14 @@ int xe_display_init(struct xe_device *xe)void xe_display_fini (struct xe_device *xe) { +struct intel_display *display = &xe->display; +if (!xe->info.probe_display)return ;intel_hpd_poll_fini (xe); -intel_hdcp_component_fini (xe); +intel_hdcp_component_fini (display);intel_audio_deinit (xe); }
Signature · 1 line
2.39.5
Re: [PATCH 04/11] drm/i915/hdcp: further conversion to struct intel_display
Quoted 4 lines · Jani Nikula
There are some unconverted stragglers left in the HDCP API still using struct
drm_i915_private. Convert to structintel_display.Signed-off-by Jani Nikula <[email protected]>
Quoted 262 lines
--- .../drm/i915/display/intel_display_driver.c | 7 +++-- drivers/gpu/drm/i915/display/intel_dp.c | 3 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 ++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 30 ++++++++----------- drivers/gpu/drm/i915/display/intel_hdcp.h | 10 +++---- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/xe/display/xe_display.c | 4 ++- 7 files changed, 30 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/display/intel_display_driver.c +4
-3@@ -485,7 +485,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)return 0 ; err_hdcp: -intel_hdcp_component_fini (i915); +intel_hdcp_component_fini (display); err_mode_config:intel_mode_config_cleanup (i915);@@ -495,6 +495,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)/* part #3: call after gem init */ int intel_display_driver_probe (struct drm_i915_private *i915) { +struct intel_display *display = &i915->display;int ret;if (!HAS_DISPLAY (i915))@@ -505,7 +506,7 @@ int intel_display_driver_probe(struct drm_i915_private *i915)* the BIOS fb takeover and whatever else magic ggtt reservations * happen during gem/ggtt init. */ -intel_hdcp_component_init (i915); +intel_hdcp_component_init (display);/* * Force all active planes to recompute their states. So that on @@ -600,7 +601,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)/* flush any delayed tasks or pending work */ flush_workqueue (i915->unordered_wq); -intel_hdcp_component_fini (i915); +intel_hdcp_component_fini (display);intel_mode_config_cleanup (i915);drivers/gpu/drm/i915/display/intel_dp.c +2
-1@@ -6415,6 +6415,7 @@ bool intel_dp_init_connector(struct intel_digital_port *dig_port, struct intel_connector *intel_connector) { + struct intel_display *display = to_intel_display(dig_port);struct drm_connector *connector = &intel_connector->base;struct intel_dp *intel_dp = &dig_port->dp;struct intel_encoder *intel_encoder = &dig_port->base;@@ -6504,7 +6505,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,intel_dp_add_properties (intel_dp, connector); -if (is_hdcp_supported (dev_priv, port) && !intel_dp_is_edp (intel_dp)) { +if (is_hdcp_supported (display, port) && !intel_dp_is_edp (intel_dp)) {int ret =intel_dp_hdcp_init (dig_port, intel_connector);if (ret) drm_dbg_kms(&dev_priv->drm,drivers/gpu/drm/i915/display/intel_dp_hdcp.c +2
-3@@ -873,13 +873,12 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = {int intel_dp_hdcp_init (struct intel_digital_port *dig_port,struct intel_connector *intel_connector) { -struct drm_device *dev = intel_connector->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (dig_port);struct intel_encoder *intel_encoder = &dig_port->base;enum port port = intel_encoder->port;struct intel_dp *intel_dp = &dig_port->dp; -if (!is_hdcp_supported (dev_priv, port)) +if (!is_hdcp_supported (display, port))return 0 ;if (intel_connector->mst_port)drivers/gpu/drm/i915/display/intel_hdcp.c +13
-17@@ -1192,10 +1192,10 @@ static void intel_hdcp_prop_work(struct work_struct *work)drm_connector_put (&connector->base); } -bool is_hdcp_supported (struct drm_i915_private *i915,enum port port) +bool is_hdcp_supported (struct intel_display *display,enum port port) { -return DISPLAY_RUNTIME_INFO (i915)->has_hdcp && - (DISPLAY_VER (i915) >=12 || port <PORT_E ); +return DISPLAY_RUNTIME_INFO (display)->has_hdcp && + (DISPLAY_VER (display) >=12 || port <PORT_E ); } static int@@ -2301,9 +2301,9 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,return 0 ; } -static bool is_hdcp2_supported (struct drm_i915_private *i915) +static bool is_hdcp2_supported (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm); +struct drm_i915_private *i915 =to_i915 (display->drm);if (intel_hdcp_gsc_cs_required (display))return true;@@ -2317,12 +2317,11 @@ static bool is_hdcp2_supported(struct drm_i915_private *i915) IS_COMETLAKE(i915)); } -void intel_hdcp_component_init (struct drm_i915_private *i915) +void intel_hdcp_component_init (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm);int ret; -if (!is_hdcp2_supported (i915)) +if (!is_hdcp2_supported (display))return ;mutex_lock (&display->hdcp.hdcp_mutex);@@ -2367,19 +2366,18 @@ int intel_hdcp_init(struct intel_connector *connector,struct intel_digital_port *dig_port, const struct intel_hdcp_shim *shim) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_hdcp *hdcp = &connector->hdcp;int ret;if (!shim)return -EINVAL ; -if (is_hdcp2_supported (i915)) +if (is_hdcp2_supported (display))intel_hdcp2_init (connector, dig_port, shim); - ret = -drm_connector_attach_content_protection_property (&connector->base, - hdcp->hdcp2_supported); + ret =drm_connector_attach_content_protection_property (&connector->base, + hdcp->hdcp2_supported);if (ret) { hdcp->hdcp2_supported = false;kfree (dig_port->hdcp_port_data.streams);@@ -2432,7 +2430,7 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state, hdcp->stream_transcoder =INVALID_TRANSCODER ; } -if (DISPLAY_VER (i915) >=12 ) +if (DISPLAY_VER (display) >=12 ) dig_port->hdcp_port_data.hdcp_transcoder =intel_get_hdcp_transcoder (hdcp->cpu_transcoder);@@ -2583,10 +2581,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,_intel_hdcp_enable (state, encoder, crtc_state, conn_state); } -void intel_hdcp_component_fini (struct drm_i915_private *i915) +void intel_hdcp_component_fini (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm); -mutex_lock (&display->hdcp.hdcp_mutex);if (!display->hdcp.comp_added) {mutex_unlock (&display->hdcp.hdcp_mutex);drivers/gpu/drm/i915/display/intel_hdcp.h +5
-5@@ -12,13 +12,13 @@struct drm_connector ;struct drm_connector_state ; -struct drm_i915_private ;struct intel_atomic_state ;struct intel_connector ;struct intel_crtc_state ; +struct intel_digital_port ; +struct intel_display ;struct intel_encoder ;struct intel_hdcp_shim ; -struct intel_digital_port ;enum port ;enum transcoder ;@@ -37,14 +37,14 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state); -bool is_hdcp_supported (struct drm_i915_private *i915,enum port port); +bool is_hdcp_supported (struct intel_display *display,enum port port);bool intel_hdcp_get_capability (struct intel_connector *connector);bool intel_hdcp2_get_capability (struct intel_connector *connector);void intel_hdcp_get_remote_capability (struct intel_connector *connector,bool *hdcp_capable,bool *hdcp2_capable); -void intel_hdcp_component_init (struct drm_i915_private *i915); -void intel_hdcp_component_fini (struct drm_i915_private *i915); +void intel_hdcp_component_init (struct intel_display *display); +void intel_hdcp_component_fini (struct intel_display *display);void intel_hdcp_cleanup (struct intel_connector *connector);void intel_hdcp_handle_cp_irq (struct intel_connector *connector);drivers/gpu/drm/i915/display/intel_hdmi.c +1
-2@@ -3025,7 +3025,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,struct intel_hdmi *intel_hdmi = &dig_port->hdmi;struct intel_encoder *intel_encoder = &dig_port->base;struct drm_device *dev = intel_encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_encoder->port;struct cec_connector_info conn_info;u8 ddc_pin;@@ -3075,7 +3074,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,intel_connector_attach_encoder (intel_connector, intel_encoder); intel_hdmi->attached_connector = intel_connector; -if (is_hdcp_supported (dev_priv, port)) { +if (is_hdcp_supported (display, port)) {int ret =intel_hdcp_init (intel_connector, dig_port, &intel_hdmi_hdcp_shim);if (ret)drivers/gpu/drm/xe/display/xe_display.c +3
-1@@ -202,12 +202,14 @@ int xe_display_init(struct xe_device *xe)void xe_display_fini (struct xe_device *xe) { +struct intel_display *display = &xe->display; +if (!xe->info.probe_display)return ;intel_hpd_poll_fini (xe); -intel_hdcp_component_fini (xe); +intel_hdcp_component_fini (display);intel_audio_deinit (xe); }Signature · 1 line
2.39.5
PATCH 5/11 drm/i915/dp/hdcp: convert to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch DP HDCP code over to it.
--- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 88 ++++++++++---------- 1 file changed, 45 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +45 -43
@@ -58,7 +58,7 @@ staticint intel_dp_hdcp_write_an_aksv (struct intel_digital_port *dig_port,u8 *an) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);u8 aksv[DRM_HDCP_KSV_LEN ] = {};ssize_t dpcd_ret;
@@ -66,7 +66,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port, dpcd_ret =drm_dp_dpcd_write (&dig_port->dp.aux,DP_AUX_HDCP_AN , an,DRM_HDCP_AN_LEN );if (dpcd_ret !=DRM_HDCP_AN_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Failed to write An over DP/AUX (%zd)\n" , dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret;
@@ -82,7 +82,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port, dpcd_ret =drm_dp_dpcd_write (&dig_port->dp.aux,DP_AUX_HDCP_AKSV , aksv,DRM_HDCP_KSV_LEN );if (dpcd_ret !=DRM_HDCP_KSV_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Failed to write Aksv over DP/AUX (%zd)\n" , dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret;
@@ -93,13 +93,13 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bksv (struct intel_digital_port *dig_port,u8 *bksv) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret !=DRM_HDCP_KSV_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read Bksv from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -109,7 +109,7 @@ static int intel_dp_hdcp_read_bksv(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bstatus (struct intel_digital_port *dig_port,u8 *bstatus) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;/*
@@ -120,7 +120,7 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port, ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BINFO , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret !=DRM_HDCP_BSTATUS_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -129,7 +129,7 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bcaps (struct drm_dp_aux *aux, -struct drm_i915_private *i915, +struct intel_display *display,u8 *bcaps) {ssize_t ret;
@@ -137,7 +137,7 @@ int intel_dp_hdcp_read_bcaps(struct drm_dp_aux *aux, ret =drm_dp_dpcd_read (aux,DP_AUX_HDCP_BCAPS , bcaps,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bcaps from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -149,11 +149,11 @@ staticint intel_dp_hdcp_repeater_present (struct intel_digital_port *dig_port,bool *repeater_present) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bcaps; - ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, display, &bcaps);if (ret)return ret;
@@ -165,13 +165,14 @@ staticint intel_dp_hdcp_read_ri_prime (struct intel_digital_port *dig_port,u8 *ri_prime) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret !=DRM_HDCP_RI_LEN ) { -drm_dbg_kms (&i915->drm,"Read Ri' from DP/AUX failed (%zd)\n" , +drm_dbg_kms (display->drm, +"Read Ri' from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -182,14 +183,14 @@ staticint intel_dp_hdcp_read_ksv_ready (struct intel_digital_port *dig_port,bool *ksv_ready) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -201,7 +202,7 @@ staticint intel_dp_hdcp_read_ksv_fifo (struct intel_digital_port *dig_port,int num_downstream,u8 *ksv_fifo) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;int i;
@@ -213,7 +214,7 @@ int intel_dp_hdcp_read_ksv_fifo(struct intel_digital_port *dig_port, ksv_fifo + i *DRM_HDCP_KSV_LEN , len);if (ret != len) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read ksv[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret;
@@ -226,7 +227,7 @@ staticint intel_dp_hdcp_read_v_prime_part (struct intel_digital_port *dig_port,int i,u32 *part) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )
@@ -236,7 +237,7 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *dig_port,DP_AUX_HDCP_V_PRIME (i), part, DRM_HDCP_V_PRIME_PART_LEN);if (ret !=DRM_HDCP_V_PRIME_PART_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret; }
@@ -256,14 +257,14 @@ staticbool intel_dp_hdcp_check_link (struct intel_digital_port *dig_port,struct intel_connector *connector) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return false; }
@@ -275,11 +276,11 @@ staticint intel_dp_hdcp_get_capability (struct intel_digital_port *dig_port,bool *hdcp_capable) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bcaps; - ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, display, &bcaps);if (ret)return ret;
@@ -342,7 +343,7 @@ static int intel_dp_hdcp2_read_rx_status(struct intel_connector *connector, u8 *rx_status) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct drm_dp_aux *aux = &dig_port->dp.aux;ssize_t ret;
@@ -351,7 +352,7 @@ intel_dp_hdcp2_read_rx_status(struct intel_connector *connector,DP_HDCP_2_2_REG_RXSTATUS_OFFSET , rx_status, HDCP_2_2_DP_RXSTATUS_LEN);if (ret !=HDCP_2_2_DP_RXSTATUS_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -397,7 +398,7 @@ static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector, const struct hdcp2_dp_msg_data *hdcp2_msg_data) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct intel_dp *dp = &dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
@@ -430,7 +431,7 @@ intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector, }if (ret) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"msg_id %d, ret %d, timeout(mSec): %d\n" , hdcp2_msg_data->msg_id, ret, timeout);
@@ -514,8 +515,8 @@ staticint intel_dp_hdcp2_read_msg (struct intel_connector *connector,u8 msg_id,void *buf,size_t size) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);struct drm_dp_aux *aux = &dig_port->dp.aux;struct intel_dp *dp = &dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
@@ -568,7 +569,7 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector, ret =drm_dp_dpcd_read (aux, offset, (void *)byte, len);if (ret <0 ) { -drm_dbg_kms (&i915->drm,"msg_id %d, ret %zd\n" , +drm_dbg_kms (display->drm,"msg_id %d, ret %zd\n" , msg_id, ret);return ret; }
@@ -581,7 +582,8 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,if (hdcp2_msg_data->msg_read_timeout >0 ) { msg_expired =ktime_after (ktime_get_raw (), msg_end);if (msg_expired) { -drm_dbg_kms (&i915->drm,"msg_id %d, entire msg read timeout(mSec): %d\n" , +drm_dbg_kms (display->drm, +"msg_id %d, entire msg read timeout(mSec): %d\n" , msg_id, hdcp2_msg_data->msg_read_timeout);return -ETIMEDOUT ; }
@@ -696,7 +698,7 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,bool *hdcp_capable, bool *hdcp2_capable) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct drm_dp_aux *aux;u8 bcaps;int ret;
@@ -709,10 +711,10 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector, aux = &connector->port->aux; ret =_intel_dp_hdcp2_get_capability (aux, hdcp2_capable);if (ret) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"HDCP2 DPCD capability read failed err: %d\n" , ret); - ret =intel_dp_hdcp_read_bcaps (aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (aux, display, &bcaps);if (ret)return ret;
@@ -745,8 +747,8 @@ static int intel_dp_mst_toggle_hdcp_stream_select(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;int ret;
@@ -754,7 +756,7 @@ intel_dp_mst_toggle_hdcp_stream_select(struct intel_connector *connector, hdcp->stream_transcoder, enable, TRANS_DDI_HDCP_SELECT);if (ret) -drm_err (&i915->drm,"%s HDCP stream select failed (%d)\n" , +drm_err (display->drm,"%s HDCP stream select failed (%d)\n" , enable ?"Enable" :"Disable" , ret);return ret; }
@@ -763,8 +765,8 @@ static int intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;enum port port = dig_port->base.port;enum transcoder cpu_transcoder = hdcp->stream_transcoder;
@@ -780,10 +782,10 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector,return -EINVAL ;/* Wait for encryption confirmation */ -if (intel_de_wait (i915,HDCP_STATUS (i915, cpu_transcoder, port), +if (intel_de_wait (display,HDCP_STATUS (display, cpu_transcoder, port), stream_enc_status, enable ? stream_enc_status :0 ,HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { -drm_err (&i915->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" , +drm_err (display->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" ,transcoder_name (cpu_transcoder), enable ?"enabled" :"disabled" );return -ETIMEDOUT ; }
@@ -795,8 +797,8 @@ static int intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct hdcp_port_data *data = &dig_port->hdcp_port_data;struct intel_hdcp *hdcp = &connector->hdcp;enum transcoder cpu_transcoder = hdcp->stream_transcoder;
@@ -804,8 +806,8 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,enum port port = dig_port->base.port;int ret; -drm_WARN_ON (&i915->drm, enable && - !!(intel_de_read (i915,HDCP2_AUTH_STREAM (i915, cpu_transcoder, port)) +drm_WARN_ON (display->drm, enable && + !!(intel_de_read (display,HDCP2_AUTH_STREAM (display, cpu_transcoder, port)) &AUTH_STREAM_TYPE ) != data->streams[0 ].stream_type); ret =intel_dp_mst_toggle_hdcp_stream_select (connector, enable);
@@ -813,11 +815,11 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,return ret;/* Wait for encryption confirmation */ -if (intel_de_wait (i915,HDCP2_STREAM_STATUS (i915, cpu_transcoder, pipe), +if (intel_de_wait (display,HDCP2_STREAM_STATUS (display, cpu_transcoder, pipe),STREAM_ENCRYPTION_STATUS , enable ?STREAM_ENCRYPTION_STATUS :0 ,HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { -drm_err (&i915->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" , +drm_err (display->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" ,transcoder_name (cpu_transcoder), enable ?"enabled" :"disabled" );return -ETIMEDOUT ; }
Signature · 1 line
2.39.5
Re: [PATCH 05/11] drm/i915/dp/hdcp: convert to struct intel_display
Quoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch DP HDCP code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 369 lines
--- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 88 ++++++++++---------- 1 file changed, 45 insertions(+), 43 deletions(-)drivers/gpu/drm/i915/display/intel_dp_hdcp.c +45
-43@@ -58,7 +58,7 @@ staticint intel_dp_hdcp_write_an_aksv (struct intel_digital_port *dig_port,u8 *an) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);u8 aksv[DRM_HDCP_KSV_LEN ] = {};ssize_t dpcd_ret;@@ -66,7 +66,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port, dpcd_ret =drm_dp_dpcd_write (&dig_port->dp.aux,DP_AUX_HDCP_AN , an,DRM_HDCP_AN_LEN );if (dpcd_ret !=DRM_HDCP_AN_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Failed to write An over DP/AUX (%zd)\n" , dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret;@@ -82,7 +82,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port, dpcd_ret =drm_dp_dpcd_write (&dig_port->dp.aux,DP_AUX_HDCP_AKSV , aksv,DRM_HDCP_KSV_LEN );if (dpcd_ret !=DRM_HDCP_KSV_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Failed to write Aksv over DP/AUX (%zd)\n" , dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret;@@ -93,13 +93,13 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bksv (struct intel_digital_port *dig_port,u8 *bksv) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret !=DRM_HDCP_KSV_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read Bksv from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -109,7 +109,7 @@ static int intel_dp_hdcp_read_bksv(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bstatus (struct intel_digital_port *dig_port,u8 *bstatus) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;/* @@ -120,7 +120,7 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port, ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BINFO , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret !=DRM_HDCP_BSTATUS_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -129,7 +129,7 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bcaps (struct drm_dp_aux *aux, -struct drm_i915_private *i915, +struct intel_display *display,u8 *bcaps) {ssize_t ret;@@ -137,7 +137,7 @@ int intel_dp_hdcp_read_bcaps(struct drm_dp_aux *aux, ret =drm_dp_dpcd_read (aux,DP_AUX_HDCP_BCAPS , bcaps,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bcaps from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -149,11 +149,11 @@ staticint intel_dp_hdcp_repeater_present (struct intel_digital_port *dig_port,bool *repeater_present) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bcaps; - ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, display, &bcaps);if (ret)return ret;@@ -165,13 +165,14 @@ staticint intel_dp_hdcp_read_ri_prime (struct intel_digital_port *dig_port,u8 *ri_prime) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret !=DRM_HDCP_RI_LEN ) { -drm_dbg_kms (&i915->drm,"Read Ri' from DP/AUX failed (%zd)\n" , +drm_dbg_kms (display->drm, +"Read Ri' from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -182,14 +183,14 @@ staticint intel_dp_hdcp_read_ksv_ready (struct intel_digital_port *dig_port,bool *ksv_ready) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -201,7 +202,7 @@ staticint intel_dp_hdcp_read_ksv_fifo (struct intel_digital_port *dig_port,int num_downstream,u8 *ksv_fifo) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;int i;@@ -213,7 +214,7 @@ int intel_dp_hdcp_read_ksv_fifo(struct intel_digital_port *dig_port, ksv_fifo + i *DRM_HDCP_KSV_LEN , len);if (ret != len) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read ksv[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret;@@ -226,7 +227,7 @@ staticint intel_dp_hdcp_read_v_prime_part (struct intel_digital_port *dig_port,int i,u32 *part) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )@@ -236,7 +237,7 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *dig_port,DP_AUX_HDCP_V_PRIME (i), part, DRM_HDCP_V_PRIME_PART_LEN);if (ret !=DRM_HDCP_V_PRIME_PART_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret; }@@ -256,14 +257,14 @@ staticbool intel_dp_hdcp_check_link (struct intel_digital_port *dig_port,struct intel_connector *connector) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return false; }@@ -275,11 +276,11 @@ staticint intel_dp_hdcp_get_capability (struct intel_digital_port *dig_port,bool *hdcp_capable) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bcaps; - ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, display, &bcaps);if (ret)return ret;@@ -342,7 +343,7 @@ static int intel_dp_hdcp2_read_rx_status(struct intel_connector *connector, u8 *rx_status) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct drm_dp_aux *aux = &dig_port->dp.aux;ssize_t ret;@@ -351,7 +352,7 @@ intel_dp_hdcp2_read_rx_status(struct intel_connector *connector,DP_HDCP_2_2_REG_RXSTATUS_OFFSET , rx_status, HDCP_2_2_DP_RXSTATUS_LEN);if (ret !=HDCP_2_2_DP_RXSTATUS_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -397,7 +398,7 @@ static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector, const struct hdcp2_dp_msg_data *hdcp2_msg_data) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct intel_dp *dp = &dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;@@ -430,7 +431,7 @@ intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector, }if (ret) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"msg_id %d, ret %d, timeout(mSec): %d\n" , hdcp2_msg_data->msg_id, ret, timeout);@@ -514,8 +515,8 @@ staticint intel_dp_hdcp2_read_msg (struct intel_connector *connector,u8 msg_id,void *buf,size_t size) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);struct drm_dp_aux *aux = &dig_port->dp.aux;struct intel_dp *dp = &dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;@@ -568,7 +569,7 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector, ret =drm_dp_dpcd_read (aux, offset, (void *)byte, len);if (ret <0 ) { -drm_dbg_kms (&i915->drm,"msg_id %d, ret %zd\n" , +drm_dbg_kms (display->drm,"msg_id %d, ret %zd\n" , msg_id, ret);return ret; }@@ -581,7 +582,8 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,if (hdcp2_msg_data->msg_read_timeout >0 ) { msg_expired =ktime_after (ktime_get_raw (), msg_end);if (msg_expired) { -drm_dbg_kms (&i915->drm,"msg_id %d, entire msg read timeout(mSec): %d\n" , +drm_dbg_kms (display->drm, +"msg_id %d, entire msg read timeout(mSec): %d\n" , msg_id, hdcp2_msg_data->msg_read_timeout);return -ETIMEDOUT ; }@@ -696,7 +698,7 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,bool *hdcp_capable, bool *hdcp2_capable) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct drm_dp_aux *aux;u8 bcaps;int ret;@@ -709,10 +711,10 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector, aux = &connector->port->aux; ret =_intel_dp_hdcp2_get_capability (aux, hdcp2_capable);if (ret) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"HDCP2 DPCD capability read failed err: %d\n" , ret); - ret =intel_dp_hdcp_read_bcaps (aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (aux, display, &bcaps);if (ret)return ret;@@ -745,8 +747,8 @@ static int intel_dp_mst_toggle_hdcp_stream_select(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;int ret;@@ -754,7 +756,7 @@ intel_dp_mst_toggle_hdcp_stream_select(struct intel_connector *connector, hdcp->stream_transcoder, enable, TRANS_DDI_HDCP_SELECT);if (ret) -drm_err (&i915->drm,"%s HDCP stream select failed (%d)\n" , +drm_err (display->drm,"%s HDCP stream select failed (%d)\n" , enable ?"Enable" :"Disable" , ret);return ret; }@@ -763,8 +765,8 @@ static int intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;enum port port = dig_port->base.port;enum transcoder cpu_transcoder = hdcp->stream_transcoder;@@ -780,10 +782,10 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector,return -EINVAL ;/* Wait for encryption confirmation */ -if (intel_de_wait (i915,HDCP_STATUS (i915, cpu_transcoder, port), +if (intel_de_wait (display,HDCP_STATUS (display, cpu_transcoder, port), stream_enc_status, enable ? stream_enc_status :0 ,HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { -drm_err (&i915->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" , +drm_err (display->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" ,transcoder_name (cpu_transcoder), enable ?"enabled" :"disabled" );return -ETIMEDOUT ; }@@ -795,8 +797,8 @@ static int intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct hdcp_port_data *data = &dig_port->hdcp_port_data;struct intel_hdcp *hdcp = &connector->hdcp;enum transcoder cpu_transcoder = hdcp->stream_transcoder;@@ -804,8 +806,8 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,enum port port = dig_port->base.port;int ret; -drm_WARN_ON (&i915->drm, enable && - !!(intel_de_read (i915,HDCP2_AUTH_STREAM (i915, cpu_transcoder, port)) +drm_WARN_ON (display->drm, enable && + !!(intel_de_read (display,HDCP2_AUTH_STREAM (display, cpu_transcoder, port)) &AUTH_STREAM_TYPE ) != data->streams[0 ].stream_type); ret =intel_dp_mst_toggle_hdcp_stream_select (connector, enable);@@ -813,11 +815,11 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,return ret;/* Wait for encryption confirmation */ -if (intel_de_wait (i915,HDCP2_STREAM_STATUS (i915, cpu_transcoder, pipe), +if (intel_de_wait (display,HDCP2_STREAM_STATUS (display, cpu_transcoder, pipe),STREAM_ENCRYPTION_STATUS , enable ?STREAM_ENCRYPTION_STATUS :0 ,HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { -drm_err (&i915->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" , +drm_err (display->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" ,transcoder_name (cpu_transcoder), enable ?"enabled" :"disabled" );return -ETIMEDOUT ; }Signature · 1 line
2.39.5
PATCH 6/11 drm/i915/crt: convert to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch CRT code over to it.
--- drivers/gpu/drm/i915/display/intel_crt.c | 207 +++++++++--------- drivers/gpu/drm/i915/display/intel_crt.h | 10 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../gpu/drm/i915/display/intel_pch_display.c | 3 +- 4 files changed, 122 insertions(+), 110 deletions(-)
drivers/gpu/drm/i915/display/intel_crt.c +109 -98
@@ -81,12 +81,13 @@ static struct intel_crt *intel_attached_crt(struct intel_connector *connector)return intel_encoder_to_crt (intel_attached_encoder (connector)); } -bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe) { +struct drm_i915_private *dev_priv =to_i915 (display->drm);u32 val; - val =intel_de_read (dev_priv, adpa_reg); + val =intel_de_read (display, adpa_reg);/* asserts want to know the pipe even if the port is disabled */ if (HAS_PCH_CPT (dev_priv))
@@ -100,6 +101,7 @@ bool intel_crt_port_enabled(struct drm_i915_private *dev_priv,static bool intel_crt_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder);intel_wakeref_t wakeref;
@@ -110,7 +112,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,if (!wakeref)return false; - ret =intel_crt_port_enabled (dev_priv, crt->adpa_reg, pipe); + ret =intel_crt_port_enabled (display, crt->adpa_reg, pipe);intel_display_power_put (dev_priv, encoder->power_domain, wakeref);
@@ -119,11 +121,11 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,static unsigned int intel_crt_get_flags (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_crt *crt =intel_encoder_to_crt (encoder);u32 tmp, flags =0 ; - tmp =intel_de_read (dev_priv, crt->adpa_reg); + tmp =intel_de_read (display, crt->adpa_reg);if (tmp &ADPA_HSYNC_ACTIVE_HIGH ) flags |=DRM_MODE_FLAG_PHSYNC ;
@@ -168,13 +170,14 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int mode) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa; -if (DISPLAY_VER (dev_priv) >=5 ) +if (DISPLAY_VER (display) >=5 ) adpa =ADPA_HOTPLUG_BITS ;else adpa =0 ;
@@ -193,7 +196,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, adpa |=ADPA_PIPE_SEL (crtc->pipe);if (!HAS_PCH_SPLIT (dev_priv)) -intel_de_write (dev_priv,BCLRPAT (dev_priv, crtc->pipe),0 ); +intel_de_write (display,BCLRPAT (display, crtc->pipe),0 );switch (mode) {case DRM_MODE_DPMS_ON :
@@ -210,7 +213,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder,break ; } -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); } static void intel_disable_crt(struct intel_atomic_state *state,
@@ -241,9 +244,10 @@ static void hsw_disable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -drm_WARN_ON (&dev_priv->drm, !old_crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !old_crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }
@@ -253,6 +257,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct intel_display *display = to_intel_display(state);struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);
@@ -272,7 +277,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state,hsw_fdi_disable (encoder); -drm_WARN_ON (&dev_priv->drm, !old_crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !old_crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , true); }
@@ -282,9 +287,10 @@ static void hsw_pre_pll_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }
@@ -294,11 +300,12 @@ static void hsw_pre_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false);
@@ -312,11 +319,12 @@ static void hsw_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_ddi_enable_transcoder_func (encoder, crtc_state);
@@ -346,9 +354,10 @@ static enum drm_mode_status intel_crt_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + struct intel_display *display = to_intel_display(connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -int max_dotclk = dev_priv->display.cdclk.max_dotclk_freq; +int max_dotclk = display->cdclk.max_dotclk_freq;enum drm_mode_status status;int max_clock;
@@ -367,7 +376,7 @@ intel_crt_mode_valid(struct drm_connector *connector,* DAC limit supposedly 355 MHz. */ max_clock =270000 ; - else if (IS_DISPLAY_VER(dev_priv, 3, 4)) + else if (IS_DISPLAY_VER(display, 3, 4)) max_clock =400000 ; else max_clock =350000 ;
@@ -428,6 +437,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
@@ -450,7 +460,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,if (HAS_PCH_LPT (dev_priv)) {/* TODO: Check crtc_state->max_link_bpp_x16 instead of bw_constrained */ if (pipe_config->bw_constrained && pipe_config->pipe_bpp <24 ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"LPT only supports 24bpp\n" );return -EINVAL ; }
@@ -470,6 +480,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,static bool ilk_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -483,36 +494,36 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector) crt->force_hotplug_required = false; - save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm, + save_adpa = adpa =intel_de_read (display, crt->adpa_reg); +drm_dbg_kms (display->drm,"trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ;if (turn_off_dac) adpa &= ~ADPA_DAC_ENABLE ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); -if (intel_de_wait_for_clear (dev_priv, +if (intel_de_wait_for_clear (display, crt->adpa_reg,ADPA_CRT_HOTPLUG_FORCE_TRIGGER ,1000 )) -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_TRIGGER" );if (turn_off_dac) { -intel_de_write (dev_priv, crt->adpa_reg, save_adpa); -intel_de_posting_read (dev_priv, crt->adpa_reg); +intel_de_write (display, crt->adpa_reg, save_adpa); +intel_de_posting_read (display, crt->adpa_reg); } }/* Check the status to see if both blue and green are on now */ - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else ret = false; -drm_dbg_kms (&dev_priv->drm,"ironlake hotplug adpa=0x%x, result %d\n" , +drm_dbg_kms (display->drm,"ironlake hotplug adpa=0x%x, result %d\n" , adpa, ret);return ret;
@@ -520,6 +531,7 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector)static bool valleyview_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -542,29 +554,29 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)*/ reenable_hpd =intel_hpd_disable (dev_priv, crt->base.hpd_pin); - save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm, + save_adpa = adpa =intel_de_read (display, crt->adpa_reg); +drm_dbg_kms (display->drm,"trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); -if (intel_de_wait_for_clear (dev_priv, crt->adpa_reg, +if (intel_de_wait_for_clear (display, crt->adpa_reg,ADPA_CRT_HOTPLUG_FORCE_TRIGGER ,1000 )) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_TRIGGER" ); -intel_de_write (dev_priv, crt->adpa_reg, save_adpa); +intel_de_write (display, crt->adpa_reg, save_adpa); }/* Check the status to see if both blue and green are on now */ - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else ret = false; -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"valleyview hotplug adpa=0x%x, result %d\n" , adpa, ret);if (reenable_hpd)
@@ -575,6 +587,7 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)static bool intel_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev);u32 stat;
@@ -603,18 +616,18 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)CRT_HOTPLUG_FORCE_DETECT , CRT_HOTPLUG_FORCE_DETECT);/* wait for FORCE_DETECT to go off */ -if (intel_de_wait_for_clear (dev_priv,PORT_HOTPLUG_EN (dev_priv), +if (intel_de_wait_for_clear (display,PORT_HOTPLUG_EN (display),CRT_HOTPLUG_FORCE_DETECT ,1000 )) -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_DETECT to go off" ); } - stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT (dev_priv)); + stat =intel_de_read (display,PORT_HOTPLUG_STAT (display));if ((stat &CRT_HOTPLUG_MONITOR_MASK ) !=CRT_HOTPLUG_MONITOR_NONE ) ret = true;/* clear the interrupt we just generated, if any */ -intel_de_write (dev_priv,PORT_HOTPLUG_STAT (dev_priv), +intel_de_write (display,PORT_HOTPLUG_STAT (display),CRT_HOTPLUG_INT_STATUS );i915_hotplug_interrupt_update (dev_priv,CRT_HOTPLUG_FORCE_DETECT ,0 );
@@ -660,8 +673,7 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector,static bool intel_crt_detect_ddc (struct drm_connector *connector) { -struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector)); -struct drm_i915_private *dev_priv =to_i915 (crt->base.base.dev); +struct intel_display *display =to_intel_display (connector->dev);const struct drm_edid *drm_edid;bool ret = false;
@@ -674,15 +686,15 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)* have to check the EDID input spec of the attached device. */ if (drm_edid_is_digital (drm_edid)) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via DDC:0x50 [EDID reports a digital panel]\n" ); }else { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT detected via DDC:0x50 [EDID]\n" ); ret = true; } }else { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via DDC:0x50 [no valid EDID found]\n" ); }
@@ -695,8 +707,6 @@ static enum drm_connector_status intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) {struct intel_display *display =to_intel_display (&crt->base); -struct drm_device *dev = crt->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum transcoder cpu_transcoder = (enum transcoder )pipe;u32 save_bclrpat;u32 save_vtotal;
@@ -707,14 +717,14 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)u8 st00;enum drm_connector_status status; -drm_dbg_kms (&dev_priv->drm,"starting load-detect on CRT\n" ); +drm_dbg_kms (display->drm,"starting load-detect on CRT\n" ); - save_bclrpat =intel_de_read (dev_priv, -BCLRPAT (dev_priv, cpu_transcoder)); - save_vtotal =intel_de_read (dev_priv, -TRANS_VTOTAL (dev_priv, cpu_transcoder)); - vblank =intel_de_read (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder)); + save_bclrpat =intel_de_read (display, +BCLRPAT (display, cpu_transcoder)); + save_vtotal =intel_de_read (display, +TRANS_VTOTAL (display, cpu_transcoder)); + vblank =intel_de_read (display, +TRANS_VBLANK (display, cpu_transcoder)); vtotal =REG_FIELD_GET (VTOTAL_MASK , save_vtotal) +1 ; vactive =REG_FIELD_GET (VACTIVE_MASK , save_vtotal) +1 ;
@@ -723,25 +733,25 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) vblank_end =REG_FIELD_GET (VBLANK_END_MASK , vblank) +1 ;/* Set the border color to purple. */ -intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder),0x500050 ); +intel_de_write (display,BCLRPAT (display, cpu_transcoder),0x500050 ); -if (DISPLAY_VER (dev_priv) !=2 ) { -u32 transconf =intel_de_read (dev_priv, -TRANSCONF (dev_priv, cpu_transcoder)); +if (DISPLAY_VER (display) !=2 ) { +u32 transconf =intel_de_read (display, +TRANSCONF (display, cpu_transcoder)); -intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), +intel_de_write (display,TRANSCONF (display, cpu_transcoder), transconf |TRANSCONF_FORCE_BORDER ); -intel_de_posting_read (dev_priv, -TRANSCONF (dev_priv, cpu_transcoder)); +intel_de_posting_read (display, +TRANSCONF (display, cpu_transcoder));/* Wait for next Vblank to substitue * border color for Color info */ intel_crtc_wait_for_next_vblank (intel_crtc_for_pipe (display, pipe)); - st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE); + st00 =intel_de_read8 (display, _VGA_MSR_WRITE); status = ((st00 & (1 <<4 )) !=0 ) ? connector_status_connected : connector_status_disconnected; -intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), +intel_de_write (display,TRANSCONF (display, cpu_transcoder), transconf); }else {bool restore_vblank = false;
@@ -752,13 +762,13 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)* Yes, this will flicker */ if (vblank_start <= vactive && vblank_end >= vtotal) { -u32 vsync =intel_de_read (dev_priv, -TRANS_VSYNC (dev_priv, cpu_transcoder)); +u32 vsync =intel_de_read (display, +TRANS_VSYNC (display, cpu_transcoder));u32 vsync_start =REG_FIELD_GET (VSYNC_START_MASK , vsync) +1 ; vblank_start = vsync_start; -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder), +intel_de_write (display, +TRANS_VBLANK (display, cpu_transcoder),VBLANK_START (vblank_start -1 ) |VBLANK_END (vblank_end -1 )); restore_vblank = true;
@@ -772,9 +782,9 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)/* * Wait for the border to be displayed */ -while (intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) >= vactive) +while (intel_de_read (display,PIPEDSL (display, pipe)) >= vactive) ; -while ((dsl =intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe))) <= vsample) +while ((dsl =intel_de_read (display,PIPEDSL (display, pipe))) <= vsample) ;/* * Watch ST00 for an entire scanline
@@ -784,15 +794,15 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)do { count++;/* Read the ST00 VGA status register */ - st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE); + st00 =intel_de_read8 (display, _VGA_MSR_WRITE);if (st00 & (1 <<4 )) detect++; - }while ((intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) == dsl)); + }while ((intel_de_read (display,PIPEDSL (display, pipe)) == dsl));/* restore vblank if necessary */ if (restore_vblank) -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder), +intel_de_write (display, +TRANS_VBLANK (display, cpu_transcoder), vblank);/* * If more than 3/4 of the scanline detected a monitor,
@@ -806,7 +816,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) }/* Restore previous settings */ -intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder), +intel_de_write (display,BCLRPAT (display, cpu_transcoder), save_bclrpat);return status;
@@ -843,6 +853,7 @@ intel_crt_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_i915_private *dev_priv =to_i915 (connector->dev);struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct intel_encoder *intel_encoder = &crt->base;
@@ -850,7 +861,7 @@ intel_crt_detect(struct drm_connector *connector,intel_wakeref_t wakeref;int status; -drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s] force=%d\n" , +drm_dbg_kms (display->drm,"[CONNECTOR:%d:%s] force=%d\n" , connector->base.id, connector->name, force);
@@ -860,7 +871,7 @@ intel_crt_detect(struct drm_connector *connector,if (!intel_display_driver_check_access (dev_priv))return connector->status; -if (dev_priv->display.params.load_detect_test) { +if (display->params.load_detect_test) { wakeref =intel_display_power_get (dev_priv, intel_encoder->power_domain); goto load_detect;
@@ -873,18 +884,18 @@ intel_crt_detect(struct drm_connector *connector, wakeref =intel_display_power_get (dev_priv, intel_encoder->power_domain); -if (I915_HAS_HOTPLUG (dev_priv)) { +if (I915_HAS_HOTPLUG (display)) {/* We can not rely on the HPD pin always being correctly wired * up, for example many KVM do not pass it through, and so * only trust an assertion that the monitor is connected. */ if (intel_crt_detect_hotplug (connector)) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT detected via hotplug\n" ); status = connector_status_connected; goto out; }else -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via hotplug\n" ); }
@@ -897,7 +908,7 @@ intel_crt_detect(struct drm_connector *connector,* broken monitor (without edid) to work behind a broken kvm (that fails * to have the right resistors for HP detection) needs to fix this up. * For now just bail out. */ -if (I915_HAS_HOTPLUG (dev_priv)) { +if (I915_HAS_HOTPLUG (display)) { status = connector_status_disconnected; goto out; }
@@ -917,10 +928,10 @@ intel_crt_detect(struct drm_connector *connector, }else {if (intel_crt_detect_ddc (connector)) status = connector_status_connected; -else if (DISPLAY_VER (dev_priv) <4 ) +else if (DISPLAY_VER (display) <4 ) status =intel_crt_load_detect (crt,to_intel_crtc (connector->state->crtc)->pipe); -else if (dev_priv->display.params.load_detect_test) +else if (display->params.load_detect_test) status = connector_status_disconnected;else status = connector_status_unknown;
@@ -966,19 +977,19 @@ static int intel_crt_get_modes(struct drm_connector *connector)void intel_crt_reset (struct drm_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->dev); +struct intel_display *display =to_intel_display (encoder->dev);struct intel_crt *crt =intel_encoder_to_crt (to_intel_encoder (encoder)); -if (DISPLAY_VER (dev_priv) >=5 ) { +if (DISPLAY_VER (display) >=5 ) {u32 adpa; - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg); adpa &= ~ADPA_CRT_HOTPLUG_MASK ; adpa |=ADPA_HOTPLUG_BITS ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); -intel_de_posting_read (dev_priv, crt->adpa_reg); +intel_de_write (display, crt->adpa_reg, adpa); +intel_de_posting_read (display, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm,"crt adpa set to 0x%x\n" , adpa); +drm_dbg_kms (display->drm,"crt adpa set to 0x%x\n" , adpa); crt->force_hotplug_required = true; }
@@ -1008,9 +1019,9 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = { .destroy = intel_encoder_destroy, }; -void intel_crt_init (struct drm_i915_private *dev_priv) +void intel_crt_init (struct intel_display *display) { -struct intel_display *display = &dev_priv->display; +struct drm_i915_private *dev_priv =to_i915 (display->drm);struct drm_connector *connector;struct intel_crt *crt;struct intel_connector *intel_connector;
@@ -1025,7 +1036,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)else adpa_reg =ADPA ; - adpa =intel_de_read (dev_priv, adpa_reg); + adpa =intel_de_read (display, adpa_reg);if ((adpa &ADPA_DAC_ENABLE ) ==0 ) {/* * On some machines (some IVB at least) CRT can be
@@ -1035,11 +1046,11 @@ void intel_crt_init(struct drm_i915_private *dev_priv)* take. So the only way to tell is attempt to enable * it and see what happens. */ -intel_de_write (dev_priv, adpa_reg, +intel_de_write (display, adpa_reg, adpa |ADPA_DAC_ENABLE |ADPA_HSYNC_CNTL_DISABLE |ADPA_VSYNC_CNTL_DISABLE ); -if ((intel_de_read (dev_priv, adpa_reg) &ADPA_DAC_ENABLE ) ==0 ) +if ((intel_de_read (display, adpa_reg) &ADPA_DAC_ENABLE ) ==0 )return ; -intel_de_write (dev_priv, adpa_reg, adpa); +intel_de_write (display, adpa_reg, adpa); } crt =kzalloc (sizeof (struct intel_crt ),GFP_KERNEL );
@@ -1052,16 +1063,16 @@ void intel_crt_init(struct drm_i915_private *dev_priv)return ; } - ddc_pin = dev_priv->display.vbt.crt_ddc_pin; + ddc_pin = display->vbt.crt_ddc_pin; connector = &intel_connector->base; crt->connector = intel_connector; -drm_connector_init_with_ddc (&dev_priv->drm, connector, +drm_connector_init_with_ddc (display->drm, connector, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA ,intel_gmbus_get_adapter (display, ddc_pin)); -drm_encoder_init (&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs, +drm_encoder_init (display->drm, &crt->base.base, &intel_crt_enc_funcs,DRM_MODE_ENCODER_DAC ,"CRT" );intel_connector_attach_encoder (intel_connector, &crt->base);
@@ -1073,14 +1084,14 @@ void intel_crt_init(struct drm_i915_private *dev_priv)else crt->base.pipe_mask = ~0 ; -if (DISPLAY_VER (dev_priv) !=2 ) +if (DISPLAY_VER (display) !=2 ) connector->interlace_allowed = true; crt->adpa_reg = adpa_reg; crt->base.power_domain =POWER_DOMAIN_PORT_CRT ; -if (I915_HAS_HOTPLUG (dev_priv) && +if (I915_HAS_HOTPLUG (display) && !dmi_check_system (intel_spurious_crt_detect)) { crt->base.hpd_pin =HPD_CRT ; crt->base.hotplug = intel_encoder_hotplug;
@@ -1090,7 +1101,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv) } intel_connector->base.polled = intel_connector->polled; -if (HAS_DDI (dev_priv)) { +if (HAS_DDI (display)) {assert_port_valid (dev_priv,PORT_E ); crt->base.port =PORT_E ;
@@ -1134,7 +1145,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)u32 fdi_config =FDI_RX_POLARITY_REVERSED_LPT |FDI_RX_LINK_REVERSAL_OVERRIDE ; - dev_priv->display.fdi.rx_config =intel_de_read (dev_priv, + display->fdi.rx_config =intel_de_read (display,FDI_RX_CTL (PIPE_A )) & fdi_config; }
drivers/gpu/drm/i915/display/intel_crt.h +5 -5
@@ -10,20 +10,20 @@enum pipe ;struct drm_encoder ; -struct drm_i915_private ; +struct intel_display ;#ifdef I915 -bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe); -void intel_crt_init (struct drm_i915_private *dev_priv); +void intel_crt_init (struct intel_display *display);void intel_crt_reset (struct drm_encoder *encoder);#else -static inline bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +static inline bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe) {return false; } -static inline void intel_crt_init (struct drm_i915_private *dev_priv) +static inline void intel_crt_init (struct intel_display *display) { }static inline void intel_crt_reset (struct drm_encoder *encoder)
drivers/gpu/drm/i915/display/intel_display.c +6 -6
@@ -8147,7 +8147,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)if (HAS_DDI (dev_priv)) {if (intel_ddi_crt_present (dev_priv)) -intel_crt_init (dev_priv); +intel_crt_init (display);intel_bios_for_each_encoder (display, intel_ddi_init);
@@ -8162,7 +8162,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)* incorrect sharing of the PPS. */ intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display); dpd_is_edp =intel_dp_is_port_edp (dev_priv,PORT_D );
@@ -8193,7 +8193,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)bool has_edp, has_port;if (IS_VALLEYVIEW (dev_priv) && dev_priv->display.vbt.int_crt_support) -intel_crt_init (dev_priv); +intel_crt_init (display);/* * The DP_DETECTED bit is the latched state of the DDC
@@ -8239,14 +8239,14 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)vlv_dsi_init (dev_priv); }else if (IS_PINEVIEW (dev_priv)) {intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display); }else if (IS_DISPLAY_VER (dev_priv,3 ,4 )) {bool found = false;if (IS_MOBILE (dev_priv))intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display);if (intel_de_read (dev_priv,GEN3_SDVOB ) &SDVO_DETECTED ) {drm_dbg_kms (&dev_priv->drm,"probing SDVOB\n" );
@@ -8288,7 +8288,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)if (IS_I85X (dev_priv))intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display);intel_dvo_init (dev_priv); }
drivers/gpu/drm/i915/display/intel_pch_display.c +2 -1
@@ -76,6 +76,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv,static void assert_pch_ports_disabled (struct drm_i915_private *dev_priv,enum pipe pipe) { +struct intel_display *display = &dev_priv->display;enum pipe port_pipe;assert_pch_dp_disabled (dev_priv, pipe,PORT_B ,PCH_DP_B );
@@ -83,7 +84,7 @@ static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv,assert_pch_dp_disabled (dev_priv, pipe,PORT_D ,PCH_DP_D );I915_STATE_WARN (dev_priv, -intel_crt_port_enabled (dev_priv,PCH_ADPA , &port_pipe) && port_pipe == pipe, +intel_crt_port_enabled (display,PCH_ADPA , &port_pipe) && port_pipe == pipe,"PCH VGA enabled on transcoder %c, should be disabled\n" ,pipe_name (pipe));
Signature · 1 line
2.39.5
Re: [PATCH 06/11] drm/i915/crt: convert to struct intel_display
Quoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch CRT code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 782 lines
--- drivers/gpu/drm/i915/display/intel_crt.c | 207 +++++++++--------- drivers/gpu/drm/i915/display/intel_crt.h | 10 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../gpu/drm/i915/display/intel_pch_display.c | 3 +- 4 files changed, 122 insertions(+), 110 deletions(-)drivers/gpu/drm/i915/display/intel_crt.c +109
-98@@ -81,12 +81,13 @@ static struct intel_crt *intel_attached_crt(struct intel_connector *connector)return intel_encoder_to_crt (intel_attached_encoder (connector)); } -bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe) { +struct drm_i915_private *dev_priv =to_i915 (display->drm);u32 val; - val =intel_de_read (dev_priv, adpa_reg); + val =intel_de_read (display, adpa_reg);/* asserts want to know the pipe even if the port is disabled */ if (HAS_PCH_CPT (dev_priv))@@ -100,6 +101,7 @@ bool intel_crt_port_enabled(struct drm_i915_private *dev_priv,static bool intel_crt_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder);intel_wakeref_t wakeref;@@ -110,7 +112,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,if (!wakeref)return false; - ret =intel_crt_port_enabled (dev_priv, crt->adpa_reg, pipe); + ret =intel_crt_port_enabled (display, crt->adpa_reg, pipe);intel_display_power_put (dev_priv, encoder->power_domain, wakeref);@@ -119,11 +121,11 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,static unsigned int intel_crt_get_flags (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_crt *crt =intel_encoder_to_crt (encoder);u32 tmp, flags =0 ; - tmp =intel_de_read (dev_priv, crt->adpa_reg); + tmp =intel_de_read (display, crt->adpa_reg);if (tmp &ADPA_HSYNC_ACTIVE_HIGH ) flags |=DRM_MODE_FLAG_PHSYNC ;@@ -168,13 +170,14 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int mode) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa; -if (DISPLAY_VER (dev_priv) >=5 ) +if (DISPLAY_VER (display) >=5 ) adpa =ADPA_HOTPLUG_BITS ;else adpa =0 ;@@ -193,7 +196,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, adpa |=ADPA_PIPE_SEL (crtc->pipe);if (!HAS_PCH_SPLIT (dev_priv)) -intel_de_write (dev_priv,BCLRPAT (dev_priv, crtc->pipe),0 ); +intel_de_write (display,BCLRPAT (display, crtc->pipe),0 );switch (mode) {case DRM_MODE_DPMS_ON :@@ -210,7 +213,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder,break ; } -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); } static void intel_disable_crt(struct intel_atomic_state *state,@@ -241,9 +244,10 @@ static void hsw_disable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -drm_WARN_ON (&dev_priv->drm, !old_crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !old_crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }@@ -253,6 +257,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct intel_display *display = to_intel_display(state);struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);@@ -272,7 +277,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state,hsw_fdi_disable (encoder); -drm_WARN_ON (&dev_priv->drm, !old_crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !old_crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , true); }@@ -282,9 +287,10 @@ static void hsw_pre_pll_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }@@ -294,11 +300,12 @@ static void hsw_pre_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false);@@ -312,11 +319,12 @@ static void hsw_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_ddi_enable_transcoder_func (encoder, crtc_state);@@ -346,9 +354,10 @@ static enum drm_mode_status intel_crt_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + struct intel_display *display = to_intel_display(connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -int max_dotclk = dev_priv->display.cdclk.max_dotclk_freq; +int max_dotclk = display->cdclk.max_dotclk_freq;enum drm_mode_status status;int max_clock;@@ -367,7 +376,7 @@ intel_crt_mode_valid(struct drm_connector *connector,* DAC limit supposedly 355 MHz. */ max_clock =270000 ; - else if (IS_DISPLAY_VER(dev_priv, 3, 4)) + else if (IS_DISPLAY_VER(display, 3, 4)) max_clock =400000 ; else max_clock =350000 ;@@ -428,6 +437,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;@@ -450,7 +460,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,if (HAS_PCH_LPT (dev_priv)) {/* TODO: Check crtc_state->max_link_bpp_x16 instead of bw_constrained */ if (pipe_config->bw_constrained && pipe_config->pipe_bpp <24 ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"LPT only supports 24bpp\n" );return -EINVAL ; }@@ -470,6 +480,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,static bool ilk_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct drm_i915_private *dev_priv =to_i915 (dev);@@ -483,36 +494,36 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector) crt->force_hotplug_required = false; - save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm, + save_adpa = adpa =intel_de_read (display, crt->adpa_reg); +drm_dbg_kms (display->drm,"trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ;if (turn_off_dac) adpa &= ~ADPA_DAC_ENABLE ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); -if (intel_de_wait_for_clear (dev_priv, +if (intel_de_wait_for_clear (display, crt->adpa_reg,ADPA_CRT_HOTPLUG_FORCE_TRIGGER ,1000 )) -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_TRIGGER" );if (turn_off_dac) { -intel_de_write (dev_priv, crt->adpa_reg, save_adpa); -intel_de_posting_read (dev_priv, crt->adpa_reg); +intel_de_write (display, crt->adpa_reg, save_adpa); +intel_de_posting_read (display, crt->adpa_reg); } }/* Check the status to see if both blue and green are on now */ - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else ret = false; -drm_dbg_kms (&dev_priv->drm,"ironlake hotplug adpa=0x%x, result %d\n" , +drm_dbg_kms (display->drm,"ironlake hotplug adpa=0x%x, result %d\n" , adpa, ret);return ret;@@ -520,6 +531,7 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector)static bool valleyview_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct drm_i915_private *dev_priv =to_i915 (dev);@@ -542,29 +554,29 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)*/ reenable_hpd =intel_hpd_disable (dev_priv, crt->base.hpd_pin); - save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm, + save_adpa = adpa =intel_de_read (display, crt->adpa_reg); +drm_dbg_kms (display->drm,"trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); -if (intel_de_wait_for_clear (dev_priv, crt->adpa_reg, +if (intel_de_wait_for_clear (display, crt->adpa_reg,ADPA_CRT_HOTPLUG_FORCE_TRIGGER ,1000 )) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_TRIGGER" ); -intel_de_write (dev_priv, crt->adpa_reg, save_adpa); +intel_de_write (display, crt->adpa_reg, save_adpa); }/* Check the status to see if both blue and green are on now */ - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else ret = false; -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"valleyview hotplug adpa=0x%x, result %d\n" , adpa, ret);if (reenable_hpd)@@ -575,6 +587,7 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)static bool intel_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev);u32 stat;@@ -603,18 +616,18 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)CRT_HOTPLUG_FORCE_DETECT , CRT_HOTPLUG_FORCE_DETECT);/* wait for FORCE_DETECT to go off */ -if (intel_de_wait_for_clear (dev_priv,PORT_HOTPLUG_EN (dev_priv), +if (intel_de_wait_for_clear (display,PORT_HOTPLUG_EN (display),CRT_HOTPLUG_FORCE_DETECT ,1000 )) -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_DETECT to go off" ); } - stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT (dev_priv)); + stat =intel_de_read (display,PORT_HOTPLUG_STAT (display));if ((stat &CRT_HOTPLUG_MONITOR_MASK ) !=CRT_HOTPLUG_MONITOR_NONE ) ret = true;/* clear the interrupt we just generated, if any */ -intel_de_write (dev_priv,PORT_HOTPLUG_STAT (dev_priv), +intel_de_write (display,PORT_HOTPLUG_STAT (display),CRT_HOTPLUG_INT_STATUS );i915_hotplug_interrupt_update (dev_priv,CRT_HOTPLUG_FORCE_DETECT ,0 );@@ -660,8 +673,7 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector,static bool intel_crt_detect_ddc (struct drm_connector *connector) { -struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector)); -struct drm_i915_private *dev_priv =to_i915 (crt->base.base.dev); +struct intel_display *display =to_intel_display (connector->dev);const struct drm_edid *drm_edid;bool ret = false;@@ -674,15 +686,15 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)* have to check the EDID input spec of the attached device. */ if (drm_edid_is_digital (drm_edid)) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via DDC:0x50 [EDID reports a digital panel]\n" ); }else { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT detected via DDC:0x50 [EDID]\n" ); ret = true; } }else { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via DDC:0x50 [no valid EDID found]\n" ); }@@ -695,8 +707,6 @@ static enum drm_connector_status intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) {struct intel_display *display =to_intel_display (&crt->base); -struct drm_device *dev = crt->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum transcoder cpu_transcoder = (enum transcoder )pipe;u32 save_bclrpat;u32 save_vtotal;@@ -707,14 +717,14 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)u8 st00;enum drm_connector_status status; -drm_dbg_kms (&dev_priv->drm,"starting load-detect on CRT\n" ); +drm_dbg_kms (display->drm,"starting load-detect on CRT\n" ); - save_bclrpat =intel_de_read (dev_priv, -BCLRPAT (dev_priv, cpu_transcoder)); - save_vtotal =intel_de_read (dev_priv, -TRANS_VTOTAL (dev_priv, cpu_transcoder)); - vblank =intel_de_read (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder)); + save_bclrpat =intel_de_read (display, +BCLRPAT (display, cpu_transcoder)); + save_vtotal =intel_de_read (display, +TRANS_VTOTAL (display, cpu_transcoder)); + vblank =intel_de_read (display, +TRANS_VBLANK (display, cpu_transcoder)); vtotal =REG_FIELD_GET (VTOTAL_MASK , save_vtotal) +1 ; vactive =REG_FIELD_GET (VACTIVE_MASK , save_vtotal) +1 ;@@ -723,25 +733,25 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) vblank_end =REG_FIELD_GET (VBLANK_END_MASK , vblank) +1 ;/* Set the border color to purple. */ -intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder),0x500050 ); +intel_de_write (display,BCLRPAT (display, cpu_transcoder),0x500050 ); -if (DISPLAY_VER (dev_priv) !=2 ) { -u32 transconf =intel_de_read (dev_priv, -TRANSCONF (dev_priv, cpu_transcoder)); +if (DISPLAY_VER (display) !=2 ) { +u32 transconf =intel_de_read (display, +TRANSCONF (display, cpu_transcoder)); -intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), +intel_de_write (display,TRANSCONF (display, cpu_transcoder), transconf |TRANSCONF_FORCE_BORDER ); -intel_de_posting_read (dev_priv, -TRANSCONF (dev_priv, cpu_transcoder)); +intel_de_posting_read (display, +TRANSCONF (display, cpu_transcoder));/* Wait for next Vblank to substitue * border color for Color info */ intel_crtc_wait_for_next_vblank (intel_crtc_for_pipe (display, pipe)); - st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE); + st00 =intel_de_read8 (display, _VGA_MSR_WRITE); status = ((st00 & (1 <<4 )) !=0 ) ? connector_status_connected : connector_status_disconnected; -intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), +intel_de_write (display,TRANSCONF (display, cpu_transcoder), transconf); }else {bool restore_vblank = false;@@ -752,13 +762,13 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)* Yes, this will flicker */ if (vblank_start <= vactive && vblank_end >= vtotal) { -u32 vsync =intel_de_read (dev_priv, -TRANS_VSYNC (dev_priv, cpu_transcoder)); +u32 vsync =intel_de_read (display, +TRANS_VSYNC (display, cpu_transcoder));u32 vsync_start =REG_FIELD_GET (VSYNC_START_MASK , vsync) +1 ; vblank_start = vsync_start; -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder), +intel_de_write (display, +TRANS_VBLANK (display, cpu_transcoder),VBLANK_START (vblank_start -1 ) |VBLANK_END (vblank_end -1 )); restore_vblank = true;@@ -772,9 +782,9 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)/* * Wait for the border to be displayed */ -while (intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) >= vactive) +while (intel_de_read (display,PIPEDSL (display, pipe)) >= vactive) ; -while ((dsl =intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe))) <= vsample) +while ((dsl =intel_de_read (display,PIPEDSL (display, pipe))) <= vsample) ;/* * Watch ST00 for an entire scanline @@ -784,15 +794,15 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)do { count++;/* Read the ST00 VGA status register */ - st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE); + st00 =intel_de_read8 (display, _VGA_MSR_WRITE);if (st00 & (1 <<4 )) detect++; - }while ((intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) == dsl)); + }while ((intel_de_read (display,PIPEDSL (display, pipe)) == dsl));/* restore vblank if necessary */ if (restore_vblank) -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder), +intel_de_write (display, +TRANS_VBLANK (display, cpu_transcoder), vblank);/* * If more than 3/4 of the scanline detected a monitor, @@ -806,7 +816,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) }/* Restore previous settings */ -intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder), +intel_de_write (display,BCLRPAT (display, cpu_transcoder), save_bclrpat);return status;@@ -843,6 +853,7 @@ intel_crt_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_i915_private *dev_priv =to_i915 (connector->dev);struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct intel_encoder *intel_encoder = &crt->base;@@ -850,7 +861,7 @@ intel_crt_detect(struct drm_connector *connector,intel_wakeref_t wakeref;int status; -drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s] force=%d\n" , +drm_dbg_kms (display->drm,"[CONNECTOR:%d:%s] force=%d\n" , connector->base.id, connector->name, force);@@ -860,7 +871,7 @@ intel_crt_detect(struct drm_connector *connector,if (!intel_display_driver_check_access (dev_priv))return connector->status; -if (dev_priv->display.params.load_detect_test) { +if (display->params.load_detect_test) { wakeref =intel_display_power_get (dev_priv, intel_encoder->power_domain); goto load_detect;@@ -873,18 +884,18 @@ intel_crt_detect(struct drm_connector *connector, wakeref =intel_display_power_get (dev_priv, intel_encoder->power_domain); -if (I915_HAS_HOTPLUG (dev_priv)) { +if (I915_HAS_HOTPLUG (display)) {/* We can not rely on the HPD pin always being correctly wired * up, for example many KVM do not pass it through, and so * only trust an assertion that the monitor is connected. */ if (intel_crt_detect_hotplug (connector)) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT detected via hotplug\n" ); status = connector_status_connected; goto out; }else -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via hotplug\n" ); }@@ -897,7 +908,7 @@ intel_crt_detect(struct drm_connector *connector,* broken monitor (without edid) to work behind a broken kvm (that fails * to have the right resistors for HP detection) needs to fix this up. * For now just bail out. */ -if (I915_HAS_HOTPLUG (dev_priv)) { +if (I915_HAS_HOTPLUG (display)) { status = connector_status_disconnected; goto out; }@@ -917,10 +928,10 @@ intel_crt_detect(struct drm_connector *connector, }else {if (intel_crt_detect_ddc (connector)) status = connector_status_connected; -else if (DISPLAY_VER (dev_priv) <4 ) +else if (DISPLAY_VER (display) <4 ) status =intel_crt_load_detect (crt,to_intel_crtc (connector->state->crtc)->pipe); -else if (dev_priv->display.params.load_detect_test) +else if (display->params.load_detect_test) status = connector_status_disconnected;else status = connector_status_unknown;@@ -966,19 +977,19 @@ static int intel_crt_get_modes(struct drm_connector *connector)void intel_crt_reset (struct drm_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->dev); +struct intel_display *display =to_intel_display (encoder->dev);struct intel_crt *crt =intel_encoder_to_crt (to_intel_encoder (encoder)); -if (DISPLAY_VER (dev_priv) >=5 ) { +if (DISPLAY_VER (display) >=5 ) {u32 adpa; - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg); adpa &= ~ADPA_CRT_HOTPLUG_MASK ; adpa |=ADPA_HOTPLUG_BITS ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); -intel_de_posting_read (dev_priv, crt->adpa_reg); +intel_de_write (display, crt->adpa_reg, adpa); +intel_de_posting_read (display, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm,"crt adpa set to 0x%x\n" , adpa); +drm_dbg_kms (display->drm,"crt adpa set to 0x%x\n" , adpa); crt->force_hotplug_required = true; }@@ -1008,9 +1019,9 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = { .destroy = intel_encoder_destroy, }; -void intel_crt_init (struct drm_i915_private *dev_priv) +void intel_crt_init (struct intel_display *display) { -struct intel_display *display = &dev_priv->display; +struct drm_i915_private *dev_priv =to_i915 (display->drm);struct drm_connector *connector;struct intel_crt *crt;struct intel_connector *intel_connector;@@ -1025,7 +1036,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)else adpa_reg =ADPA ; - adpa =intel_de_read (dev_priv, adpa_reg); + adpa =intel_de_read (display, adpa_reg);if ((adpa &ADPA_DAC_ENABLE ) ==0 ) {/* * On some machines (some IVB at least) CRT can be @@ -1035,11 +1046,11 @@ void intel_crt_init(struct drm_i915_private *dev_priv)* take. So the only way to tell is attempt to enable * it and see what happens. */ -intel_de_write (dev_priv, adpa_reg, +intel_de_write (display, adpa_reg, adpa |ADPA_DAC_ENABLE |ADPA_HSYNC_CNTL_DISABLE |ADPA_VSYNC_CNTL_DISABLE ); -if ((intel_de_read (dev_priv, adpa_reg) &ADPA_DAC_ENABLE ) ==0 ) +if ((intel_de_read (display, adpa_reg) &ADPA_DAC_ENABLE ) ==0 )return ; -intel_de_write (dev_priv, adpa_reg, adpa); +intel_de_write (display, adpa_reg, adpa); } crt =kzalloc (sizeof (struct intel_crt ),GFP_KERNEL );@@ -1052,16 +1063,16 @@ void intel_crt_init(struct drm_i915_private *dev_priv)return ; } - ddc_pin = dev_priv->display.vbt.crt_ddc_pin; + ddc_pin = display->vbt.crt_ddc_pin; connector = &intel_connector->base; crt->connector = intel_connector; -drm_connector_init_with_ddc (&dev_priv->drm, connector, +drm_connector_init_with_ddc (display->drm, connector, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA ,intel_gmbus_get_adapter (display, ddc_pin)); -drm_encoder_init (&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs, +drm_encoder_init (display->drm, &crt->base.base, &intel_crt_enc_funcs,DRM_MODE_ENCODER_DAC ,"CRT" );intel_connector_attach_encoder (intel_connector, &crt->base);@@ -1073,14 +1084,14 @@ void intel_crt_init(struct drm_i915_private *dev_priv)else crt->base.pipe_mask = ~0 ; -if (DISPLAY_VER (dev_priv) !=2 ) +if (DISPLAY_VER (display) !=2 ) connector->interlace_allowed = true; crt->adpa_reg = adpa_reg; crt->base.power_domain =POWER_DOMAIN_PORT_CRT ; -if (I915_HAS_HOTPLUG (dev_priv) && +if (I915_HAS_HOTPLUG (display) && !dmi_check_system (intel_spurious_crt_detect)) { crt->base.hpd_pin =HPD_CRT ; crt->base.hotplug = intel_encoder_hotplug;@@ -1090,7 +1101,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv) } intel_connector->base.polled = intel_connector->polled; -if (HAS_DDI (dev_priv)) { +if (HAS_DDI (display)) {assert_port_valid (dev_priv,PORT_E ); crt->base.port =PORT_E ;@@ -1134,7 +1145,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)u32 fdi_config =FDI_RX_POLARITY_REVERSED_LPT |FDI_RX_LINK_REVERSAL_OVERRIDE ; - dev_priv->display.fdi.rx_config =intel_de_read (dev_priv, + display->fdi.rx_config =intel_de_read (display,FDI_RX_CTL (PIPE_A )) & fdi_config; }drivers/gpu/drm/i915/display/intel_crt.h +5
-5@@ -10,20 +10,20 @@enum pipe ;struct drm_encoder ; -struct drm_i915_private ; +struct intel_display ;#ifdef I915 -bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe); -void intel_crt_init (struct drm_i915_private *dev_priv); +void intel_crt_init (struct intel_display *display);void intel_crt_reset (struct drm_encoder *encoder);#else -static inline bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +static inline bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe) {return false; } -static inline void intel_crt_init (struct drm_i915_private *dev_priv) +static inline void intel_crt_init (struct intel_display *display) { }static inline void intel_crt_reset (struct drm_encoder *encoder)drivers/gpu/drm/i915/display/intel_display.c +6
-6@@ -8147,7 +8147,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)if (HAS_DDI (dev_priv)) {if (intel_ddi_crt_present (dev_priv)) -intel_crt_init (dev_priv); +intel_crt_init (display);intel_bios_for_each_encoder (display, intel_ddi_init);@@ -8162,7 +8162,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)* incorrect sharing of the PPS. */ intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display); dpd_is_edp =intel_dp_is_port_edp (dev_priv,PORT_D );@@ -8193,7 +8193,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)bool has_edp, has_port;if (IS_VALLEYVIEW (dev_priv) && dev_priv->display.vbt.int_crt_support) -intel_crt_init (dev_priv); +intel_crt_init (display);/* * The DP_DETECTED bit is the latched state of the DDC @@ -8239,14 +8239,14 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)vlv_dsi_init (dev_priv); }else if (IS_PINEVIEW (dev_priv)) {intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display); }else if (IS_DISPLAY_VER (dev_priv,3 ,4 )) {bool found = false;if (IS_MOBILE (dev_priv))intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display);if (intel_de_read (dev_priv,GEN3_SDVOB ) &SDVO_DETECTED ) {drm_dbg_kms (&dev_priv->drm,"probing SDVOB\n" );@@ -8288,7 +8288,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)if (IS_I85X (dev_priv))intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display);intel_dvo_init (dev_priv); }drivers/gpu/drm/i915/display/intel_pch_display.c +2
-1@@ -76,6 +76,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv,static void assert_pch_ports_disabled (struct drm_i915_private *dev_priv,enum pipe pipe) { +struct intel_display *display = &dev_priv->display;enum pipe port_pipe;assert_pch_dp_disabled (dev_priv, pipe,PORT_B ,PCH_DP_B );@@ -83,7 +84,7 @@ static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv,assert_pch_dp_disabled (dev_priv, pipe,PORT_D ,PCH_DP_D );I915_STATE_WARN (dev_priv, -intel_crt_port_enabled (dev_priv,PCH_ADPA , &port_pipe) && port_pipe == pipe, +intel_crt_port_enabled (display,PCH_ADPA , &port_pipe) && port_pipe == pipe,"PCH VGA enabled on transcoder %c, should be disabled\n" ,pipe_name (pipe));Signature · 1 line
2.39.5
PATCH 7/11 drm/i915/display: convert vlv_wait_port_ready() to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch vlv_wait_port_ready() over to it. The main motivation to do just one function is to stop passing i915 to intel_de_wait(), so its generic wrapper can be removed.
--- drivers/gpu/drm/i915/display/g4x_dp.c | 3 +-- drivers/gpu/drm/i915/display/g4x_hdmi.c | 9 ++++----- drivers/gpu/drm/i915/display/intel_display.c | 12 ++++++------ drivers/gpu/drm/i915/display/intel_display.h | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/g4x_dp.c +1 -2
@@ -706,8 +706,7 @@ static void intel_enable_dp(struct intel_atomic_state *state,if (IS_CHERRYVIEW (dev_priv)) lane_mask =intel_dp_unused_lane_mask (pipe_config->lane_count); -vlv_wait_port_ready (dev_priv,dp_to_dig_port (intel_dp), - lane_mask); +vlv_wait_port_ready (display,dp_to_dig_port (intel_dp), lane_mask); }intel_dp_set_power (intel_dp,DP_SET_POWER_D0 );
drivers/gpu/drm/i915/display/g4x_hdmi.c +4 -5
@@ -480,8 +480,8 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);vlv_phy_pre_encoder_enable (encoder, pipe_config);
@@ -496,7 +496,7 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,g4x_hdmi_enable_port (encoder, pipe_config); -vlv_wait_port_ready (dev_priv, dig_port,0x0 ); +vlv_wait_port_ready (display, dig_port,0x0 ); } static void vlv_hdmi_pre_pll_enable(struct intel_atomic_state *state,
@@ -557,9 +557,8 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);chv_phy_pre_encoder_enable (encoder, pipe_config);
@@ -573,7 +572,7 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,g4x_hdmi_enable_port (encoder, pipe_config); -vlv_wait_port_ready (dev_priv, dig_port,0x0 ); +vlv_wait_port_ready (display, dig_port,0x0 );/* Second common lane will stay alive on its own now */ chv_phy_release_cl2_override (encoder);
drivers/gpu/drm/i915/display/intel_display.c +6 -6
@@ -474,7 +474,7 @@ static void assert_planes_disabled(struct intel_crtc *crtc)assert_plane_disabled (plane); } -void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +void vlv_wait_port_ready (struct intel_display *display,struct intel_digital_port *dig_port,unsigned int expected_mask) {
@@ -487,11 +487,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, fallthrough;case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; - dpll_reg =DPLL (dev_priv,0 ); + dpll_reg =DPLL (display,0 );break ;case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; - dpll_reg =DPLL (dev_priv,0 ); + dpll_reg =DPLL (display,0 ); expected_mask <<=4 ;break ;case PORT_D :
@@ -500,11 +500,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,break ; } -if (intel_de_wait (dev_priv, dpll_reg, port_mask, expected_mask,1000 )) -drm_WARN (&dev_priv->drm,1 , +if (intel_de_wait (display, dpll_reg, port_mask, expected_mask,1000 )) +drm_WARN (display->drm,1 ,"timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n" , dig_port->base.base.base.id, dig_port->base.base.name, -intel_de_read (dev_priv, dpll_reg) & port_mask, +intel_de_read (display, dpll_reg) & port_mask, expected_mask); }
drivers/gpu/drm/i915/display/intel_display.h +1 -1
@@ -492,7 +492,7 @@ bool intel_encoder_is_tc(struct intel_encoder *encoder);enum tc_port intel_encoder_to_tc (struct intel_encoder *encoder);int ilk_get_lanes_required (int target_clock,int link_bw,int bpp); -void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +void vlv_wait_port_ready (struct intel_display *display,struct intel_digital_port *dig_port,unsigned int expected_mask);
Signature · 1 line
2.39.5
Re: [PATCH 07/11] drm/i915/display: convert vlv_wait_port_ready() to struct intel_display
Quoted 6 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switchvlv_wait_port_ready()over to it. The main motivation to do just one function is to stop passing i915 tointel_de_wait(), so its generic wrapper can be removed.Signed-off-by Jani Nikula <[email protected]>
Quoted 122 lines
--- drivers/gpu/drm/i915/display/g4x_dp.c | 3 +-- drivers/gpu/drm/i915/display/g4x_hdmi.c | 9 ++++----- drivers/gpu/drm/i915/display/intel_display.c | 12 ++++++------ drivers/gpu/drm/i915/display/intel_display.h | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/g4x_dp.c +1
-2@@ -706,8 +706,7 @@ static void intel_enable_dp(struct intel_atomic_state *state,if (IS_CHERRYVIEW (dev_priv)) lane_mask =intel_dp_unused_lane_mask (pipe_config->lane_count); -vlv_wait_port_ready (dev_priv,dp_to_dig_port (intel_dp), - lane_mask); +vlv_wait_port_ready (display,dp_to_dig_port (intel_dp), lane_mask); }intel_dp_set_power (intel_dp,DP_SET_POWER_D0 );drivers/gpu/drm/i915/display/g4x_hdmi.c +4
-5@@ -480,8 +480,8 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);vlv_phy_pre_encoder_enable (encoder, pipe_config);@@ -496,7 +496,7 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,g4x_hdmi_enable_port (encoder, pipe_config); -vlv_wait_port_ready (dev_priv, dig_port,0x0 ); +vlv_wait_port_ready (display, dig_port,0x0 ); } static void vlv_hdmi_pre_pll_enable(struct intel_atomic_state *state,@@ -557,9 +557,8 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);chv_phy_pre_encoder_enable (encoder, pipe_config);@@ -573,7 +572,7 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,g4x_hdmi_enable_port (encoder, pipe_config); -vlv_wait_port_ready (dev_priv, dig_port,0x0 ); +vlv_wait_port_ready (display, dig_port,0x0 );/* Second common lane will stay alive on its own now */ chv_phy_release_cl2_override (encoder);drivers/gpu/drm/i915/display/intel_display.c +6
-6@@ -474,7 +474,7 @@ static void assert_planes_disabled(struct intel_crtc *crtc)assert_plane_disabled (plane); } -void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +void vlv_wait_port_ready (struct intel_display *display,struct intel_digital_port *dig_port,unsigned int expected_mask) {@@ -487,11 +487,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, fallthrough;case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; - dpll_reg =DPLL (dev_priv,0 ); + dpll_reg =DPLL (display,0 );break ;case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; - dpll_reg =DPLL (dev_priv,0 ); + dpll_reg =DPLL (display,0 ); expected_mask <<=4 ;break ;case PORT_D :@@ -500,11 +500,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,break ; } -if (intel_de_wait (dev_priv, dpll_reg, port_mask, expected_mask,1000 )) -drm_WARN (&dev_priv->drm,1 , +if (intel_de_wait (display, dpll_reg, port_mask, expected_mask,1000 )) +drm_WARN (display->drm,1 ,"timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n" , dig_port->base.base.base.id, dig_port->base.base.name, -intel_de_read (dev_priv, dpll_reg) & port_mask, +intel_de_read (display, dpll_reg) & port_mask, expected_mask); }drivers/gpu/drm/i915/display/intel_display.h +1
-1@@ -492,7 +492,7 @@ bool intel_encoder_is_tc(struct intel_encoder *encoder);enum tc_port intel_encoder_to_tc (struct intel_encoder *encoder);int ilk_get_lanes_required (int target_clock,int link_bw,int bpp); -void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +void vlv_wait_port_ready (struct intel_display *display,struct intel_digital_port *dig_port,unsigned int expected_mask);Signature · 1 line
2.39.5
PATCH 8/11 drm/i915/power: convert assert_chv_phy_status() to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch assert_chv_phy_status() and its callers to it. Main motivation to do just one function is to stop passing i915 to intel_de_wait(), so its generic wrapper can be removed.
--- .../i915/display/intel_display_power_well.c | 95 ++++++++++--------- 1 file changed, 50 insertions(+), 45 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_well.c +50 -45
@@ -1337,13 +1337,14 @@ static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,#define BITS_SET (val, bits) (((val) & (bits)) == (bits)) -static void assert_chv_phy_status (struct drm_i915_private *dev_priv) +static void assert_chv_phy_status (struct intel_display *display) { +struct drm_i915_private *dev_priv =to_i915 (display->drm);struct i915_power_well *cmn_bc =lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC );struct i915_power_well *cmn_d =lookup_power_well (dev_priv,CHV_DISP_PW_DPIO_CMN_D ); -u32 phy_control = dev_priv->display.power.chv_phy_control; +u32 phy_control = display->power.chv_phy_control;u32 phy_status =0 ;u32 phy_status_mask =0xffffffff ;
@@ -1354,7 +1355,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)* reset (ie. the power well has been disabled at * least once). */ -if (!dev_priv->display.power.chv_phy_assert[DPIO_PHY0 ]) +if (!display->power.chv_phy_assert[DPIO_PHY0 ]) phy_status_mask &= ~(PHY_STATUS_CMN_LDO(DPIO_PHY0, DPIO_CH0) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH0, 0) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH0, 1) |
@@ -1362,7 +1363,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH1 ,0 ) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH1, 1)); -if (!dev_priv->display.power.chv_phy_assert[DPIO_PHY1 ]) +if (!display->power.chv_phy_assert[DPIO_PHY1 ]) phy_status_mask &= ~(PHY_STATUS_CMN_LDO (DPIO_PHY1 ,DPIO_CH0 ) |PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,0 ) |PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,1 ));
@@ -1390,7 +1391,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)*/ if (BITS_SET (phy_control,PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 )) && - (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) + (intel_de_read (display,DPLL (display,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ); if (BITS_SET(phy_control,
@@ -1433,12 +1434,12 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)* The PHY may be busy with some initial calibration and whatnot, * so the power state can take a while to actually change. */ -if (intel_de_wait (dev_priv,DISPLAY_PHY_STATUS , +if (intel_de_wait (display,DISPLAY_PHY_STATUS , phy_status_mask, phy_status,10 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n" , -intel_de_read (dev_priv,DISPLAY_PHY_STATUS ) & phy_status_mask, - phy_status, dev_priv->display.power.chv_phy_control); +intel_de_read (display,DISPLAY_PHY_STATUS ) & phy_status_mask, + phy_status, display->power.chv_phy_control); }#undef BITS_SET
@@ -1446,11 +1447,12 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)static void chv_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_display *display = &dev_priv->display;enum i915_power_well_id id =i915_power_well_instance (power_well)->id;enum dpio_phy phy;u32 tmp; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (display->drm, id !=VLV_DISP_PW_DPIO_CMN_BC && id !=CHV_DISP_PW_DPIO_CMN_D );
@@ -1464,9 +1466,9 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,vlv_set_power_well (dev_priv, power_well, true);/* Poll for phypwrgood signal */ -if (intel_de_wait_for_set (dev_priv,DISPLAY_PHY_STATUS , +if (intel_de_wait_for_set (display,DISPLAY_PHY_STATUS ,PHY_POWERGOOD (phy),1 )) -drm_err (&dev_priv->drm,"Display PHY %d is not power up\n" , +drm_err (display->drm,"Display PHY %d is not power up\n" , phy);vlv_dpio_get (dev_priv);
@@ -1494,24 +1496,25 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,vlv_dpio_put (dev_priv); - dev_priv->display.power.chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); + display->power.chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Enabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->display.power.chv_phy_control); + phy, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); }static void chv_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_display *display = &dev_priv->display;enum i915_power_well_id id =i915_power_well_instance (power_well)->id;enum dpio_phy phy; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (display->drm, id !=VLV_DISP_PW_DPIO_CMN_BC && id !=CHV_DISP_PW_DPIO_CMN_D );
@@ -1524,20 +1527,20 @@ static void chv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,assert_pll_disabled (dev_priv,PIPE_C ); } - dev_priv->display.power.chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); + display->power.chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control);vlv_set_power_well (dev_priv, power_well, false); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Disabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->display.power.chv_phy_control); + phy, display->power.chv_phy_control);/* PHY is fully reset now, so we can enable the PHY state asserts */ - dev_priv->display.power.chv_phy_assert[phy] = true; + display->power.chv_phy_assert[phy] = true; -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); } static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpio_phy phy,
@@ -1607,29 +1610,30 @@ static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpibool chv_phy_powergate_ch (struct drm_i915_private *dev_priv,enum dpio_phy phy,enum dpio_channel ch,bool override) { -struct i915_power_domains *power_domains = &dev_priv->display.power.domains; +struct intel_display *display = &dev_priv->display; +struct i915_power_domains *power_domains = &display->power.domains;bool was_override;mutex_lock (&power_domains->lock); - was_override = dev_priv->display.power.chv_phy_control &PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + was_override = display->power.chv_phy_control &PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);if (override == was_override) goto out;if (override) - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);else - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Power gating DPIO PHY%d CH%d (DPIO_PHY_CONTROL=0x%08x)\n" , - phy, ch, dev_priv->display.power.chv_phy_control); + phy, ch, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); out:mutex_unlock (&power_domains->lock);
@@ -1640,29 +1644,30 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,void chv_phy_powergate_lanes (struct intel_encoder *encoder,bool override,unsigned int mask) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_power_domains *power_domains = &dev_priv->display.power.domains; +struct i915_power_domains *power_domains = &display->power.domains;enum dpio_phy phy =vlv_dig_port_to_phy (enc_to_dig_port (encoder));enum dpio_channel ch =vlv_dig_port_to_channel (enc_to_dig_port (encoder));mutex_lock (&power_domains->lock); - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD (0xf , phy, ch); - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD (mask, phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD (0xf , phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD (mask, phy, ch);if (override) - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);else - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Power gating DPIO PHY%d CH%d lanes 0x%x (PHY_CONTROL=0x%08x)\n" , - phy, ch, mask, dev_priv->display.power.chv_phy_control); + phy, ch, mask, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display);assert_chv_phy_powergate (dev_priv, phy, ch, override, mask);
Signature · 1 line
2.39.5
Re: [PATCH 08/11] drm/i915/power: convert assert_chv_phy_status() to struct intel_display
Quoted 6 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switchassert_chv_phy_status()and its callers to it. Main motivation to do just one function is to stop passing i915 tointel_de_wait(), so its generic wrapper can be removed.Signed-off-by Jani Nikula <[email protected]>
Quoted 240 lines
--- .../i915/display/intel_display_power_well.c | 95 ++++++++++--------- 1 file changed, 50 insertions(+), 45 deletions(-)drivers/gpu/drm/i915/display/intel_display_power_well.c +50
-45@@ -1337,13 +1337,14 @@ static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,#define BITS_SET (val, bits) (((val) & (bits)) == (bits)) -static void assert_chv_phy_status (struct drm_i915_private *dev_priv) +static void assert_chv_phy_status (struct intel_display *display) { +struct drm_i915_private *dev_priv =to_i915 (display->drm);struct i915_power_well *cmn_bc =lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC );struct i915_power_well *cmn_d =lookup_power_well (dev_priv,CHV_DISP_PW_DPIO_CMN_D ); -u32 phy_control = dev_priv->display.power.chv_phy_control; +u32 phy_control = display->power.chv_phy_control;u32 phy_status =0 ;u32 phy_status_mask =0xffffffff ;@@ -1354,7 +1355,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)* reset (ie. the power well has been disabled at * least once). */ -if (!dev_priv->display.power.chv_phy_assert[DPIO_PHY0 ]) +if (!display->power.chv_phy_assert[DPIO_PHY0 ]) phy_status_mask &= ~(PHY_STATUS_CMN_LDO(DPIO_PHY0, DPIO_CH0) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH0, 0) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH0, 1) |@@ -1362,7 +1363,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH1 ,0 ) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH1, 1)); -if (!dev_priv->display.power.chv_phy_assert[DPIO_PHY1 ]) +if (!display->power.chv_phy_assert[DPIO_PHY1 ]) phy_status_mask &= ~(PHY_STATUS_CMN_LDO (DPIO_PHY1 ,DPIO_CH0 ) |PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,0 ) |PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,1 ));@@ -1390,7 +1391,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)*/ if (BITS_SET (phy_control,PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 )) && - (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) + (intel_de_read (display,DPLL (display,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ); if (BITS_SET(phy_control,@@ -1433,12 +1434,12 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)* The PHY may be busy with some initial calibration and whatnot, * so the power state can take a while to actually change. */ -if (intel_de_wait (dev_priv,DISPLAY_PHY_STATUS , +if (intel_de_wait (display,DISPLAY_PHY_STATUS , phy_status_mask, phy_status,10 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n" , -intel_de_read (dev_priv,DISPLAY_PHY_STATUS ) & phy_status_mask, - phy_status, dev_priv->display.power.chv_phy_control); +intel_de_read (display,DISPLAY_PHY_STATUS ) & phy_status_mask, + phy_status, display->power.chv_phy_control); }#undef BITS_SET@@ -1446,11 +1447,12 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)static void chv_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_display *display = &dev_priv->display;enum i915_power_well_id id =i915_power_well_instance (power_well)->id;enum dpio_phy phy;u32 tmp; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (display->drm, id !=VLV_DISP_PW_DPIO_CMN_BC && id !=CHV_DISP_PW_DPIO_CMN_D );@@ -1464,9 +1466,9 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,vlv_set_power_well (dev_priv, power_well, true);/* Poll for phypwrgood signal */ -if (intel_de_wait_for_set (dev_priv,DISPLAY_PHY_STATUS , +if (intel_de_wait_for_set (display,DISPLAY_PHY_STATUS ,PHY_POWERGOOD (phy),1 )) -drm_err (&dev_priv->drm,"Display PHY %d is not power up\n" , +drm_err (display->drm,"Display PHY %d is not power up\n" , phy);vlv_dpio_get (dev_priv);@@ -1494,24 +1496,25 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,vlv_dpio_put (dev_priv); - dev_priv->display.power.chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); + display->power.chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Enabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->display.power.chv_phy_control); + phy, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); }static void chv_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_display *display = &dev_priv->display;enum i915_power_well_id id =i915_power_well_instance (power_well)->id;enum dpio_phy phy; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (display->drm, id !=VLV_DISP_PW_DPIO_CMN_BC && id !=CHV_DISP_PW_DPIO_CMN_D );@@ -1524,20 +1527,20 @@ static void chv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,assert_pll_disabled (dev_priv,PIPE_C ); } - dev_priv->display.power.chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); + display->power.chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control);vlv_set_power_well (dev_priv, power_well, false); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Disabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->display.power.chv_phy_control); + phy, display->power.chv_phy_control);/* PHY is fully reset now, so we can enable the PHY state asserts */ - dev_priv->display.power.chv_phy_assert[phy] = true; + display->power.chv_phy_assert[phy] = true; -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); } static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpio_phy phy,@@ -1607,29 +1610,30 @@ static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpibool chv_phy_powergate_ch (struct drm_i915_private *dev_priv,enum dpio_phy phy,enum dpio_channel ch,bool override) { -struct i915_power_domains *power_domains = &dev_priv->display.power.domains; +struct intel_display *display = &dev_priv->display; +struct i915_power_domains *power_domains = &display->power.domains;bool was_override;mutex_lock (&power_domains->lock); - was_override = dev_priv->display.power.chv_phy_control &PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + was_override = display->power.chv_phy_control &PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);if (override == was_override) goto out;if (override) - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);else - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Power gating DPIO PHY%d CH%d (DPIO_PHY_CONTROL=0x%08x)\n" , - phy, ch, dev_priv->display.power.chv_phy_control); + phy, ch, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); out:mutex_unlock (&power_domains->lock);@@ -1640,29 +1644,30 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,void chv_phy_powergate_lanes (struct intel_encoder *encoder,bool override,unsigned int mask) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_power_domains *power_domains = &dev_priv->display.power.domains; +struct i915_power_domains *power_domains = &display->power.domains;enum dpio_phy phy =vlv_dig_port_to_phy (enc_to_dig_port (encoder));enum dpio_channel ch =vlv_dig_port_to_channel (enc_to_dig_port (encoder));mutex_lock (&power_domains->lock); - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD (0xf , phy, ch); - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD (mask, phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD (0xf , phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD (mask, phy, ch);if (override) - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);else - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Power gating DPIO PHY%d CH%d lanes 0x%x (PHY_CONTROL=0x%08x)\n" , - phy, ch, mask, dev_priv->display.power.chv_phy_control); + phy, ch, mask, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display);assert_chv_phy_powergate (dev_priv, phy, ch, override, mask);Signature · 1 line
2.39.5
PATCH 9/11 drm/i915/ips: convert to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch HSW IPS code over to it.
--- drivers/gpu/drm/i915/display/hsw_ips.c | 47 ++++++++++++++------------ 1 file changed, 26 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/hsw_ips.c +26 -21
@@ -15,6 +15,7 @@static void hsw_ips_enable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);u32 val;
@@ -27,16 +28,16 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* This function is called from post_plane_update, which is run after * a vblank wait. */ -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm, !(crtc_state->active_planes & ~BIT (PLANE_CURSOR ))); val =IPS_ENABLE ; -if (i915->display.ips.false_color) +if (display->ips.false_color) val |=IPS_FALSE_COLOR ;if (IS_BROADWELL (i915)) { -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm,snb_pcode_write (&i915->uncore,DISPLAY_IPS_CONTROL , val |IPS_PCODE_CONTROL ));/*
@@ -46,7 +47,7 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* so we need to just enable it and continue on. */ }else { -intel_de_write (i915,IPS_CTL , val); +intel_de_write (display,IPS_CTL , val);/* * The bit only becomes 1 in the next vblank, so this wait here * is essentially intel_wait_for_vblank. If we don't have this
@@ -54,14 +55,15 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* the HW state readout code will complain that the expected * IPS_CTL value is not the one we read. */ -if (intel_de_wait_for_set (i915,IPS_CTL ,IPS_ENABLE ,50 )) -drm_err (&i915->drm, +if (intel_de_wait_for_set (display,IPS_CTL ,IPS_ENABLE ,50 )) +drm_err (display->drm,"Timed out waiting for IPS enable\n" ); } }bool hsw_ips_disable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);bool need_vblank_wait = false;
@@ -70,19 +72,19 @@ bool hsw_ips_disable(const struct intel_crtc_state *crtc_state)return need_vblank_wait;if (IS_BROADWELL (i915)) { -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm,snb_pcode_write (&i915->uncore,DISPLAY_IPS_CONTROL ,0 ));/* * Wait for PCODE to finish disabling IPS. The BSpec specified * 42ms timeout value leads to occasional timeouts so use 100ms * instead. */ -if (intel_de_wait_for_clear (i915,IPS_CTL ,IPS_ENABLE ,100 )) -drm_err (&i915->drm, +if (intel_de_wait_for_clear (display,IPS_CTL ,IPS_ENABLE ,100 )) +drm_err (display->drm,"Timed out waiting for IPS disable\n" ); }else { -intel_de_write (i915,IPS_CTL ,0 ); -intel_de_posting_read (i915,IPS_CTL ); +intel_de_write (display,IPS_CTL ,0 ); +intel_de_posting_read (display,IPS_CTL ); }/* We need to wait for a vblank before we can disable the plane. */
@@ -188,6 +190,7 @@ bool hsw_crtc_supports_ips(struct intel_crtc *crtc)bool hsw_crtc_state_ips_capable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);
@@ -195,7 +198,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)if (!hsw_crtc_supports_ips (crtc))return false; -if (!i915->display.params.enable_ips) +if (!display->params.enable_ips)return false;if (crtc_state->pipe_bpp >24 )
@@ -209,7 +212,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)* Should measure whether using a lower cdclk w/o IPS */ if (IS_BROADWELL (i915) && - crtc_state->pixel_rate > i915->display.cdclk.max_cdclk_freq *95 /100 ) + crtc_state->pixel_rate > display->cdclk.max_cdclk_freq *95 /100 )return false;return true;
@@ -259,6 +262,7 @@ int hsw_ips_compute_config(struct intel_atomic_state *state,void hsw_ips_get_config (struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);
@@ -266,7 +270,7 @@ void hsw_ips_get_config(struct intel_crtc_state *crtc_state)return ;if (IS_HASWELL (i915)) { - crtc_state->ips_enabled =intel_de_read (i915,IPS_CTL ) &IPS_ENABLE ; + crtc_state->ips_enabled =intel_de_read (display,IPS_CTL ) &IPS_ENABLE ; }else {/* * We cannot readout IPS state on broadwell, set to
@@ -280,9 +284,9 @@ void hsw_ips_get_config(struct intel_crtc_state *crtc_state)static int hsw_ips_debugfs_false_color_get (void *data,u64 *val) {struct intel_crtc *crtc = data; -struct drm_i915_private *i915 =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc); - *val = i915->display.ips.false_color; + *val = display->ips.false_color;return 0 ; }
@@ -290,7 +294,7 @@ static int hsw_ips_debugfs_false_color_get(void *data, u64 *val)static int hsw_ips_debugfs_false_color_set (void *data,u64 val) {struct intel_crtc *crtc = data; -struct drm_i915_private *i915 =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc);struct intel_crtc_state *crtc_state;int ret;
@@ -298,7 +302,7 @@ static int hsw_ips_debugfs_false_color_set(void *data, u64 val)if (ret)return ret; - i915->display.ips.false_color = val; + display->ips.false_color = val; crtc_state =to_intel_crtc_state (crtc->base.state);
@@ -325,18 +329,19 @@ DEFINE_DEBUGFS_ATTRIBUTE(hsw_ips_debugfs_false_color_fops,static int hsw_ips_debugfs_status_show (struct seq_file *m,void *unused) {struct intel_crtc *crtc = m->private; +struct intel_display *display =to_intel_display (crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);intel_wakeref_t wakeref; wakeref =intel_runtime_pm_get (&i915->runtime_pm);seq_printf (m,"Enabled by kernel parameter: %s\n" , -str_yes_no (i915->display.params.enable_ips)); +str_yes_no (display->params.enable_ips)); -if (DISPLAY_VER (i915) >=8 ) { +if (DISPLAY_VER (display) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else { -if (intel_de_read (i915,IPS_CTL ) &IPS_ENABLE ) +if (intel_de_read (display,IPS_CTL ) &IPS_ENABLE )seq_puts (m,"Currently: enabled\n" );else seq_puts (m,"Currently: disabled\n" );
Signature · 1 line
2.39.5
Re: [PATCH 09/11] drm/i915/ips: convert to struct intel_display
Quoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch HSW IPS code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 187 lines
--- drivers/gpu/drm/i915/display/hsw_ips.c | 47 ++++++++++++++------------ 1 file changed, 26 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/hsw_ips.c +26
-21@@ -15,6 +15,7 @@static void hsw_ips_enable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);u32 val;@@ -27,16 +28,16 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* This function is called from post_plane_update, which is run after * a vblank wait. */ -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm, !(crtc_state->active_planes & ~BIT (PLANE_CURSOR ))); val =IPS_ENABLE ; -if (i915->display.ips.false_color) +if (display->ips.false_color) val |=IPS_FALSE_COLOR ;if (IS_BROADWELL (i915)) { -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm,snb_pcode_write (&i915->uncore,DISPLAY_IPS_CONTROL , val |IPS_PCODE_CONTROL ));/* @@ -46,7 +47,7 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* so we need to just enable it and continue on. */ }else { -intel_de_write (i915,IPS_CTL , val); +intel_de_write (display,IPS_CTL , val);/* * The bit only becomes 1 in the next vblank, so this wait here * is essentially intel_wait_for_vblank. If we don't have this @@ -54,14 +55,15 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* the HW state readout code will complain that the expected * IPS_CTL value is not the one we read. */ -if (intel_de_wait_for_set (i915,IPS_CTL ,IPS_ENABLE ,50 )) -drm_err (&i915->drm, +if (intel_de_wait_for_set (display,IPS_CTL ,IPS_ENABLE ,50 )) +drm_err (display->drm,"Timed out waiting for IPS enable\n" ); } }bool hsw_ips_disable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);bool need_vblank_wait = false;@@ -70,19 +72,19 @@ bool hsw_ips_disable(const struct intel_crtc_state *crtc_state)return need_vblank_wait;if (IS_BROADWELL (i915)) { -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm,snb_pcode_write (&i915->uncore,DISPLAY_IPS_CONTROL ,0 ));/* * Wait for PCODE to finish disabling IPS. The BSpec specified * 42ms timeout value leads to occasional timeouts so use 100ms * instead. */ -if (intel_de_wait_for_clear (i915,IPS_CTL ,IPS_ENABLE ,100 )) -drm_err (&i915->drm, +if (intel_de_wait_for_clear (display,IPS_CTL ,IPS_ENABLE ,100 )) +drm_err (display->drm,"Timed out waiting for IPS disable\n" ); }else { -intel_de_write (i915,IPS_CTL ,0 ); -intel_de_posting_read (i915,IPS_CTL ); +intel_de_write (display,IPS_CTL ,0 ); +intel_de_posting_read (display,IPS_CTL ); }/* We need to wait for a vblank before we can disable the plane. */ @@ -188,6 +190,7 @@ bool hsw_crtc_supports_ips(struct intel_crtc *crtc)bool hsw_crtc_state_ips_capable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);@@ -195,7 +198,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)if (!hsw_crtc_supports_ips (crtc))return false; -if (!i915->display.params.enable_ips) +if (!display->params.enable_ips)return false;if (crtc_state->pipe_bpp >24 )@@ -209,7 +212,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)* Should measure whether using a lower cdclk w/o IPS */ if (IS_BROADWELL (i915) && - crtc_state->pixel_rate > i915->display.cdclk.max_cdclk_freq *95 /100 ) + crtc_state->pixel_rate > display->cdclk.max_cdclk_freq *95 /100 )return false;return true;@@ -259,6 +262,7 @@ int hsw_ips_compute_config(struct intel_atomic_state *state,void hsw_ips_get_config (struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);@@ -266,7 +270,7 @@ void hsw_ips_get_config(struct intel_crtc_state *crtc_state)return ;if (IS_HASWELL (i915)) { - crtc_state->ips_enabled =intel_de_read (i915,IPS_CTL ) &IPS_ENABLE ; + crtc_state->ips_enabled =intel_de_read (display,IPS_CTL ) &IPS_ENABLE ; }else {/* * We cannot readout IPS state on broadwell, set to @@ -280,9 +284,9 @@ void hsw_ips_get_config(struct intel_crtc_state *crtc_state)static int hsw_ips_debugfs_false_color_get (void *data,u64 *val) {struct intel_crtc *crtc = data; -struct drm_i915_private *i915 =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc); - *val = i915->display.ips.false_color; + *val = display->ips.false_color;return 0 ; }@@ -290,7 +294,7 @@ static int hsw_ips_debugfs_false_color_get(void *data, u64 *val)static int hsw_ips_debugfs_false_color_set (void *data,u64 val) {struct intel_crtc *crtc = data; -struct drm_i915_private *i915 =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc);struct intel_crtc_state *crtc_state;int ret;@@ -298,7 +302,7 @@ static int hsw_ips_debugfs_false_color_set(void *data, u64 val)if (ret)return ret; - i915->display.ips.false_color = val; + display->ips.false_color = val; crtc_state =to_intel_crtc_state (crtc->base.state);@@ -325,18 +329,19 @@ DEFINE_DEBUGFS_ATTRIBUTE(hsw_ips_debugfs_false_color_fops,static int hsw_ips_debugfs_status_show (struct seq_file *m,void *unused) {struct intel_crtc *crtc = m->private; +struct intel_display *display =to_intel_display (crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);intel_wakeref_t wakeref; wakeref =intel_runtime_pm_get (&i915->runtime_pm);seq_printf (m,"Enabled by kernel parameter: %s\n" , -str_yes_no (i915->display.params.enable_ips)); +str_yes_no (display->params.enable_ips)); -if (DISPLAY_VER (i915) >=8 ) { +if (DISPLAY_VER (display) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else { -if (intel_de_read (i915,IPS_CTL ) &IPS_ENABLE ) +if (intel_de_read (display,IPS_CTL ) &IPS_ENABLE )seq_puts (m,"Currently: enabled\n" );else seq_puts (m,"Currently: disabled\n" );Signature · 1 line
2.39.5
PATCH 10/11 drm/i915/dsi: convert to struct intel_display
In reply to Jani Nikulastruct intel_display will replace struct drm_i915_private as the main device pointer for display code. Switch ICL DSI code over to it.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 444 ++++++++++++----------- drivers/gpu/drm/i915/display/icl_dsi.h | 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- 3 files changed, 227 insertions(+), 223 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +224 -220
@@ -51,38 +51,38 @@#include "skl_scaler.h" #include "skl_universal_plane.h" -static int header_credits_available (struct drm_i915_private *dev_priv, +static int header_credits_available (struct intel_display *display,enum transcoder dsi_trans) { -return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) +return (intel_de_read (display,DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) >>FREE_HEADER_CREDIT_SHIFT ; } -static int payload_credits_available (struct drm_i915_private *dev_priv, +static int payload_credits_available (struct intel_display *display,enum transcoder dsi_trans) { -return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) +return (intel_de_read (display,DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) >>FREE_PLOAD_CREDIT_SHIFT ; } -static bool wait_for_header_credits (struct drm_i915_private *dev_priv, +static bool wait_for_header_credits (struct intel_display *display,enum transcoder dsi_trans,int hdr_credit) { -if (wait_for_us (header_credits_available (dev_priv, dsi_trans) >= +if (wait_for_us (header_credits_available (display, dsi_trans) >= hdr_credit,100 )) { -drm_err (&dev_priv->drm,"DSI header credits not released\n" ); +drm_err (display->drm,"DSI header credits not released\n" );return false; }return true; } -static bool wait_for_payload_credits (struct drm_i915_private *dev_priv, +static bool wait_for_payload_credits (struct intel_display *display,enum transcoder dsi_trans,int payld_credit) { -if (wait_for_us (payload_credits_available (dev_priv, dsi_trans) >= +if (wait_for_us (payload_credits_available (display, dsi_trans) >= payld_credit,100 )) { -drm_err (&dev_priv->drm,"DSI payload credits not released\n" ); +drm_err (display->drm,"DSI payload credits not released\n" );return false; }
@@ -99,7 +99,7 @@ static enum transcoder dsi_port_to_transcoder(enum port port)static void wait_for_cmds_dispatched_to_panel (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct mipi_dsi_device *dsi;enum port port;
@@ -109,8 +109,8 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder)/* wait for header/payload credits to be released */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -wait_for_header_credits (dev_priv, dsi_trans,MAX_HEADER_CREDIT ); -wait_for_payload_credits (dev_priv, dsi_trans,MAX_PLOAD_CREDIT ); +wait_for_header_credits (display, dsi_trans,MAX_HEADER_CREDIT ); +wait_for_payload_credits (display, dsi_trans,MAX_PLOAD_CREDIT ); }/* send nop DCS command */
@@ -120,22 +120,22 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder) dsi->channel =0 ; ret =mipi_dsi_dcs_nop (dsi);if (ret <0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"error sending DCS NOP command\n" ); }/* wait for header credits to be released */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -wait_for_header_credits (dev_priv, dsi_trans,MAX_HEADER_CREDIT ); +wait_for_header_credits (display, dsi_trans,MAX_HEADER_CREDIT ); }/* wait for LP TX in progress bit to be cleared */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -if (wait_for_us (!(intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) & +if (wait_for_us (!(intel_de_read (display,DSI_LP_MSG (dsi_trans)) &LPTX_IN_PROGRESS ),20 )) -drm_err (&dev_priv->drm,"LPTX bit not cleared\n" ); +drm_err (display->drm,"LPTX bit not cleared\n" ); } }
@@ -143,7 +143,7 @@ static int dsi_send_pkt_payld(struct intel_dsi_host *host, const struct mipi_dsi_packet *packet) {struct intel_dsi *intel_dsi = host->intel_dsi; -struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans =dsi_port_to_transcoder (host->port);const u8 *data = packet->payload;u32 len = packet->payload_length;
@@ -151,20 +151,20 @@ static int dsi_send_pkt_payld(struct intel_dsi_host *host,/* payload queue can accept *256 bytes*, check limit */ if (len >MAX_PLOAD_CREDIT *4 ) { -drm_err (&i915->drm,"payload size exceeds max queue limit\n" ); +drm_err (display->drm,"payload size exceeds max queue limit\n" );return -EINVAL ; }for (i =0 ; i < len; i +=4 ) {u32 tmp =0 ; -if (!wait_for_payload_credits (i915, dsi_trans,1 )) +if (!wait_for_payload_credits (display, dsi_trans,1 ))return -EBUSY ;for (j =0 ; j <min_t (u32, len - i,4 ); j++) tmp |= *data++ <<8 * j; -intel_de_write (i915,DSI_CMD_TXPYLD (dsi_trans), tmp); +intel_de_write (display,DSI_CMD_TXPYLD (dsi_trans), tmp); }return 0 ;
@@ -175,14 +175,14 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, bool enable_lpdt) {struct intel_dsi *intel_dsi = host->intel_dsi; -struct drm_i915_private *dev_priv =to_i915 (intel_dsi->base.base.dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans =dsi_port_to_transcoder (host->port);u32 tmp; -if (!wait_for_header_credits (dev_priv, dsi_trans,1 )) +if (!wait_for_header_credits (display, dsi_trans,1 ))return -EBUSY ; - tmp =intel_de_read (dev_priv,DSI_CMD_TXHDR (dsi_trans)); + tmp =intel_de_read (display,DSI_CMD_TXHDR (dsi_trans));if (packet->payload) tmp |=PAYLOAD_PRESENT ;
@@ -201,15 +201,14 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, tmp |= ((packet->header[0 ] &DT_MASK ) <<DT_SHIFT ); tmp |= (packet->header[1 ] <<PARAM_WC_LOWER_SHIFT ); tmp |= (packet->header[2 ] <<PARAM_WC_UPPER_SHIFT ); -intel_de_write (dev_priv,DSI_CMD_TXHDR (dsi_trans), tmp); +intel_de_write (display,DSI_CMD_TXHDR (dsi_trans), tmp);return 0 ; }void icl_dsi_frame_update (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc_state);u32 mode_flags;enum port port;
@@ -227,12 +226,13 @@ void icl_dsi_frame_update(struct intel_crtc_state *crtc_state)else return ; -intel_de_rmw (dev_priv,DSI_CMD_FRMCTL (port),0 ,DSI_FRAME_UPDATE_REQUEST ); +intel_de_rmw (display,DSI_CMD_FRMCTL (port),0 , +DSI_FRAME_UPDATE_REQUEST ); }static void dsi_program_swing_and_deemphasis (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum phy phy;u32 tmp, mask, val;
@@ -246,31 +246,31 @@ static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder) mask =SCALING_MODE_SEL_MASK |RTERM_SELECT_MASK ; val =SCALING_MODE_SEL (0x2 ) |TAP2_DISABLE |TAP3_DISABLE |RTERM_SELECT (0x6 ); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp &= ~mask; tmp |= val; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy), mask, val); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy), mask, val); mask =SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK |RCOMP_SCALAR_MASK ; val =SWING_SEL_UPPER (0x2 ) |SWING_SEL_LOWER (0x2 ) |RCOMP_SCALAR (0x98 ); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW2_LN (0 , phy)); tmp &= ~mask; tmp |= val; -intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW2_AUX (phy), mask, val); +intel_de_write (display,ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW2_AUX (phy), mask, val); mask =POST_CURSOR_1_MASK |POST_CURSOR_2_MASK |CURSOR_COEFF_MASK ; val =POST_CURSOR_1 (0x0 ) |POST_CURSOR_2 (0x0 ) |CURSOR_COEFF (0x3f ); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_AUX (phy), mask, val); +intel_de_rmw (display,ICL_PORT_TX_DW4_AUX (phy), mask, val);/* Bspec: must not use GRP register for write */ for (lane =0 ; lane <=3 ; lane++) -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_LN (lane, phy), +intel_de_rmw (display,ICL_PORT_TX_DW4_LN (lane, phy), mask, val); } }
@@ -278,13 +278,13 @@ static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder)static void configure_dual_link_mode (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);i915_reg_t dss_ctl1_reg, dss_ctl2_reg;u32 dss_ctl1;/* FIXME: Move all DSS handling to intel_vdsc.c */ -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); dss_ctl1_reg =ICL_PIPE_DSS_CTL1 (crtc->pipe);
@@ -294,7 +294,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, dss_ctl2_reg =DSS_CTL2 ; } - dss_ctl1 =intel_de_read (dev_priv, dss_ctl1_reg); + dss_ctl1 =intel_de_read (display, dss_ctl1_reg); dss_ctl1 |=SPLITTER_ENABLE ; dss_ctl1 &= ~OVERLAP_PIXELS_MASK ; dss_ctl1 |=OVERLAP_PIXELS (intel_dsi->pixel_overlap);
@@ -309,19 +309,19 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, dl_buffer_depth = hactive /2 + intel_dsi->pixel_overlap;if (dl_buffer_depth >MAX_DL_BUFFER_TARGET_DEPTH ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DL buffer depth exceed max value\n" ); dss_ctl1 &= ~LEFT_DL_BUF_TARGET_DEPTH_MASK ; dss_ctl1 |=LEFT_DL_BUF_TARGET_DEPTH (dl_buffer_depth); -intel_de_rmw (dev_priv, dss_ctl2_reg,RIGHT_DL_BUF_TARGET_DEPTH_MASK , +intel_de_rmw (display, dss_ctl2_reg,RIGHT_DL_BUF_TARGET_DEPTH_MASK ,RIGHT_DL_BUF_TARGET_DEPTH (dl_buffer_depth)); }else {/* Interleave */ dss_ctl1 |=DUAL_LINK_MODE_INTERLEAVE ; } -intel_de_write (dev_priv, dss_ctl1_reg, dss_ctl1); +intel_de_write (display, dss_ctl1_reg, dss_ctl1); }/* aka DSI 8X clock */
@@ -342,6 +342,7 @@ static int afe_clk(struct intel_encoder *encoder,static void gen11_dsi_program_esc_clk_div (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;
@@ -361,33 +362,34 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder, }for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ICL_DSI_ESC_CLK_DIV (port), +intel_de_write (display,ICL_DSI_ESC_CLK_DIV (port), esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -intel_de_posting_read (dev_priv,ICL_DSI_ESC_CLK_DIV (port)); +intel_de_posting_read (display,ICL_DSI_ESC_CLK_DIV (port)); }for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ICL_DPHY_ESC_CLK_DIV (port), +intel_de_write (display,ICL_DPHY_ESC_CLK_DIV (port), esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -intel_de_posting_read (dev_priv,ICL_DPHY_ESC_CLK_DIV (port)); +intel_de_posting_read (display,ICL_DPHY_ESC_CLK_DIV (port)); }if (IS_ALDERLAKE_S (dev_priv) ||IS_ALDERLAKE_P (dev_priv)) {for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ADL_MIPIO_DW (port,8 ), +intel_de_write (display,ADL_MIPIO_DW (port,8 ), esc_clk_div_m_phy &TX_ESC_CLK_DIV_PHY ); -intel_de_posting_read (dev_priv,ADL_MIPIO_DW (port,8 )); +intel_de_posting_read (display,ADL_MIPIO_DW (port,8 )); } } } -static void get_dsi_io_power_domains (struct drm_i915_private *dev_priv, -struct intel_dsi *intel_dsi) +static void get_dsi_io_power_domains (struct intel_dsi *intel_dsi) { +struct intel_display *display =to_intel_display (&intel_dsi->base); +struct drm_i915_private *dev_priv =to_i915 (display->drm);enum port port;for_each_dsi_port (port, intel_dsi->ports) { -drm_WARN_ON (&dev_priv->drm, intel_dsi->io_wakeref[port]); +drm_WARN_ON (display->drm, intel_dsi->io_wakeref[port]); intel_dsi->io_wakeref[port] = intel_display_power_get(dev_priv, port == PORT_A ?
@@ -398,15 +400,15 @@ static void get_dsi_io_power_domains(struct drm_i915_private *dev_priv,static void gen11_dsi_enable_io_power (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_IO_MODECTL (port), +intel_de_rmw (display,ICL_DSI_IO_MODECTL (port),0 ,COMBO_PHY_MODE_DSI ); -get_dsi_io_power_domains (dev_priv, intel_dsi); +get_dsi_io_power_domains (intel_dsi); }static void gen11_dsi_power_up_lanes (struct intel_encoder *encoder)
@@ -422,6 +424,7 @@ static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)static void gen11_dsi_config_phy_lanes_sequence (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum phy phy;
@@ -430,32 +433,33 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)/* Step 4b(i) set loadgen select for transmit and aux lanes */ for_each_dsi_phy (phy, intel_dsi->phys) { -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_AUX (phy),LOADGEN_SELECT ,0 ); +intel_de_rmw (display,ICL_PORT_TX_DW4_AUX (phy), +LOADGEN_SELECT ,0 );for (lane =0 ; lane <=3 ; lane++) -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_LN (lane, phy), +intel_de_rmw (display,ICL_PORT_TX_DW4_LN (lane, phy),LOADGEN_SELECT , lane !=2 ?LOADGEN_SELECT :0 ); }/* Step 4b(ii) set latency optimization for transmit and aux lanes */ for_each_dsi_phy (phy, intel_dsi->phys) { -intel_de_rmw (dev_priv,ICL_PORT_TX_DW2_AUX (phy), +intel_de_rmw (display,ICL_PORT_TX_DW2_AUX (phy),FRC_LATENCY_OPTIM_MASK ,FRC_LATENCY_OPTIM_VAL (0x5 )); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW2_LN (0 , phy)); tmp &= ~FRC_LATENCY_OPTIM_MASK ; tmp |=FRC_LATENCY_OPTIM_VAL (0x5 ); -intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_write (display,ICL_PORT_TX_DW2_GRP (phy), tmp);/* For EHL, TGL, set latency optimization for PCS_DW1 lanes */ if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv) || - (DISPLAY_VER (dev_priv) >=12 )) { -intel_de_rmw (dev_priv,ICL_PORT_PCS_DW1_AUX (phy), + (DISPLAY_VER (display) >=12 )) { +intel_de_rmw (display,ICL_PORT_PCS_DW1_AUX (phy),LATENCY_OPTIM_MASK ,LATENCY_OPTIM_VAL (0 )); - tmp =intel_de_read (dev_priv, + tmp =intel_de_read (display,ICL_PORT_PCS_DW1_LN (0 , phy)); tmp &= ~LATENCY_OPTIM_MASK ; tmp |=LATENCY_OPTIM_VAL (0x1 ); -intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), +intel_de_write (display,ICL_PORT_PCS_DW1_GRP (phy), tmp); } }
@@ -464,17 +468,17 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)static void gen11_dsi_voltage_swing_program_seq (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy;/* clear common keeper enable bit */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_PCS_DW1_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_PCS_DW1_LN (0 , phy)); tmp &= ~COMMON_KEEPER_EN ; -intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_PCS_DW1_AUX (phy),COMMON_KEEPER_EN ,0 ); +intel_de_write (display,ICL_PORT_PCS_DW1_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_PCS_DW1_AUX (phy),COMMON_KEEPER_EN ,0 ); }/*
@@ -483,14 +487,15 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)* as part of lane phy sequence configuration */ for_each_dsi_phy (phy, intel_dsi->phys) -intel_de_rmw (dev_priv,ICL_PORT_CL_DW5 (phy),0 ,SUS_CLOCK_CONFIG ); +intel_de_rmw (display,ICL_PORT_CL_DW5 (phy),0 , +SUS_CLOCK_CONFIG );/* Clear training enable to change swing values */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp &= ~TX_TRAINING_EN ; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy),TX_TRAINING_EN ,0 ); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy),TX_TRAINING_EN ,0 ); }/* Program swing and de-emphasis */
@@ -498,26 +503,26 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)/* Set training enable to trigger update */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp |=TX_TRAINING_EN ; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy),0 ,TX_TRAINING_EN ); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy),0 ,TX_TRAINING_EN ); } }static void gen11_dsi_enable_ddi_buffer (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DDI_BUF_CTL (port),0 ,DDI_BUF_CTL_ENABLE ); +intel_de_rmw (display,DDI_BUF_CTL (port),0 ,DDI_BUF_CTL_ENABLE ); -if (wait_for_us (!(intel_de_read (dev_priv,DDI_BUF_CTL (port)) & +if (wait_for_us (!(intel_de_read (display,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),500 )) -drm_err (&dev_priv->drm,"DDI port:%c buffer idle\n" , +drm_err (display->drm,"DDI port:%c buffer idle\n" ,port_name (port)); } }
@@ -526,6 +531,7 @@ static void gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { + struct intel_display *display = to_intel_display(encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;
@@ -533,12 +539,12 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,/* Program DPHY clock lanes timings */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DPHY_CLK_TIMING_PARAM (port), +intel_de_write (display,DPHY_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg);/* Program DPHY data lanes timings */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DPHY_DATA_TIMING_PARAM (port), +intel_de_write (display,DPHY_DATA_TIMING_PARAM (port), intel_dsi->dphy_data_lane_reg);/*
@@ -547,10 +553,10 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,* a value '0' inside TA_PARAM_REGISTERS otherwise * leave all fields at HW default values. */ -if (DISPLAY_VER (dev_priv) ==11 ) { +if (DISPLAY_VER (display) ==11 ) {if (afe_clk (encoder, crtc_state) <=800000 ) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,DPHY_TA_TIMING_PARAM (port), +intel_de_rmw (display,DPHY_TA_TIMING_PARAM (port),TA_SURE_MASK ,TA_SURE_OVERRIDE |TA_SURE (0 )); }
@@ -558,7 +564,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {for_each_dsi_phy (phy, intel_dsi->phys) -intel_de_rmw (dev_priv,ICL_DPHY_CHKN (phy), +intel_de_rmw (display,ICL_DPHY_CHKN (phy),0 ,ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP ); } }
@@ -567,30 +573,30 @@ static void gen11_dsi_setup_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;/* Program T-INIT master registers */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_T_INIT_MASTER (port), +intel_de_rmw (display,ICL_DSI_T_INIT_MASTER (port),DSI_T_INIT_MASTER_MASK , intel_dsi->init_count);/* shadow register inside display core */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DSI_CLK_TIMING_PARAM (port), +intel_de_write (display,DSI_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg);/* shadow register inside display core */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DSI_DATA_TIMING_PARAM (port), +intel_de_write (display,DSI_DATA_TIMING_PARAM (port), intel_dsi->dphy_data_lane_reg);/* shadow register inside display core */ -if (DISPLAY_VER (dev_priv) ==11 ) { +if (DISPLAY_VER (display) ==11 ) {if (afe_clk (encoder, crtc_state) <=800000 ) {for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DSI_TA_TIMING_PARAM (port), +intel_de_rmw (display,DSI_TA_TIMING_PARAM (port),TA_SURE_MASK ,TA_SURE_OVERRIDE |TA_SURE (0 )); }
@@ -600,45 +606,45 @@ gen11_dsi_setup_timings(struct intel_encoder *encoder,static void gen11_dsi_gate_clocks (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy; -mutex_lock (&dev_priv->display.dpll.lock); - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +mutex_lock (&display->dpll.lock); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp |=ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->display.dpll.lock); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , tmp); +mutex_unlock (&display->dpll.lock); }static void gen11_dsi_ungate_clocks (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy; -mutex_lock (&dev_priv->display.dpll.lock); - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +mutex_lock (&display->dpll.lock); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->display.dpll.lock); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , tmp); +mutex_unlock (&display->dpll.lock); }static bool gen11_dsi_is_clock_enabled (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);bool clock_enabled = false;enum phy phy;u32 tmp; - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) {if (!(tmp &ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy)))
@@ -651,36 +657,36 @@ static bool gen11_dsi_is_clock_enabled(struct intel_encoder *encoder)static void gen11_dsi_map_pll (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_shared_dpll *pll = crtc_state->shared_dpll;enum phy phy;u32 val; -mutex_lock (&dev_priv->display.dpll.lock); +mutex_lock (&display->dpll.lock); - val =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); + val =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) { val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); val |=ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); } -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , val);for_each_dsi_phy (phy, intel_dsi->phys) { val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); } -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , val); -intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +intel_de_posting_read (display,ICL_DPCLKA_CFGCR0 ); -mutex_unlock (&dev_priv->display.dpll.lock); +mutex_unlock (&display->dpll.lock); }static void gen11_dsi_configure_transcoder (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);enum pipe pipe = crtc->pipe;
@@ -690,7 +696,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)); + tmp =intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans));if (intel_dsi->eotp_pkt) tmp &= ~EOTP_DISABLED ;
@@ -746,7 +752,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, } } -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {if (is_vid_mode (intel_dsi)) tmp |=BLANKING_PACKET_ENABLE ; }
@@ -779,15 +785,15 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, tmp |=TE_SOURCE_GPIO ; } -intel_de_write (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans), tmp); +intel_de_write (display,DSI_TRANS_FUNC_CONF (dsi_trans), tmp); }/* enable port sync mode if dual link */ if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL2 (display, dsi_trans),0 ,PORT_SYNC_MODE_ENABLE ); }
@@ -799,8 +805,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* select data lane width */ - tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans)); + tmp =intel_de_read (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans)); tmp &= ~DDI_PORT_WIDTH_MASK ; tmp |=DDI_PORT_WIDTH (intel_dsi->lane_count);
@@ -826,16 +832,16 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,/* enable DDI buffer */ tmp |=TRANS_DDI_FUNC_ENABLE ; -intel_de_write (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans), tmp); +intel_de_write (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans), tmp); }/* wait for link ready */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -if (wait_for_us ((intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)) & +if (wait_for_us ((intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans)) &LINK_READY ),2500 )) -drm_err (&dev_priv->drm,"DSI link not ready\n" ); +drm_err (display->drm,"DSI link not ready\n" ); } }
@@ -843,7 +849,7 @@ static void gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
@@ -910,17 +916,17 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,/* minimum hactive as per bspec: 256 pixels */ if (adjusted_mode->crtc_hdisplay <256 ) -drm_err (&dev_priv->drm,"hactive is less then 256 pixels\n" ); +drm_err (display->drm,"hactive is less then 256 pixels\n" );/* if RGB666 format, then hactive must be multiple of 4 pixels */ if (intel_dsi->pixel_format ==MIPI_DSI_FMT_RGB666 && hactive %4 !=0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"hactive pixels are not multiple of 4\n" );/* program TRANS_HTOTAL register */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, dsi_trans), +intel_de_write (display,TRANS_HTOTAL (display, dsi_trans),HACTIVE (hactive -1 ) |HTOTAL (htotal -1 )); }
@@ -929,12 +935,12 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (intel_dsi->video_mode ==NON_BURST_SYNC_PULSE ) {/* BSPEC: hsync size should be atleast 16 pixels */ if (hsync_size <16 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"hsync size < 16 pixels\n" ); }if (hback_porch <16 ) -drm_err (&dev_priv->drm,"hback porch < 16 pixels\n" ); +drm_err (display->drm,"hback porch < 16 pixels\n" );if (intel_dsi->dual_link) { hsync_start /=2 ;
@@ -943,8 +949,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_HSYNC (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_HSYNC (display, dsi_trans),HSYNC_START (hsync_start -1 ) |HSYNC_END (hsync_end -1 )); } }
@@ -958,22 +964,22 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* struct drm_display_mode. * For interlace mode: program required pixel minus 2 */ -intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, dsi_trans), +intel_de_write (display,TRANS_VTOTAL (display, dsi_trans),VACTIVE (vactive -1 ) |VTOTAL (vtotal -1 )); }if (vsync_end < vsync_start || vsync_end > vtotal) -drm_err (&dev_priv->drm,"Invalid vsync_end value\n" ); +drm_err (display->drm,"Invalid vsync_end value\n" );if (vsync_start < vactive) -drm_err (&dev_priv->drm,"vsync_start less than vactive\n" ); +drm_err (display->drm,"vsync_start less than vactive\n" );/* program TRANS_VSYNC register for video mode only */ if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VSYNC (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VSYNC (display, dsi_trans),VSYNC_START (vsync_start -1 ) |VSYNC_END (vsync_end -1 )); } }
@@ -987,8 +993,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VSYNCSHIFT (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VSYNCSHIFT (display, dsi_trans), vsync_shift); } }
@@ -999,11 +1005,11 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* FIXME get rid of these local hacks and do it right, * this will not handle eg. delayed vblank correctly. */ -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VBLANK (display, dsi_trans),VBLANK_START (vactive -1 ) |VBLANK_END (vtotal -1 )); } }
@@ -1011,20 +1017,20 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,static void gen11_dsi_enable_transcoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans),0 , +intel_de_rmw (display,TRANSCONF (display, dsi_trans),0 ,TRANSCONF_ENABLE );/* wait for transcoder to be enabled */ -if (intel_de_wait_for_set (dev_priv,TRANSCONF (dev_priv, dsi_trans), +if (intel_de_wait_for_set (display,TRANSCONF (display, dsi_trans),TRANSCONF_STATE_ENABLE ,10 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DSI transcoder not enabled\n" ); } }
@@ -1032,7 +1038,7 @@ static void gen11_dsi_enable_transcoder(struct intel_encoder *encoder)static void gen11_dsi_setup_timeouts (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;
@@ -1056,21 +1062,21 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* program hst_tx_timeout */ -intel_de_rmw (dev_priv,DSI_HSTX_TO (dsi_trans), +intel_de_rmw (display,DSI_HSTX_TO (dsi_trans),HSTX_TIMEOUT_VALUE_MASK ,HSTX_TIMEOUT_VALUE (hs_tx_timeout));/* FIXME: DSI_CALIB_TO */ /* program lp_rx_host timeout */ -intel_de_rmw (dev_priv,DSI_LPRX_HOST_TO (dsi_trans), +intel_de_rmw (display,DSI_LPRX_HOST_TO (dsi_trans),LPRX_TIMEOUT_VALUE_MASK ,LPRX_TIMEOUT_VALUE (lp_rx_timeout));/* FIXME: DSI_PWAIT_TO */ /* program turn around timeout */ -intel_de_rmw (dev_priv,DSI_TA_TO (dsi_trans), +intel_de_rmw (display,DSI_TA_TO (dsi_trans),TA_TIMEOUT_VALUE_MASK ,TA_TIMEOUT_VALUE (ta_timeout)); }
@@ -1079,7 +1085,7 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder,static void gen11_dsi_config_util_pin (struct intel_encoder *encoder,bool enable) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;
@@ -1091,7 +1097,7 @@ static void gen11_dsi_config_util_pin(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi) || (intel_dsi->ports &BIT (PORT_B )))return ; - tmp =intel_de_read (dev_priv,UTIL_PIN_CTL ); + tmp =intel_de_read (display,UTIL_PIN_CTL );if (enable) { tmp |=UTIL_PIN_DIRECTION_INPUT ;
@@ -1099,7 +1105,7 @@ static void gen11_dsi_config_util_pin(struct intel_encoder *encoder, }else { tmp &= ~UTIL_PIN_ENABLE ; } -intel_de_write (dev_priv,UTIL_PIN_CTL , tmp); +intel_de_write (display,UTIL_PIN_CTL , tmp); } static void
@@ -1137,7 +1143,7 @@ gen11_dsi_enable_port_and_phy(struct intel_encoder *encoder,static void gen11_dsi_powerup_panel (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct mipi_dsi_device *dsi;enum port port;
@@ -1153,14 +1159,14 @@ static void gen11_dsi_powerup_panel(struct intel_encoder *encoder)* FIXME: This uses the number of DW's currently in the payload * receive queue. This is probably not what we want here. */ - tmp =intel_de_read (dev_priv,DSI_CMD_RXCTL (dsi_trans)); + tmp =intel_de_read (display,DSI_CMD_RXCTL (dsi_trans)); tmp &=NUMBER_RX_PLOAD_DW_MASK ;/* multiply "Number Rx Payload DW" by 4 to get max value */ tmp = tmp *4 ; dsi = intel_dsi->dsi_hosts[port]->device; ret =mipi_dsi_set_maximum_return_packet_size (dsi, tmp);if (ret <0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"error setting max return pkt size%d\n" , tmp); }
@@ -1220,10 +1226,10 @@ static void gen11_dsi_pre_enable(struct intel_atomic_state *state,static void icl_apply_kvmr_pipe_a_wa (struct intel_encoder *encoder,enum pipe pipe,bool enable) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder); -if (DISPLAY_VER (dev_priv) ==11 && pipe ==PIPE_B ) -intel_de_rmw (dev_priv,CHICKEN_PAR1_1 , +if (DISPLAY_VER (display) ==11 && pipe ==PIPE_B ) +intel_de_rmw (display,CHICKEN_PAR1_1 ,IGNORE_KVMR_PIPE_A , enable ?IGNORE_KVMR_PIPE_A :0 ); }
@@ -1236,13 +1242,13 @@ static void icl_apply_kvmr_pipe_a_wa(struct intel_encoder *encoder,*/ static void adlp_set_lp_hs_wakeup_gb (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -if (DISPLAY_VER (i915) ==13 ) { +if (DISPLAY_VER (display) ==13 ) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (i915,TGL_DSI_CHKN_REG (port), +intel_de_rmw (display,TGL_DSI_CHKN_REG (port),TGL_DSI_CHKN_LSHS_GB_MASK ,TGL_DSI_CHKN_LSHS_GB (4 )); }
@@ -1276,7 +1282,7 @@ static void gen11_dsi_enable(struct intel_atomic_state *state,static void gen11_dsi_disable_transcoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;
@@ -1285,13 +1291,13 @@ static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder) dsi_trans =dsi_port_to_transcoder (port);/* disable transcoder */ -intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans), +intel_de_rmw (display,TRANSCONF (display, dsi_trans),TRANSCONF_ENABLE ,0 );/* wait for transcoder to be disabled */ -if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dev_priv, dsi_trans), +if (intel_de_wait_for_clear (display,TRANSCONF (display, dsi_trans),TRANSCONF_STATE_ENABLE ,50 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DSI trancoder not disabled\n" ); } }
@@ -1308,7 +1314,7 @@ static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder)static void gen11_dsi_deconfigure_trancoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;
@@ -1317,29 +1323,29 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)/* disable periodic update mode */ if (is_cmd_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,DSI_CMD_FRMCTL (port), +intel_de_rmw (display,DSI_CMD_FRMCTL (port),DSI_PERIODIC_FRAME_UPDATE_ENABLE ,0 ); }/* put dsi link in ULPS */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)); + tmp =intel_de_read (display,DSI_LP_MSG (dsi_trans)); tmp |=LINK_ENTER_ULPS ; tmp &= ~LINK_ULPS_TYPE_LP11 ; -intel_de_write (dev_priv,DSI_LP_MSG (dsi_trans), tmp); +intel_de_write (display,DSI_LP_MSG (dsi_trans), tmp); -if (wait_for_us ((intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) & +if (wait_for_us ((intel_de_read (display,DSI_LP_MSG (dsi_trans)) &LINK_IN_ULPS ),10 )) -drm_err (&dev_priv->drm,"DSI link not in ULPS\n" ); +drm_err (display->drm,"DSI link not in ULPS\n" ); }/* disable ddi function */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans),TRANS_DDI_FUNC_ENABLE ,0 ); }
@@ -1347,8 +1353,8 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL2 (display, dsi_trans),PORT_SYNC_MODE_ENABLE ,0 ); } }
@@ -1356,18 +1362,18 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)static void gen11_dsi_disable_port (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;gen11_dsi_ungate_clocks (encoder);for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DDI_BUF_CTL (port),DDI_BUF_CTL_ENABLE ,0 ); +intel_de_rmw (display,DDI_BUF_CTL (port),DDI_BUF_CTL_ENABLE ,0 ); -if (wait_for_us ((intel_de_read (dev_priv,DDI_BUF_CTL (port)) & +if (wait_for_us ((intel_de_read (display,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),8 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DDI port:%c buffer not idle\n" ,port_name (port)); }
@@ -1376,6 +1382,7 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder)static void gen11_dsi_disable_io_power (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;
@@ -1393,7 +1400,7 @@ static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)/* set mode to DDI */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_IO_MODECTL (port), +intel_de_rmw (display,ICL_DSI_IO_MODECTL (port),COMBO_PHY_MODE_DSI ,0 ); }
@@ -1505,8 +1512,7 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder,static bool gen11_dsi_is_periodic_cmd_mode (struct intel_dsi *intel_dsi) { -struct drm_device *dev = intel_dsi->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans;u32 val;
@@ -1515,7 +1521,7 @@ static bool gen11_dsi_is_periodic_cmd_mode(struct intel_dsi *intel_dsi)else dsi_trans =TRANSCODER_DSI_0 ; - val =intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)); + val =intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans));return (val &DSI_PERIODIC_FRAME_UPDATE_ENABLE ); }
@@ -1558,7 +1564,7 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder,static void gen11_dsi_sync_state (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_crtc *intel_crtc;enum pipe pipe;
@@ -1569,9 +1575,9 @@ static void gen11_dsi_sync_state(struct intel_encoder *encoder, pipe = intel_crtc->pipe;/* wa verify 1409054076:icl,jsl,ehl */ -if (DISPLAY_VER (dev_priv) ==11 && pipe ==PIPE_B && - !(intel_de_read (dev_priv,CHICKEN_PAR1_1 ) &IGNORE_KVMR_PIPE_A )) -drm_dbg_kms (&dev_priv->drm, +if (DISPLAY_VER (display) ==11 && pipe ==PIPE_B && + !(intel_de_read (display,CHICKEN_PAR1_1 ) &IGNORE_KVMR_PIPE_A )) +drm_dbg_kms (display->drm,"[ENCODER:%d:%s] BIOS left IGNORE_KVMR_PIPE_A cleared with pipe B enabled\n" , encoder->base.base.id, encoder->base.name);
@@ -1580,9 +1586,9 @@ static void gen11_dsi_sync_state(struct intel_encoder *encoder,static int gen11_dsi_dsc_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config; -int dsc_max_bpc =DISPLAY_VER (dev_priv) >=12 ?12 :10 ; +int dsc_max_bpc =DISPLAY_VER (display) >=12 ?12 :10 ;bool use_dsc;int ret;
@@ -1607,12 +1613,12 @@ static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder,return ret;/* DSI specific sanity checks on the common code */ -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->vbr_enable); -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->simple_422); -drm_WARN_ON (&dev_priv->drm, +drm_WARN_ON (display->drm, vdsc_cfg->vbr_enable); +drm_WARN_ON (display->drm, vdsc_cfg->simple_422); +drm_WARN_ON (display->drm, vdsc_cfg->pic_width % vdsc_cfg->slice_width); -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->slice_height <8 ); -drm_WARN_ON (&dev_priv->drm, +drm_WARN_ON (display->drm, vdsc_cfg->slice_height <8 ); +drm_WARN_ON (display->drm, vdsc_cfg->pic_height % vdsc_cfg->slice_height); ret =drm_dsc_compute_rc_parameters (vdsc_cfg);
@@ -1628,7 +1634,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_connector *intel_connector = intel_dsi->attached_connector; struct drm_display_mode *adjusted_mode =
@@ -1662,7 +1668,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->clock_set = true;if (gen11_dsi_dsc_compute_config (encoder, pipe_config)) -drm_dbg_kms (&i915->drm,"Attempting to use DSC failed\n" ); +drm_dbg_kms (display->drm,"Attempting to use DSC failed\n" ); pipe_config->port_clock =afe_clk (encoder, pipe_config) /5 ;
@@ -1680,15 +1686,13 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,static void gen11_dsi_get_power_domains (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); - -get_dsi_io_power_domains (i915, -enc_to_intel_dsi (encoder)); +get_dsi_io_power_domains (enc_to_intel_dsi (encoder)); }static bool gen11_dsi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum transcoder dsi_trans;
@@ -1704,8 +1708,8 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans)); + tmp =intel_de_read (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans));switch (tmp &TRANS_DDI_EDP_INPUT_MASK ) {case TRANS_DDI_EDP_INPUT_A_ON : *pipe =PIPE_A ;
@@ -1720,11 +1724,11 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder, *pipe =PIPE_D ;break ;default : -drm_err (&dev_priv->drm,"Invalid PIPE input\n" ); +drm_err (display->drm,"Invalid PIPE input\n" ); goto out; } - tmp =intel_de_read (dev_priv,TRANSCONF (dev_priv, dsi_trans)); + tmp =intel_de_read (display,TRANSCONF (display, dsi_trans)); ret = tmp &TRANSCONF_ENABLE ; } out:
@@ -1834,8 +1838,7 @@ static const struct mipi_dsi_host_ops gen11_dsi_host_ops = {static void icl_dphy_param_init (struct intel_dsi *intel_dsi) { -struct drm_device *dev = intel_dsi->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);struct intel_connector *connector = intel_dsi->attached_connector;struct mipi_config *mipi_config = connector->panel.vbt.dsi.config;u32 tlpx_ns;
@@ -1859,7 +1862,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)*/ prepare_cnt =DIV_ROUND_UP (ths_prepare_ns *4 , tlpx_ns);if (prepare_cnt >ICL_PREPARE_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"prepare_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"prepare_cnt out of range (%d)\n" , prepare_cnt); prepare_cnt =ICL_PREPARE_CNT_MAX ; }
@@ -1868,7 +1871,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi) clk_zero_cnt =DIV_ROUND_UP (mipi_config->tclk_prepare_clkzero - ths_prepare_ns, tlpx_ns);if (clk_zero_cnt >ICL_CLK_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"clk_zero_cnt out of range (%d)\n" , clk_zero_cnt); clk_zero_cnt =ICL_CLK_ZERO_CNT_MAX ; }
@@ -1876,7 +1879,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* trail cnt in escape clocks*/ trail_cnt =DIV_ROUND_UP (tclk_trail_ns, tlpx_ns);if (trail_cnt >ICL_TRAIL_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"trail_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"trail_cnt out of range (%d)\n" , trail_cnt); trail_cnt =ICL_TRAIL_CNT_MAX ; }
@@ -1884,7 +1887,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* tclk pre count in escape clocks */ tclk_pre_cnt =DIV_ROUND_UP (mipi_config->tclk_pre, tlpx_ns);if (tclk_pre_cnt >ICL_TCLK_PRE_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"tclk_pre_cnt out of range (%d)\n" , tclk_pre_cnt); tclk_pre_cnt =ICL_TCLK_PRE_CNT_MAX ; }
@@ -1893,7 +1896,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi) hs_zero_cnt =DIV_ROUND_UP (mipi_config->ths_prepare_hszero - ths_prepare_ns, tlpx_ns);if (hs_zero_cnt >ICL_HS_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"hs_zero_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"hs_zero_cnt out of range (%d)\n" , hs_zero_cnt); hs_zero_cnt =ICL_HS_ZERO_CNT_MAX ; }
@@ -1901,7 +1904,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* hs exit zero cnt in escape clocks */ exit_zero_cnt =DIV_ROUND_UP (mipi_config->ths_exit, tlpx_ns);if (exit_zero_cnt >ICL_EXIT_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"exit_zero_cnt out of range (%d)\n" , exit_zero_cnt); exit_zero_cnt =ICL_EXIT_ZERO_CNT_MAX ;
@@ -1943,10 +1946,9 @@ static void icl_dsi_add_properties(struct intel_connector *connector) fixed_mode->vdisplay); } -void icl_dsi_init (struct drm_i915_private *dev_priv, +void icl_dsi_init (struct intel_display *display,const struct intel_bios_encoder_data *devdata) { -struct intel_display *display = &dev_priv->display;struct intel_dsi *intel_dsi;struct intel_encoder *encoder;struct intel_connector *intel_connector;
@@ -1974,7 +1976,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, encoder->devdata = devdata;/* register DSI encoder with DRM subsystem */ -drm_encoder_init (&dev_priv->drm, &encoder->base, &gen11_dsi_encoder_funcs, +drm_encoder_init (display->drm, &encoder->base, + &gen11_dsi_encoder_funcs,DRM_MODE_ENCODER_DSI ,"DSI %c" ,port_name (port)); encoder->pre_pll_enable = gen11_dsi_pre_pll_enable;
@@ -1999,7 +2002,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, encoder->shutdown = intel_dsi_shutdown;/* register DSI connector with DRM subsystem */ -drm_connector_init (&dev_priv->drm, connector, &gen11_dsi_connector_funcs, +drm_connector_init (display->drm, connector, + &gen11_dsi_connector_funcs,DRM_MODE_CONNECTOR_DSI );drm_connector_helper_add (connector, &gen11_dsi_connector_helper_funcs); connector->display_info.subpixel_order = SubPixelHorizontalRGB;
@@ -2012,12 +2016,12 @@ void icl_dsi_init(struct drm_i915_private *dev_priv,intel_bios_init_panel_late (display, &intel_connector->panel, encoder->devdata,NULL ); -mutex_lock (&dev_priv->drm.mode_config.mutex); +mutex_lock (&display->drm->mode_config.mutex);intel_panel_add_vbt_lfp_fixed_mode (intel_connector); -mutex_unlock (&dev_priv->drm.mode_config.mutex); +mutex_unlock (&display->drm->mode_config.mutex);if (!intel_panel_preferred_fixed_mode (intel_connector)) { -drm_err (&dev_priv->drm,"DSI fixed mode info missing\n" ); +drm_err (display->drm,"DSI fixed mode info missing\n" ); goto err; }
@@ -2030,10 +2034,10 @@ void icl_dsi_init(struct drm_i915_private *dev_priv,else intel_dsi->ports =BIT (port); -if (drm_WARN_ON (&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) +if (drm_WARN_ON (display->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; -if (drm_WARN_ON (&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) +if (drm_WARN_ON (display->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports;for_each_dsi_port (port, intel_dsi->ports) {
@@ -2047,7 +2051,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, }if (!intel_dsi_vbt_init (intel_dsi,MIPI_DSI_GENERIC_PANEL_ID )) { -drm_dbg_kms (&dev_priv->drm,"no device found\n" ); +drm_dbg_kms (display->drm,"no device found\n" ); goto err; }
drivers/gpu/drm/i915/display/icl_dsi.h +2 -2
@@ -6,11 +6,11 @@#ifndef __ICL_DSI_H__#define __ICL_DSI_H__ -struct drm_i915_private ;struct intel_bios_encoder_data ;struct intel_crtc_state ; +struct intel_display ; -void icl_dsi_init (struct drm_i915_private *dev_priv, +void icl_dsi_init (struct intel_display *display,const struct intel_bios_encoder_data *devdata);void icl_dsi_frame_update (struct intel_crtc_state *crtc_state);
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
@@ -4885,7 +4885,7 @@ void intel_ddi_init(struct intel_display *display,if (!assert_has_icl_dsi (dev_priv))return ; -icl_dsi_init (dev_priv, devdata); +icl_dsi_init (display, devdata);return ; }
Signature · 1 line
2.39.5
Re: [PATCH 10/11] drm/i915/dsi: convert to struct intel_display
Quoted 9 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch ICL DSI code over to it.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 444 ++++++++++++----------- drivers/gpu/drm/i915/display/icl_dsi.h | 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- 3 files changed, 227 insertions(+), 223 deletions(-)
I think I need more coffee after this one :)
Quoted 1,402 lines
drivers/gpu/drm/i915/display/icl_dsi.c +224
-220@@ -51,38 +51,38 @@#include "skl_scaler.h" #include "skl_universal_plane.h" -static int header_credits_available (struct drm_i915_private *dev_priv, +static int header_credits_available (struct intel_display *display,enum transcoder dsi_trans) { -return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) +return (intel_de_read (display,DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) >>FREE_HEADER_CREDIT_SHIFT ; } -static int payload_credits_available (struct drm_i915_private *dev_priv, +static int payload_credits_available (struct intel_display *display,enum transcoder dsi_trans) { -return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) +return (intel_de_read (display,DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) >>FREE_PLOAD_CREDIT_SHIFT ; } -static bool wait_for_header_credits (struct drm_i915_private *dev_priv, +static bool wait_for_header_credits (struct intel_display *display,enum transcoder dsi_trans,int hdr_credit) { -if (wait_for_us (header_credits_available (dev_priv, dsi_trans) >= +if (wait_for_us (header_credits_available (display, dsi_trans) >= hdr_credit,100 )) { -drm_err (&dev_priv->drm,"DSI header credits not released\n" ); +drm_err (display->drm,"DSI header credits not released\n" );return false; }return true; } -static bool wait_for_payload_credits (struct drm_i915_private *dev_priv, +static bool wait_for_payload_credits (struct intel_display *display,enum transcoder dsi_trans,int payld_credit) { -if (wait_for_us (payload_credits_available (dev_priv, dsi_trans) >= +if (wait_for_us (payload_credits_available (display, dsi_trans) >= payld_credit,100 )) { -drm_err (&dev_priv->drm,"DSI payload credits not released\n" ); +drm_err (display->drm,"DSI payload credits not released\n" );return false; }@@ -99,7 +99,7 @@ static enum transcoder dsi_port_to_transcoder(enum port port)static void wait_for_cmds_dispatched_to_panel (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct mipi_dsi_device *dsi;enum port port;@@ -109,8 +109,8 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder)/* wait for header/payload credits to be released */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -wait_for_header_credits (dev_priv, dsi_trans,MAX_HEADER_CREDIT ); -wait_for_payload_credits (dev_priv, dsi_trans,MAX_PLOAD_CREDIT ); +wait_for_header_credits (display, dsi_trans,MAX_HEADER_CREDIT ); +wait_for_payload_credits (display, dsi_trans,MAX_PLOAD_CREDIT ); }/* send nop DCS command */ @@ -120,22 +120,22 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder) dsi->channel =0 ; ret =mipi_dsi_dcs_nop (dsi);if (ret <0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"error sending DCS NOP command\n" ); }/* wait for header credits to be released */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -wait_for_header_credits (dev_priv, dsi_trans,MAX_HEADER_CREDIT ); +wait_for_header_credits (display, dsi_trans,MAX_HEADER_CREDIT ); }/* wait for LP TX in progress bit to be cleared */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -if (wait_for_us (!(intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) & +if (wait_for_us (!(intel_de_read (display,DSI_LP_MSG (dsi_trans)) &LPTX_IN_PROGRESS ),20 )) -drm_err (&dev_priv->drm,"LPTX bit not cleared\n" ); +drm_err (display->drm,"LPTX bit not cleared\n" ); } }@@ -143,7 +143,7 @@ static int dsi_send_pkt_payld(struct intel_dsi_host *host, const struct mipi_dsi_packet *packet) {struct intel_dsi *intel_dsi = host->intel_dsi; -struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans =dsi_port_to_transcoder (host->port);const u8 *data = packet->payload;u32 len = packet->payload_length;@@ -151,20 +151,20 @@ static int dsi_send_pkt_payld(struct intel_dsi_host *host,/* payload queue can accept *256 bytes*, check limit */ if (len >MAX_PLOAD_CREDIT *4 ) { -drm_err (&i915->drm,"payload size exceeds max queue limit\n" ); +drm_err (display->drm,"payload size exceeds max queue limit\n" );return -EINVAL ; }for (i =0 ; i < len; i +=4 ) {u32 tmp =0 ; -if (!wait_for_payload_credits (i915, dsi_trans,1 )) +if (!wait_for_payload_credits (display, dsi_trans,1 ))return -EBUSY ;for (j =0 ; j <min_t (u32, len - i,4 ); j++) tmp |= *data++ <<8 * j; -intel_de_write (i915,DSI_CMD_TXPYLD (dsi_trans), tmp); +intel_de_write (display,DSI_CMD_TXPYLD (dsi_trans), tmp); }return 0 ;@@ -175,14 +175,14 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, bool enable_lpdt) {struct intel_dsi *intel_dsi = host->intel_dsi; -struct drm_i915_private *dev_priv =to_i915 (intel_dsi->base.base.dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans =dsi_port_to_transcoder (host->port);u32 tmp; -if (!wait_for_header_credits (dev_priv, dsi_trans,1 )) +if (!wait_for_header_credits (display, dsi_trans,1 ))return -EBUSY ; - tmp =intel_de_read (dev_priv,DSI_CMD_TXHDR (dsi_trans)); + tmp =intel_de_read (display,DSI_CMD_TXHDR (dsi_trans));if (packet->payload) tmp |=PAYLOAD_PRESENT ;@@ -201,15 +201,14 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, tmp |= ((packet->header[0 ] &DT_MASK ) <<DT_SHIFT ); tmp |= (packet->header[1 ] <<PARAM_WC_LOWER_SHIFT ); tmp |= (packet->header[2 ] <<PARAM_WC_UPPER_SHIFT ); -intel_de_write (dev_priv,DSI_CMD_TXHDR (dsi_trans), tmp); +intel_de_write (display,DSI_CMD_TXHDR (dsi_trans), tmp);return 0 ; }void icl_dsi_frame_update (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc_state);u32 mode_flags;enum port port;@@ -227,12 +226,13 @@ void icl_dsi_frame_update(struct intel_crtc_state *crtc_state)else return ; -intel_de_rmw (dev_priv,DSI_CMD_FRMCTL (port),0 ,DSI_FRAME_UPDATE_REQUEST ); +intel_de_rmw (display,DSI_CMD_FRMCTL (port),0 , +DSI_FRAME_UPDATE_REQUEST ); }static void dsi_program_swing_and_deemphasis (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum phy phy;u32 tmp, mask, val;@@ -246,31 +246,31 @@ static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder) mask =SCALING_MODE_SEL_MASK |RTERM_SELECT_MASK ; val =SCALING_MODE_SEL (0x2 ) |TAP2_DISABLE |TAP3_DISABLE |RTERM_SELECT (0x6 ); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp &= ~mask; tmp |= val; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy), mask, val); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy), mask, val); mask =SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK |RCOMP_SCALAR_MASK ; val =SWING_SEL_UPPER (0x2 ) |SWING_SEL_LOWER (0x2 ) |RCOMP_SCALAR (0x98 ); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW2_LN (0 , phy)); tmp &= ~mask; tmp |= val; -intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW2_AUX (phy), mask, val); +intel_de_write (display,ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW2_AUX (phy), mask, val); mask =POST_CURSOR_1_MASK |POST_CURSOR_2_MASK |CURSOR_COEFF_MASK ; val =POST_CURSOR_1 (0x0 ) |POST_CURSOR_2 (0x0 ) |CURSOR_COEFF (0x3f ); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_AUX (phy), mask, val); +intel_de_rmw (display,ICL_PORT_TX_DW4_AUX (phy), mask, val);/* Bspec: must not use GRP register for write */ for (lane =0 ; lane <=3 ; lane++) -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_LN (lane, phy), +intel_de_rmw (display,ICL_PORT_TX_DW4_LN (lane, phy), mask, val); } }@@ -278,13 +278,13 @@ static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder)static void configure_dual_link_mode (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);i915_reg_t dss_ctl1_reg, dss_ctl2_reg;u32 dss_ctl1;/* FIXME: Move all DSS handling to intel_vdsc.c */ -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); dss_ctl1_reg =ICL_PIPE_DSS_CTL1 (crtc->pipe);@@ -294,7 +294,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, dss_ctl2_reg =DSS_CTL2 ; } - dss_ctl1 =intel_de_read (dev_priv, dss_ctl1_reg); + dss_ctl1 =intel_de_read (display, dss_ctl1_reg); dss_ctl1 |=SPLITTER_ENABLE ; dss_ctl1 &= ~OVERLAP_PIXELS_MASK ; dss_ctl1 |=OVERLAP_PIXELS (intel_dsi->pixel_overlap);@@ -309,19 +309,19 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, dl_buffer_depth = hactive /2 + intel_dsi->pixel_overlap;if (dl_buffer_depth >MAX_DL_BUFFER_TARGET_DEPTH ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DL buffer depth exceed max value\n" ); dss_ctl1 &= ~LEFT_DL_BUF_TARGET_DEPTH_MASK ; dss_ctl1 |=LEFT_DL_BUF_TARGET_DEPTH (dl_buffer_depth); -intel_de_rmw (dev_priv, dss_ctl2_reg,RIGHT_DL_BUF_TARGET_DEPTH_MASK , +intel_de_rmw (display, dss_ctl2_reg,RIGHT_DL_BUF_TARGET_DEPTH_MASK ,RIGHT_DL_BUF_TARGET_DEPTH (dl_buffer_depth)); }else {/* Interleave */ dss_ctl1 |=DUAL_LINK_MODE_INTERLEAVE ; } -intel_de_write (dev_priv, dss_ctl1_reg, dss_ctl1); +intel_de_write (display, dss_ctl1_reg, dss_ctl1); }/* aka DSI 8X clock */ @@ -342,6 +342,7 @@ static int afe_clk(struct intel_encoder *encoder,static void gen11_dsi_program_esc_clk_div (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;@@ -361,33 +362,34 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder, }for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ICL_DSI_ESC_CLK_DIV (port), +intel_de_write (display,ICL_DSI_ESC_CLK_DIV (port), esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -intel_de_posting_read (dev_priv,ICL_DSI_ESC_CLK_DIV (port)); +intel_de_posting_read (display,ICL_DSI_ESC_CLK_DIV (port)); }for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ICL_DPHY_ESC_CLK_DIV (port), +intel_de_write (display,ICL_DPHY_ESC_CLK_DIV (port), esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -intel_de_posting_read (dev_priv,ICL_DPHY_ESC_CLK_DIV (port)); +intel_de_posting_read (display,ICL_DPHY_ESC_CLK_DIV (port)); }if (IS_ALDERLAKE_S (dev_priv) ||IS_ALDERLAKE_P (dev_priv)) {for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ADL_MIPIO_DW (port,8 ), +intel_de_write (display,ADL_MIPIO_DW (port,8 ), esc_clk_div_m_phy &TX_ESC_CLK_DIV_PHY ); -intel_de_posting_read (dev_priv,ADL_MIPIO_DW (port,8 )); +intel_de_posting_read (display,ADL_MIPIO_DW (port,8 )); } } } -static void get_dsi_io_power_domains (struct drm_i915_private *dev_priv, -struct intel_dsi *intel_dsi) +static void get_dsi_io_power_domains (struct intel_dsi *intel_dsi) { +struct intel_display *display =to_intel_display (&intel_dsi->base); +struct drm_i915_private *dev_priv =to_i915 (display->drm);enum port port;for_each_dsi_port (port, intel_dsi->ports) { -drm_WARN_ON (&dev_priv->drm, intel_dsi->io_wakeref[port]); +drm_WARN_ON (display->drm, intel_dsi->io_wakeref[port]); intel_dsi->io_wakeref[port] = intel_display_power_get(dev_priv, port == PORT_A ?@@ -398,15 +400,15 @@ static void get_dsi_io_power_domains(struct drm_i915_private *dev_priv,static void gen11_dsi_enable_io_power (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_IO_MODECTL (port), +intel_de_rmw (display,ICL_DSI_IO_MODECTL (port),0 ,COMBO_PHY_MODE_DSI ); -get_dsi_io_power_domains (dev_priv, intel_dsi); +get_dsi_io_power_domains (intel_dsi); }static void gen11_dsi_power_up_lanes (struct intel_encoder *encoder)@@ -422,6 +424,7 @@ static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)static void gen11_dsi_config_phy_lanes_sequence (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum phy phy;@@ -430,32 +433,33 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)/* Step 4b(i) set loadgen select for transmit and aux lanes */ for_each_dsi_phy (phy, intel_dsi->phys) { -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_AUX (phy),LOADGEN_SELECT ,0 ); +intel_de_rmw (display,ICL_PORT_TX_DW4_AUX (phy), +LOADGEN_SELECT ,0 );for (lane =0 ; lane <=3 ; lane++) -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_LN (lane, phy), +intel_de_rmw (display,ICL_PORT_TX_DW4_LN (lane, phy),LOADGEN_SELECT , lane !=2 ?LOADGEN_SELECT :0 ); }/* Step 4b(ii) set latency optimization for transmit and aux lanes */ for_each_dsi_phy (phy, intel_dsi->phys) { -intel_de_rmw (dev_priv,ICL_PORT_TX_DW2_AUX (phy), +intel_de_rmw (display,ICL_PORT_TX_DW2_AUX (phy),FRC_LATENCY_OPTIM_MASK ,FRC_LATENCY_OPTIM_VAL (0x5 )); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW2_LN (0 , phy)); tmp &= ~FRC_LATENCY_OPTIM_MASK ; tmp |=FRC_LATENCY_OPTIM_VAL (0x5 ); -intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_write (display,ICL_PORT_TX_DW2_GRP (phy), tmp);/* For EHL, TGL, set latency optimization for PCS_DW1 lanes */ if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv) || - (DISPLAY_VER (dev_priv) >=12 )) { -intel_de_rmw (dev_priv,ICL_PORT_PCS_DW1_AUX (phy), + (DISPLAY_VER (display) >=12 )) { +intel_de_rmw (display,ICL_PORT_PCS_DW1_AUX (phy),LATENCY_OPTIM_MASK ,LATENCY_OPTIM_VAL (0 )); - tmp =intel_de_read (dev_priv, + tmp =intel_de_read (display,ICL_PORT_PCS_DW1_LN (0 , phy)); tmp &= ~LATENCY_OPTIM_MASK ; tmp |=LATENCY_OPTIM_VAL (0x1 ); -intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), +intel_de_write (display,ICL_PORT_PCS_DW1_GRP (phy), tmp); } }@@ -464,17 +468,17 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)static void gen11_dsi_voltage_swing_program_seq (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy;/* clear common keeper enable bit */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_PCS_DW1_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_PCS_DW1_LN (0 , phy)); tmp &= ~COMMON_KEEPER_EN ; -intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_PCS_DW1_AUX (phy),COMMON_KEEPER_EN ,0 ); +intel_de_write (display,ICL_PORT_PCS_DW1_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_PCS_DW1_AUX (phy),COMMON_KEEPER_EN ,0 ); }/* @@ -483,14 +487,15 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)* as part of lane phy sequence configuration */ for_each_dsi_phy (phy, intel_dsi->phys) -intel_de_rmw (dev_priv,ICL_PORT_CL_DW5 (phy),0 ,SUS_CLOCK_CONFIG ); +intel_de_rmw (display,ICL_PORT_CL_DW5 (phy),0 , +SUS_CLOCK_CONFIG );/* Clear training enable to change swing values */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp &= ~TX_TRAINING_EN ; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy),TX_TRAINING_EN ,0 ); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy),TX_TRAINING_EN ,0 ); }/* Program swing and de-emphasis */ @@ -498,26 +503,26 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)/* Set training enable to trigger update */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp |=TX_TRAINING_EN ; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy),0 ,TX_TRAINING_EN ); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy),0 ,TX_TRAINING_EN ); } }static void gen11_dsi_enable_ddi_buffer (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DDI_BUF_CTL (port),0 ,DDI_BUF_CTL_ENABLE ); +intel_de_rmw (display,DDI_BUF_CTL (port),0 ,DDI_BUF_CTL_ENABLE ); -if (wait_for_us (!(intel_de_read (dev_priv,DDI_BUF_CTL (port)) & +if (wait_for_us (!(intel_de_read (display,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),500 )) -drm_err (&dev_priv->drm,"DDI port:%c buffer idle\n" , +drm_err (display->drm,"DDI port:%c buffer idle\n" ,port_name (port)); } }@@ -526,6 +531,7 @@ static void gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { + struct intel_display *display = to_intel_display(encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;@@ -533,12 +539,12 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,/* Program DPHY clock lanes timings */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DPHY_CLK_TIMING_PARAM (port), +intel_de_write (display,DPHY_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg);/* Program DPHY data lanes timings */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DPHY_DATA_TIMING_PARAM (port), +intel_de_write (display,DPHY_DATA_TIMING_PARAM (port), intel_dsi->dphy_data_lane_reg);/* @@ -547,10 +553,10 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,* a value '0' inside TA_PARAM_REGISTERS otherwise * leave all fields at HW default values. */ -if (DISPLAY_VER (dev_priv) ==11 ) { +if (DISPLAY_VER (display) ==11 ) {if (afe_clk (encoder, crtc_state) <=800000 ) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,DPHY_TA_TIMING_PARAM (port), +intel_de_rmw (display,DPHY_TA_TIMING_PARAM (port),TA_SURE_MASK ,TA_SURE_OVERRIDE |TA_SURE (0 )); }@@ -558,7 +564,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {for_each_dsi_phy (phy, intel_dsi->phys) -intel_de_rmw (dev_priv,ICL_DPHY_CHKN (phy), +intel_de_rmw (display,ICL_DPHY_CHKN (phy),0 ,ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP ); } }@@ -567,30 +573,30 @@ static void gen11_dsi_setup_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;/* Program T-INIT master registers */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_T_INIT_MASTER (port), +intel_de_rmw (display,ICL_DSI_T_INIT_MASTER (port),DSI_T_INIT_MASTER_MASK , intel_dsi->init_count);/* shadow register inside display core */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DSI_CLK_TIMING_PARAM (port), +intel_de_write (display,DSI_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg);/* shadow register inside display core */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DSI_DATA_TIMING_PARAM (port), +intel_de_write (display,DSI_DATA_TIMING_PARAM (port), intel_dsi->dphy_data_lane_reg);/* shadow register inside display core */ -if (DISPLAY_VER (dev_priv) ==11 ) { +if (DISPLAY_VER (display) ==11 ) {if (afe_clk (encoder, crtc_state) <=800000 ) {for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DSI_TA_TIMING_PARAM (port), +intel_de_rmw (display,DSI_TA_TIMING_PARAM (port),TA_SURE_MASK ,TA_SURE_OVERRIDE |TA_SURE (0 )); }@@ -600,45 +606,45 @@ gen11_dsi_setup_timings(struct intel_encoder *encoder,static void gen11_dsi_gate_clocks (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy; -mutex_lock (&dev_priv->display.dpll.lock); - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +mutex_lock (&display->dpll.lock); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp |=ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->display.dpll.lock); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , tmp); +mutex_unlock (&display->dpll.lock); }static void gen11_dsi_ungate_clocks (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy; -mutex_lock (&dev_priv->display.dpll.lock); - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +mutex_lock (&display->dpll.lock); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->display.dpll.lock); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , tmp); +mutex_unlock (&display->dpll.lock); }static bool gen11_dsi_is_clock_enabled (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);bool clock_enabled = false;enum phy phy;u32 tmp; - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) {if (!(tmp &ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy)))@@ -651,36 +657,36 @@ static bool gen11_dsi_is_clock_enabled(struct intel_encoder *encoder)static void gen11_dsi_map_pll (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_shared_dpll *pll = crtc_state->shared_dpll;enum phy phy;u32 val; -mutex_lock (&dev_priv->display.dpll.lock); +mutex_lock (&display->dpll.lock); - val =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); + val =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) { val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); val |=ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); } -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , val);for_each_dsi_phy (phy, intel_dsi->phys) { val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); } -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , val); -intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +intel_de_posting_read (display,ICL_DPCLKA_CFGCR0 ); -mutex_unlock (&dev_priv->display.dpll.lock); +mutex_unlock (&display->dpll.lock); }static void gen11_dsi_configure_transcoder (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);enum pipe pipe = crtc->pipe;@@ -690,7 +696,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)); + tmp =intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans));if (intel_dsi->eotp_pkt) tmp &= ~EOTP_DISABLED ;@@ -746,7 +752,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, } } -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {if (is_vid_mode (intel_dsi)) tmp |=BLANKING_PACKET_ENABLE ; }@@ -779,15 +785,15 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, tmp |=TE_SOURCE_GPIO ; } -intel_de_write (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans), tmp); +intel_de_write (display,DSI_TRANS_FUNC_CONF (dsi_trans), tmp); }/* enable port sync mode if dual link */ if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL2 (display, dsi_trans),0 ,PORT_SYNC_MODE_ENABLE ); }@@ -799,8 +805,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* select data lane width */ - tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans)); + tmp =intel_de_read (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans)); tmp &= ~DDI_PORT_WIDTH_MASK ; tmp |=DDI_PORT_WIDTH (intel_dsi->lane_count);@@ -826,16 +832,16 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,/* enable DDI buffer */ tmp |=TRANS_DDI_FUNC_ENABLE ; -intel_de_write (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans), tmp); +intel_de_write (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans), tmp); }/* wait for link ready */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -if (wait_for_us ((intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)) & +if (wait_for_us ((intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans)) &LINK_READY ),2500 )) -drm_err (&dev_priv->drm,"DSI link not ready\n" ); +drm_err (display->drm,"DSI link not ready\n" ); } }@@ -843,7 +849,7 @@ static void gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;@@ -910,17 +916,17 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,/* minimum hactive as per bspec: 256 pixels */ if (adjusted_mode->crtc_hdisplay <256 ) -drm_err (&dev_priv->drm,"hactive is less then 256 pixels\n" ); +drm_err (display->drm,"hactive is less then 256 pixels\n" );/* if RGB666 format, then hactive must be multiple of 4 pixels */ if (intel_dsi->pixel_format ==MIPI_DSI_FMT_RGB666 && hactive %4 !=0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"hactive pixels are not multiple of 4\n" );/* program TRANS_HTOTAL register */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, dsi_trans), +intel_de_write (display,TRANS_HTOTAL (display, dsi_trans),HACTIVE (hactive -1 ) |HTOTAL (htotal -1 )); }@@ -929,12 +935,12 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (intel_dsi->video_mode ==NON_BURST_SYNC_PULSE ) {/* BSPEC: hsync size should be atleast 16 pixels */ if (hsync_size <16 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"hsync size < 16 pixels\n" ); }if (hback_porch <16 ) -drm_err (&dev_priv->drm,"hback porch < 16 pixels\n" ); +drm_err (display->drm,"hback porch < 16 pixels\n" );if (intel_dsi->dual_link) { hsync_start /=2 ;@@ -943,8 +949,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_HSYNC (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_HSYNC (display, dsi_trans),HSYNC_START (hsync_start -1 ) |HSYNC_END (hsync_end -1 )); } }@@ -958,22 +964,22 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* struct drm_display_mode. * For interlace mode: program required pixel minus 2 */ -intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, dsi_trans), +intel_de_write (display,TRANS_VTOTAL (display, dsi_trans),VACTIVE (vactive -1 ) |VTOTAL (vtotal -1 )); }if (vsync_end < vsync_start || vsync_end > vtotal) -drm_err (&dev_priv->drm,"Invalid vsync_end value\n" ); +drm_err (display->drm,"Invalid vsync_end value\n" );if (vsync_start < vactive) -drm_err (&dev_priv->drm,"vsync_start less than vactive\n" ); +drm_err (display->drm,"vsync_start less than vactive\n" );/* program TRANS_VSYNC register for video mode only */ if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VSYNC (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VSYNC (display, dsi_trans),VSYNC_START (vsync_start -1 ) |VSYNC_END (vsync_end -1 )); } }@@ -987,8 +993,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VSYNCSHIFT (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VSYNCSHIFT (display, dsi_trans), vsync_shift); } }@@ -999,11 +1005,11 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* FIXME get rid of these local hacks and do it right, * this will not handle eg. delayed vblank correctly. */ -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VBLANK (display, dsi_trans),VBLANK_START (vactive -1 ) |VBLANK_END (vtotal -1 )); } }@@ -1011,20 +1017,20 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,static void gen11_dsi_enable_transcoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans),0 , +intel_de_rmw (display,TRANSCONF (display, dsi_trans),0 ,TRANSCONF_ENABLE );/* wait for transcoder to be enabled */ -if (intel_de_wait_for_set (dev_priv,TRANSCONF (dev_priv, dsi_trans), +if (intel_de_wait_for_set (display,TRANSCONF (display, dsi_trans),TRANSCONF_STATE_ENABLE ,10 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DSI transcoder not enabled\n" ); } }@@ -1032,7 +1038,7 @@ static void gen11_dsi_enable_transcoder(struct intel_encoder *encoder)static void gen11_dsi_setup_timeouts (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;@@ -1056,21 +1062,21 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* program hst_tx_timeout */ -intel_de_rmw (dev_priv,DSI_HSTX_TO (dsi_trans), +intel_de_rmw (display,DSI_HSTX_TO (dsi_trans),HSTX_TIMEOUT_VALUE_MASK ,HSTX_TIMEOUT_VALUE (hs_tx_timeout));/* FIXME: DSI_CALIB_TO */ /* program lp_rx_host timeout */ -intel_de_rmw (dev_priv,DSI_LPRX_HOST_TO (dsi_trans), +intel_de_rmw (display,DSI_LPRX_HOST_TO (dsi_trans),LPRX_TIMEOUT_VALUE_MASK ,LPRX_TIMEOUT_VALUE (lp_rx_timeout));/* FIXME: DSI_PWAIT_TO */ /* program turn around timeout */ -intel_de_rmw (dev_priv,DSI_TA_TO (dsi_trans), +intel_de_rmw (display,DSI_TA_TO (dsi_trans),TA_TIMEOUT_VALUE_MASK ,TA_TIMEOUT_VALUE (ta_timeout)); }@@ -1079,7 +1085,7 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder,static void gen11_dsi_config_util_pin (struct intel_encoder *encoder,bool enable) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;@@ -1091,7 +1097,7 @@ static void gen11_dsi_config_util_pin(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi) || (intel_dsi->ports &BIT (PORT_B )))return ; - tmp =intel_de_read (dev_priv,UTIL_PIN_CTL ); + tmp =intel_de_read (display,UTIL_PIN_CTL );if (enable) { tmp |=UTIL_PIN_DIRECTION_INPUT ;@@ -1099,7 +1105,7 @@ static void gen11_dsi_config_util_pin(struct intel_encoder *encoder, }else { tmp &= ~UTIL_PIN_ENABLE ; } -intel_de_write (dev_priv,UTIL_PIN_CTL , tmp); +intel_de_write (display,UTIL_PIN_CTL , tmp); } static void@@ -1137,7 +1143,7 @@ gen11_dsi_enable_port_and_phy(struct intel_encoder *encoder,static void gen11_dsi_powerup_panel (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct mipi_dsi_device *dsi;enum port port;@@ -1153,14 +1159,14 @@ static void gen11_dsi_powerup_panel(struct intel_encoder *encoder)* FIXME: This uses the number of DW's currently in the payload * receive queue. This is probably not what we want here. */ - tmp =intel_de_read (dev_priv,DSI_CMD_RXCTL (dsi_trans)); + tmp =intel_de_read (display,DSI_CMD_RXCTL (dsi_trans)); tmp &=NUMBER_RX_PLOAD_DW_MASK ;/* multiply "Number Rx Payload DW" by 4 to get max value */ tmp = tmp *4 ; dsi = intel_dsi->dsi_hosts[port]->device; ret =mipi_dsi_set_maximum_return_packet_size (dsi, tmp);if (ret <0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"error setting max return pkt size%d\n" , tmp); }@@ -1220,10 +1226,10 @@ static void gen11_dsi_pre_enable(struct intel_atomic_state *state,static void icl_apply_kvmr_pipe_a_wa (struct intel_encoder *encoder,enum pipe pipe,bool enable) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder); -if (DISPLAY_VER (dev_priv) ==11 && pipe ==PIPE_B ) -intel_de_rmw (dev_priv,CHICKEN_PAR1_1 , +if (DISPLAY_VER (display) ==11 && pipe ==PIPE_B ) +intel_de_rmw (display,CHICKEN_PAR1_1 ,IGNORE_KVMR_PIPE_A , enable ?IGNORE_KVMR_PIPE_A :0 ); }@@ -1236,13 +1242,13 @@ static void icl_apply_kvmr_pipe_a_wa(struct intel_encoder *encoder,*/ static void adlp_set_lp_hs_wakeup_gb (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -if (DISPLAY_VER (i915) ==13 ) { +if (DISPLAY_VER (display) ==13 ) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (i915,TGL_DSI_CHKN_REG (port), +intel_de_rmw (display,TGL_DSI_CHKN_REG (port),TGL_DSI_CHKN_LSHS_GB_MASK ,TGL_DSI_CHKN_LSHS_GB (4 )); }@@ -1276,7 +1282,7 @@ static void gen11_dsi_enable(struct intel_atomic_state *state,static void gen11_dsi_disable_transcoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;@@ -1285,13 +1291,13 @@ static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder) dsi_trans =dsi_port_to_transcoder (port);/* disable transcoder */ -intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans), +intel_de_rmw (display,TRANSCONF (display, dsi_trans),TRANSCONF_ENABLE ,0 );/* wait for transcoder to be disabled */ -if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dev_priv, dsi_trans), +if (intel_de_wait_for_clear (display,TRANSCONF (display, dsi_trans),TRANSCONF_STATE_ENABLE ,50 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DSI trancoder not disabled\n" ); } }@@ -1308,7 +1314,7 @@ static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder)static void gen11_dsi_deconfigure_trancoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;@@ -1317,29 +1323,29 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)/* disable periodic update mode */ if (is_cmd_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,DSI_CMD_FRMCTL (port), +intel_de_rmw (display,DSI_CMD_FRMCTL (port),DSI_PERIODIC_FRAME_UPDATE_ENABLE ,0 ); }/* put dsi link in ULPS */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)); + tmp =intel_de_read (display,DSI_LP_MSG (dsi_trans)); tmp |=LINK_ENTER_ULPS ; tmp &= ~LINK_ULPS_TYPE_LP11 ; -intel_de_write (dev_priv,DSI_LP_MSG (dsi_trans), tmp); +intel_de_write (display,DSI_LP_MSG (dsi_trans), tmp); -if (wait_for_us ((intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) & +if (wait_for_us ((intel_de_read (display,DSI_LP_MSG (dsi_trans)) &LINK_IN_ULPS ),10 )) -drm_err (&dev_priv->drm,"DSI link not in ULPS\n" ); +drm_err (display->drm,"DSI link not in ULPS\n" ); }/* disable ddi function */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans),TRANS_DDI_FUNC_ENABLE ,0 ); }@@ -1347,8 +1353,8 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL2 (display, dsi_trans),PORT_SYNC_MODE_ENABLE ,0 ); } }@@ -1356,18 +1362,18 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)static void gen11_dsi_disable_port (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;gen11_dsi_ungate_clocks (encoder);for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DDI_BUF_CTL (port),DDI_BUF_CTL_ENABLE ,0 ); +intel_de_rmw (display,DDI_BUF_CTL (port),DDI_BUF_CTL_ENABLE ,0 ); -if (wait_for_us ((intel_de_read (dev_priv,DDI_BUF_CTL (port)) & +if (wait_for_us ((intel_de_read (display,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),8 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DDI port:%c buffer not idle\n" ,port_name (port)); }@@ -1376,6 +1382,7 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder)static void gen11_dsi_disable_io_power (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;@@ -1393,7 +1400,7 @@ static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)/* set mode to DDI */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_IO_MODECTL (port), +intel_de_rmw (display,ICL_DSI_IO_MODECTL (port),COMBO_PHY_MODE_DSI ,0 ); }@@ -1505,8 +1512,7 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder,static bool gen11_dsi_is_periodic_cmd_mode (struct intel_dsi *intel_dsi) { -struct drm_device *dev = intel_dsi->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans;u32 val;@@ -1515,7 +1521,7 @@ static bool gen11_dsi_is_periodic_cmd_mode(struct intel_dsi *intel_dsi)else dsi_trans =TRANSCODER_DSI_0 ; - val =intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)); + val =intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans));return (val &DSI_PERIODIC_FRAME_UPDATE_ENABLE ); }@@ -1558,7 +1564,7 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder,static void gen11_dsi_sync_state (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_crtc *intel_crtc;enum pipe pipe;@@ -1569,9 +1575,9 @@ static void gen11_dsi_sync_state(struct intel_encoder *encoder, pipe = intel_crtc->pipe;/* wa verify 1409054076:icl,jsl,ehl */ -if (DISPLAY_VER (dev_priv) ==11 && pipe ==PIPE_B && - !(intel_de_read (dev_priv,CHICKEN_PAR1_1 ) &IGNORE_KVMR_PIPE_A )) -drm_dbg_kms (&dev_priv->drm, +if (DISPLAY_VER (display) ==11 && pipe ==PIPE_B && + !(intel_de_read (display,CHICKEN_PAR1_1 ) &IGNORE_KVMR_PIPE_A )) +drm_dbg_kms (display->drm,"[ENCODER:%d:%s] BIOS left IGNORE_KVMR_PIPE_A cleared with pipe B enabled\n" , encoder->base.base.id, encoder->base.name);@@ -1580,9 +1586,9 @@ static void gen11_dsi_sync_state(struct intel_encoder *encoder,static int gen11_dsi_dsc_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config; -int dsc_max_bpc =DISPLAY_VER (dev_priv) >=12 ?12 :10 ; +int dsc_max_bpc =DISPLAY_VER (display) >=12 ?12 :10 ;bool use_dsc;int ret;@@ -1607,12 +1613,12 @@ static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder,return ret;/* DSI specific sanity checks on the common code */ -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->vbr_enable); -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->simple_422); -drm_WARN_ON (&dev_priv->drm, +drm_WARN_ON (display->drm, vdsc_cfg->vbr_enable); +drm_WARN_ON (display->drm, vdsc_cfg->simple_422); +drm_WARN_ON (display->drm, vdsc_cfg->pic_width % vdsc_cfg->slice_width); -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->slice_height <8 ); -drm_WARN_ON (&dev_priv->drm, +drm_WARN_ON (display->drm, vdsc_cfg->slice_height <8 ); +drm_WARN_ON (display->drm, vdsc_cfg->pic_height % vdsc_cfg->slice_height); ret =drm_dsc_compute_rc_parameters (vdsc_cfg);@@ -1628,7 +1634,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_connector *intel_connector = intel_dsi->attached_connector; struct drm_display_mode *adjusted_mode =@@ -1662,7 +1668,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->clock_set = true;if (gen11_dsi_dsc_compute_config (encoder, pipe_config)) -drm_dbg_kms (&i915->drm,"Attempting to use DSC failed\n" ); +drm_dbg_kms (display->drm,"Attempting to use DSC failed\n" ); pipe_config->port_clock =afe_clk (encoder, pipe_config) /5 ;@@ -1680,15 +1686,13 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,static void gen11_dsi_get_power_domains (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); - -get_dsi_io_power_domains (i915, -enc_to_intel_dsi (encoder)); +get_dsi_io_power_domains (enc_to_intel_dsi (encoder)); }static bool gen11_dsi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum transcoder dsi_trans;@@ -1704,8 +1708,8 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans)); + tmp =intel_de_read (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans));switch (tmp &TRANS_DDI_EDP_INPUT_MASK ) {case TRANS_DDI_EDP_INPUT_A_ON : *pipe =PIPE_A ;@@ -1720,11 +1724,11 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder, *pipe =PIPE_D ;break ;default : -drm_err (&dev_priv->drm,"Invalid PIPE input\n" ); +drm_err (display->drm,"Invalid PIPE input\n" ); goto out; } - tmp =intel_de_read (dev_priv,TRANSCONF (dev_priv, dsi_trans)); + tmp =intel_de_read (display,TRANSCONF (display, dsi_trans)); ret = tmp &TRANSCONF_ENABLE ; } out:@@ -1834,8 +1838,7 @@ static const struct mipi_dsi_host_ops gen11_dsi_host_ops = {static void icl_dphy_param_init (struct intel_dsi *intel_dsi) { -struct drm_device *dev = intel_dsi->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);struct intel_connector *connector = intel_dsi->attached_connector;struct mipi_config *mipi_config = connector->panel.vbt.dsi.config;u32 tlpx_ns;@@ -1859,7 +1862,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)*/ prepare_cnt =DIV_ROUND_UP (ths_prepare_ns *4 , tlpx_ns);if (prepare_cnt >ICL_PREPARE_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"prepare_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"prepare_cnt out of range (%d)\n" , prepare_cnt); prepare_cnt =ICL_PREPARE_CNT_MAX ; }@@ -1868,7 +1871,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi) clk_zero_cnt =DIV_ROUND_UP (mipi_config->tclk_prepare_clkzero - ths_prepare_ns, tlpx_ns);if (clk_zero_cnt >ICL_CLK_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"clk_zero_cnt out of range (%d)\n" , clk_zero_cnt); clk_zero_cnt =ICL_CLK_ZERO_CNT_MAX ; }@@ -1876,7 +1879,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* trail cnt in escape clocks*/ trail_cnt =DIV_ROUND_UP (tclk_trail_ns, tlpx_ns);if (trail_cnt >ICL_TRAIL_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"trail_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"trail_cnt out of range (%d)\n" , trail_cnt); trail_cnt =ICL_TRAIL_CNT_MAX ; }@@ -1884,7 +1887,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* tclk pre count in escape clocks */ tclk_pre_cnt =DIV_ROUND_UP (mipi_config->tclk_pre, tlpx_ns);if (tclk_pre_cnt >ICL_TCLK_PRE_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"tclk_pre_cnt out of range (%d)\n" , tclk_pre_cnt); tclk_pre_cnt =ICL_TCLK_PRE_CNT_MAX ; }@@ -1893,7 +1896,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi) hs_zero_cnt =DIV_ROUND_UP (mipi_config->ths_prepare_hszero - ths_prepare_ns, tlpx_ns);if (hs_zero_cnt >ICL_HS_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"hs_zero_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"hs_zero_cnt out of range (%d)\n" , hs_zero_cnt); hs_zero_cnt =ICL_HS_ZERO_CNT_MAX ; }@@ -1901,7 +1904,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* hs exit zero cnt in escape clocks */ exit_zero_cnt =DIV_ROUND_UP (mipi_config->ths_exit, tlpx_ns);if (exit_zero_cnt >ICL_EXIT_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"exit_zero_cnt out of range (%d)\n" , exit_zero_cnt); exit_zero_cnt =ICL_EXIT_ZERO_CNT_MAX ;@@ -1943,10 +1946,9 @@ static void icl_dsi_add_properties(struct intel_connector *connector) fixed_mode->vdisplay); } -void icl_dsi_init (struct drm_i915_private *dev_priv, +void icl_dsi_init (struct intel_display *display,const struct intel_bios_encoder_data *devdata) { -struct intel_display *display = &dev_priv->display;struct intel_dsi *intel_dsi;struct intel_encoder *encoder;struct intel_connector *intel_connector;@@ -1974,7 +1976,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, encoder->devdata = devdata;/* register DSI encoder with DRM subsystem */ -drm_encoder_init (&dev_priv->drm, &encoder->base, &gen11_dsi_encoder_funcs, +drm_encoder_init (display->drm, &encoder->base, + &gen11_dsi_encoder_funcs,DRM_MODE_ENCODER_DSI ,"DSI %c" ,port_name (port)); encoder->pre_pll_enable = gen11_dsi_pre_pll_enable;@@ -1999,7 +2002,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, encoder->shutdown = intel_dsi_shutdown;/* register DSI connector with DRM subsystem */ -drm_connector_init (&dev_priv->drm, connector, &gen11_dsi_connector_funcs, +drm_connector_init (display->drm, connector, + &gen11_dsi_connector_funcs,DRM_MODE_CONNECTOR_DSI );drm_connector_helper_add (connector, &gen11_dsi_connector_helper_funcs); connector->display_info.subpixel_order = SubPixelHorizontalRGB;@@ -2012,12 +2016,12 @@ void icl_dsi_init(struct drm_i915_private *dev_priv,intel_bios_init_panel_late (display, &intel_connector->panel, encoder->devdata,NULL ); -mutex_lock (&dev_priv->drm.mode_config.mutex); +mutex_lock (&display->drm->mode_config.mutex);intel_panel_add_vbt_lfp_fixed_mode (intel_connector); -mutex_unlock (&dev_priv->drm.mode_config.mutex); +mutex_unlock (&display->drm->mode_config.mutex);if (!intel_panel_preferred_fixed_mode (intel_connector)) { -drm_err (&dev_priv->drm,"DSI fixed mode info missing\n" ); +drm_err (display->drm,"DSI fixed mode info missing\n" ); goto err; }@@ -2030,10 +2034,10 @@ void icl_dsi_init(struct drm_i915_private *dev_priv,else intel_dsi->ports =BIT (port); -if (drm_WARN_ON (&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) +if (drm_WARN_ON (display->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; -if (drm_WARN_ON (&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) +if (drm_WARN_ON (display->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports;for_each_dsi_port (port, intel_dsi->ports) {@@ -2047,7 +2051,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, }if (!intel_dsi_vbt_init (intel_dsi,MIPI_DSI_GENERIC_PANEL_ID )) { -drm_dbg_kms (&dev_priv->drm,"no device found\n" ); +drm_dbg_kms (display->drm,"no device found\n" ); goto err; }drivers/gpu/drm/i915/display/icl_dsi.h +2
-2@@ -6,11 +6,11 @@#ifndef __ICL_DSI_H__#define __ICL_DSI_H__ -struct drm_i915_private ;struct intel_bios_encoder_data ;struct intel_crtc_state ; +struct intel_display ; -void icl_dsi_init (struct drm_i915_private *dev_priv, +void icl_dsi_init (struct intel_display *display,const struct intel_bios_encoder_data *devdata);void icl_dsi_frame_update (struct intel_crtc_state *crtc_state);drivers/gpu/drm/i915/display/intel_ddi.c +1
-1@@ -4885,7 +4885,7 @@ void intel_ddi_init(struct intel_display *display,if (!assert_has_icl_dsi (dev_priv))return ; -icl_dsi_init (dev_priv, devdata); +icl_dsi_init (display, devdata);return ; }Signature · 1 line
2.39.5
PATCH 11/11 drm/i915/de: remove unnecessary generic wrappers
In reply to Jani NikulaWith many of the intel_de_* callers switched over to struct intel_display, we can remove some of the unnecessary generic wrappers.
--- drivers/gpu/drm/i915/display/intel_de.h | 46 ++++++++++--------------- 1 file changed, 18 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_de.h +18 -28
@@ -32,7 +32,7 @@ __intel_de_read(struct intel_display *display, i915_reg_t reg)#define intel_de_read (p,...) __intel_de_read(__to_intel_display(p), __VA_ARGS__)static inline u8 -__intel_de_read8 (struct intel_display *display,i915_reg_t reg) +intel_de_read8 (struct intel_display *display,i915_reg_t reg) {u8 val;
@@ -44,11 +44,10 @@ __intel_de_read8(struct intel_display *display, i915_reg_t reg)return val; } -#define intel_de_read8 (p,...) __intel_de_read8(__to_intel_display(p), __VA_ARGS__)static inline u64 -__intel_de_read64_2x32 (struct intel_display *display, -i915_reg_t lower_reg,i915_reg_t upper_reg) +intel_de_read64_2x32 (struct intel_display *display, +i915_reg_t lower_reg,i915_reg_t upper_reg) {u64 val;
@@ -63,7 +62,6 @@ __intel_de_read64_2x32(struct intel_display *display,return val; } -#define intel_de_read64_2x32 (p,...) __intel_de_read64_2x32(__to_intel_display(p), __VA_ARGS__)static inline void __intel_de_posting_read (struct intel_display *display,i915_reg_t reg)
@@ -88,12 +86,11 @@ __intel_de_write(struct intel_display *display, i915_reg_t reg, u32 val)#define intel_de_write (p,...) __intel_de_write(__to_intel_display(p), __VA_ARGS__)static inline u32 -____intel_de_rmw_nowl (struct intel_display *display,i915_reg_t reg, -u32 clear,u32 set) +__intel_de_rmw_nowl (struct intel_display *display,i915_reg_t reg, +u32 clear,u32 set) {return intel_uncore_rmw (__to_uncore (display), reg, clear, set); } -#define __intel_de_rmw_nowl (p,...) ____intel_de_rmw_nowl(__to_intel_display(p), __VA_ARGS__) static inline u32 __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,
@@ -112,18 +109,17 @@ __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,#define intel_de_rmw (p,...) __intel_de_rmw(__to_intel_display(p), __VA_ARGS__)static inline int -____intel_de_wait_for_register_nowl (struct intel_display *display, -i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +__intel_de_wait_for_register_nowl (struct intel_display *display, +i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {return intel_wait_for_register (__to_uncore (display), reg, mask, value, timeout); } -#define __intel_de_wait_for_register_nowl (p,...) ____intel_de_wait_for_register_nowl(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +intel_de_wait (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {int ret;
@@ -136,11 +132,10 @@ __intel_de_wait(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait (p,...) __intel_de_wait(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait_fw (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +intel_de_wait_fw (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {int ret;
@@ -153,13 +148,12 @@ __intel_de_wait_fw(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait_fw (p,...) __intel_de_wait_fw(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait_custom (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value, -unsigned int fast_timeout_us, -unsigned int slow_timeout_ms,u32 *out_value) +intel_de_wait_custom (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value, +unsigned int fast_timeout_us, +unsigned int slow_timeout_ms,u32 *out_value) {int ret;
@@ -173,7 +167,6 @@ __intel_de_wait_custom(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait_custom (p,...) __intel_de_wait_custom(__to_intel_display(p), __VA_ARGS__) static inline int __intel_de_wait_for_set(struct intel_display *display, i915_reg_t reg,
@@ -220,19 +213,16 @@ __intel_de_write_fw(struct intel_display *display, i915_reg_t reg, u32 val)#define intel_de_write_fw (p,...) __intel_de_write_fw(__to_intel_display(p), __VA_ARGS__)static inline u32 -__intel_de_read_notrace (struct intel_display *display,i915_reg_t reg) +intel_de_read_notrace (struct intel_display *display,i915_reg_t reg) {return intel_uncore_read_notrace (__to_uncore (display), reg); } -#define intel_de_read_notrace (p,...) __intel_de_read_notrace(__to_intel_display(p), __VA_ARGS__)static inline void -__intel_de_write_notrace (struct intel_display *display,i915_reg_t reg, -u32 val) +intel_de_write_notrace (struct intel_display *display,i915_reg_t reg,u32 val) {intel_uncore_write_notrace (__to_uncore (display), reg, val); } -#define intel_de_write_notrace (p,...) __intel_de_write_notrace(__to_intel_display(p), __VA_ARGS__) static __always_inline void intel_de_write_dsb(struct intel_display *display, struct intel_dsb *dsb,
Signature · 1 line
2.39.5
Re: [PATCH 11/11] drm/i915/de: remove unnecessary generic wrappers
Quoted 4 lines · Jani Nikula
With many of the intel_de_* callers switched over to struct
intel_display, we can remove some of the unnecessary generic wrappers.Signed-off-by Jani Nikula <[email protected]>
trusting more your compiler then my tired eyes,
Quoted 143 lines
--- drivers/gpu/drm/i915/display/intel_de.h | 46 ++++++++++--------------- 1 file changed, 18 insertions(+), 28 deletions(-)drivers/gpu/drm/i915/display/intel_de.h +18
-28@@ -32,7 +32,7 @@ __intel_de_read(struct intel_display *display, i915_reg_t reg)#define intel_de_read (p,...) __intel_de_read(__to_intel_display(p), __VA_ARGS__)static inline u8 -__intel_de_read8 (struct intel_display *display,i915_reg_t reg) +intel_de_read8 (struct intel_display *display,i915_reg_t reg) {u8 val;@@ -44,11 +44,10 @@ __intel_de_read8(struct intel_display *display, i915_reg_t reg)return val; } -#define intel_de_read8 (p,...) __intel_de_read8(__to_intel_display(p), __VA_ARGS__)static inline u64 -__intel_de_read64_2x32 (struct intel_display *display, -i915_reg_t lower_reg,i915_reg_t upper_reg) +intel_de_read64_2x32 (struct intel_display *display, +i915_reg_t lower_reg,i915_reg_t upper_reg) {u64 val;@@ -63,7 +62,6 @@ __intel_de_read64_2x32(struct intel_display *display,return val; } -#define intel_de_read64_2x32 (p,...) __intel_de_read64_2x32(__to_intel_display(p), __VA_ARGS__)static inline void __intel_de_posting_read (struct intel_display *display,i915_reg_t reg)@@ -88,12 +86,11 @@ __intel_de_write(struct intel_display *display, i915_reg_t reg, u32 val)#define intel_de_write (p,...) __intel_de_write(__to_intel_display(p), __VA_ARGS__)static inline u32 -____intel_de_rmw_nowl (struct intel_display *display,i915_reg_t reg, -u32 clear,u32 set) +__intel_de_rmw_nowl (struct intel_display *display,i915_reg_t reg, +u32 clear,u32 set) {return intel_uncore_rmw (__to_uncore (display), reg, clear, set); } -#define __intel_de_rmw_nowl (p,...) ____intel_de_rmw_nowl(__to_intel_display(p), __VA_ARGS__) static inline u32 __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,@@ -112,18 +109,17 @@ __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,#define intel_de_rmw (p,...) __intel_de_rmw(__to_intel_display(p), __VA_ARGS__)static inline int -____intel_de_wait_for_register_nowl (struct intel_display *display, -i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +__intel_de_wait_for_register_nowl (struct intel_display *display, +i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {return intel_wait_for_register (__to_uncore (display), reg, mask, value, timeout); } -#define __intel_de_wait_for_register_nowl (p,...) ____intel_de_wait_for_register_nowl(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +intel_de_wait (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {int ret;@@ -136,11 +132,10 @@ __intel_de_wait(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait (p,...) __intel_de_wait(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait_fw (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +intel_de_wait_fw (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {int ret;@@ -153,13 +148,12 @@ __intel_de_wait_fw(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait_fw (p,...) __intel_de_wait_fw(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait_custom (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value, -unsigned int fast_timeout_us, -unsigned int slow_timeout_ms,u32 *out_value) +intel_de_wait_custom (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value, +unsigned int fast_timeout_us, +unsigned int slow_timeout_ms,u32 *out_value) {int ret;@@ -173,7 +167,6 @@ __intel_de_wait_custom(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait_custom (p,...) __intel_de_wait_custom(__to_intel_display(p), __VA_ARGS__) static inline int __intel_de_wait_for_set(struct intel_display *display, i915_reg_t reg,@@ -220,19 +213,16 @@ __intel_de_write_fw(struct intel_display *display, i915_reg_t reg, u32 val)#define intel_de_write_fw (p,...) __intel_de_write_fw(__to_intel_display(p), __VA_ARGS__)static inline u32 -__intel_de_read_notrace (struct intel_display *display,i915_reg_t reg) +intel_de_read_notrace (struct intel_display *display,i915_reg_t reg) {return intel_uncore_read_notrace (__to_uncore (display), reg); } -#define intel_de_read_notrace (p,...) __intel_de_read_notrace(__to_intel_display(p), __VA_ARGS__)static inline void -__intel_de_write_notrace (struct intel_display *display,i915_reg_t reg, -u32 val) +intel_de_write_notrace (struct intel_display *display,i915_reg_t reg,u32 val) {intel_uncore_write_notrace (__to_uncore (display), reg, val); } -#define intel_de_write_notrace (p,...) __intel_de_write_notrace(__to_intel_display(p), __VA_ARGS__) static __always_inline void intel_de_write_dsb(struct intel_display *display, struct intel_dsb *dsb,Signature · 1 line
2.39.5
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: bunch of struct intel_display conversions
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: bunch of struct intel_display conversions
URL : https://patchwork.freedesktop.org/series/140324/
State : warning
== Summary ==
Error: dim checkpatch failedcdfb5982a17c drm/i915/gmbus: convert to struct intel_display f5b020b2bfb3 drm/i915/cx0: convert to struct intel_display -:540: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #540: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:2767:
+ if (intel_de_wait_for_clear(display, XELPDP_PORT_M2P_MSGBUS_CTL(display, port, lane),
total: 0 errors, 1 warnings, 0 checks, 904 lines checked153dc2b10458 drm/i915/dpio: convert to struct intel_display
-:564: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #564: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:84:
}
+static inline void bxt_dpio_phy_init(struct intel_display *display, enum dpio_phy phy)
-:568: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #568: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:87:
}
+static inline void bxt_dpio_phy_uninit(struct intel_display *display, enum dpio_phy phy)
-:572: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #572: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:90:
}
+static inline bool bxt_dpio_phy_is_enabled(struct intel_display *display,
-:578: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #578: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:95:
}
+static inline bool bxt_dpio_phy_verify_state(struct intel_display *display,
total: 0 errors, 0 warnings, 4 checks, 570 lines checked f15d037d8e98 drm/i915/hdcp: further conversion to struct intel_display 8e1525a3a3db drm/i915/dp/hdcp: convert to struct intel_display 22fd06bb0d4b drm/i915/crt: convert to struct intel_display -:217: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #217: FILE: drivers/gpu/drm/i915/display/intel_crt.c:497:
+ save_adpa = adpa = intel_de_read(display, crt->adpa_reg);
-:271: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #271: FILE: drivers/gpu/drm/i915/display/intel_crt.c:557:
+ save_adpa = adpa = intel_de_read(display, crt->adpa_reg);
-:672: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#672: FILE: drivers/gpu/drm/i915/display/intel_crt.c:1149:
+ display->fdi.rx_config = intel_de_read(display,
FDI_RX_CTL(PIPE_A)) & fdi_config;
-:701: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #701: FILE: drivers/gpu/drm/i915/display/intel_crt.h:26:
}
+static inline void intel_crt_init(struct intel_display *display)
total: 0 errors, 0 warnings, 4 checks, 702 lines checked14c3ad0c24b6 drm/i915/display: convert vlv_wait_port_ready() to struct intel_display b7eba69ab26c drm/i915/power: convert assert_chv_phy_status() to struct intel_display 235efac53535 drm/i915/ips: convert to struct intel_display 07cb5a8c6df6 drm/i915/dsi: convert to struct intel_display
-:1365: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #1365: FILE: drivers/gpu/drm/i915/display/icl_dsi.c:2040:
+ if (drm_WARN_ON(display->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports))
total: 0 errors, 1 warnings, 0 checks, 1302 lines checked abb952626d5d drm/i915/de: remove unnecessary generic wrappers
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915/display: bunch of struct intel_display conversions
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: bunch of struct intel_display conversions
URL : https://patchwork.freedesktop.org/series/140324/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/display: bunch of struct intel_display conversions
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: bunch of struct intel_display conversions
URL : https://patchwork.freedesktop.org/series/140324/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_15579 -> Patchwork_140324v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/index.html
Participating hosts (45 -> 44)
------------------------------
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_140324v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live:
- bat-arlh-3: [PASS][1] -> [ABORT][2] ([i915#12061] / [i915#12133])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-arlh-3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/bat-arlh-3/igt@[email protected]
* igt@i915_selftest@live@requests:
- bat-atsm-1: [PASS][3] -> [INCOMPLETE][4] ([i915#12445])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-atsm-1/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/bat-atsm-1/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@workarounds:
- bat-arlh-3: [PASS][5] -> [ABORT][6] ([i915#12061])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-arlh-3/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/bat-arlh-3/igt@i915_selftest@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live:
- fi-bsw-nick: [DMESG-FAIL][7] ([i915#12172]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/fi-bsw-nick/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/fi-bsw-nick/igt@[email protected]
* igt@i915_selftest@live@active:
- fi-bsw-nick: [DMESG-FAIL][9] ([i915#12435]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/fi-bsw-nick/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/fi-bsw-nick/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_selftest@live:
- bat-atsm-1: [ABORT][11] ([i915#12133]) -> [INCOMPLETE][12] ([i915#12133])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-atsm-1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/bat-atsm-1/igt@[email protected]
[i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
[i915#12133]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12133
[i915#12172]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12172
[i915#12435]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12435
[i915#12445]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12445
Build changes
-------------
* Linux: CI_DRM_15579 -> Patchwork_140324v1
CI-20190529: 20190529
CI_DRM_15579: 2d11d2602dc35b03fd68309c96fedeea423beb42 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_8082: c8379ec8b26f3c21bae5473706b23da78bd26ffa @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_140324v1: 2d11d2602dc35b03fd68309c96fedeea423beb42 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140324v1/index.html
Patchwork
CI✓ CI.Patch_applied: success for drm/i915/display: bunch of struct intel_display conversions
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: bunch of struct intel_display conversions
URL : https://patchwork.freedesktop.org/series/140323/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 26b9d5af7030 drm-tip: 2024y-10m-22d-17h-04m-04s UTC integration manifest === git am output follows ===
Applying: drm/i915/gmbus: convert to struct intel_display
Applying: drm/i915/cx0: convert to struct intel_display
Applying: drm/i915/dpio: convert to struct intel_display
Applying: drm/i915/hdcp: further conversion to struct intel_display
Applying: drm/i915/dp/hdcp: convert to struct intel_display
Applying: drm/i915/crt: convert to struct intel_display
Applying: drm/i915/display: convert vlv_wait_port_ready() to struct intel_display
Applying: drm/i915/power: convert assert_chv_phy_status() to struct intel_display
Applying: drm/i915/ips: convert to struct intel_display
Applying: drm/i915/dsi: convert to struct intel_display
Applying: drm/i915/de: remove unnecessary generic wrappers
Patchwork
CI✗ CI.checkpatch: warning for drm/i915/display: bunch of struct intel_display conversions
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: bunch of struct intel_display conversions
URL : https://patchwork.freedesktop.org/series/140323/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master 30ab6715fc09baee6cc14cb3c89ad8858688d474
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 211d7d1470e43581e633c9d433c17fb65f648924
Author: Jani Nikula <[email protected]> Date: Tue Oct 22 18:57:28 2024 +0300
drm/i915/de: remove unnecessary generic wrappers
With many of the intel_de_* callers switched over to struct intel_display, we can remove some of the unnecessary generic wrappers.
+ /mt/dim checkpatch 26b9d5af7030484e831dd7335a08ec0c3a22f553 drm-intel 0c3d9eb65df4 drm/i915/gmbus: convert to struct intel_display 55c77acbdece drm/i915/cx0: convert to struct intel_display -:540: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #540: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:2767:
+ if (intel_de_wait_for_clear(display, XELPDP_PORT_M2P_MSGBUS_CTL(display, port, lane),
total: 0 errors, 1 warnings, 0 checks, 904 lines checked842c365d9be3 drm/i915/dpio: convert to struct intel_display
-:564: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #564: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:84:
}
+static inline void bxt_dpio_phy_init(struct intel_display *display, enum dpio_phy phy)
-:568: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #568: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:87:
}
+static inline void bxt_dpio_phy_uninit(struct intel_display *display, enum dpio_phy phy)
-:572: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #572: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:90:
}
+static inline bool bxt_dpio_phy_is_enabled(struct intel_display *display,
-:578: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #578: FILE: drivers/gpu/drm/i915/display/intel_dpio_phy.h:95:
}
+static inline bool bxt_dpio_phy_verify_state(struct intel_display *display,
total: 0 errors, 0 warnings, 4 checks, 570 lines checked 86c0a1d0033b drm/i915/hdcp: further conversion to struct intel_display 7083e8741d51 drm/i915/dp/hdcp: convert to struct intel_display 9ab5a12c77e4 drm/i915/crt: convert to struct intel_display -:217: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #217: FILE: drivers/gpu/drm/i915/display/intel_crt.c:497:
+ save_adpa = adpa = intel_de_read(display, crt->adpa_reg);
-:271: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #271: FILE: drivers/gpu/drm/i915/display/intel_crt.c:557:
+ save_adpa = adpa = intel_de_read(display, crt->adpa_reg);
-:672: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#672: FILE: drivers/gpu/drm/i915/display/intel_crt.c:1149:
+ display->fdi.rx_config = intel_de_read(display,
FDI_RX_CTL(PIPE_A)) & fdi_config;
-:701: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #701: FILE: drivers/gpu/drm/i915/display/intel_crt.h:26:
}
+static inline void intel_crt_init(struct intel_display *display)
total: 0 errors, 0 warnings, 4 checks, 702 lines checkeda621e4a5db86 drm/i915/display: convert vlv_wait_port_ready() to struct intel_display 3bad5a48b835 drm/i915/power: convert assert_chv_phy_status() to struct intel_display 832465aa0289 drm/i915/ips: convert to struct intel_display 96835280d818 drm/i915/dsi: convert to struct intel_display
-:1365: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #1365: FILE: drivers/gpu/drm/i915/display/icl_dsi.c:2040:
+ if (drm_WARN_ON(display->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports))
total: 0 errors, 1 warnings, 0 checks, 1302 lines checked 211d7d1470e4 drm/i915/de: remove unnecessary generic wrappers
Patchwork
CI✓ CI.KUnit: success for drm/i915/display: bunch of struct intel_display conversions
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: bunch of struct intel_display conversions
URL : https://patchwork.freedesktop.org/series/140323/
State : success
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig [17:15:05] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[17:15:09] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
156 | u64 ioread64_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
163 | u64 ioread64_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
170 | u64 ioread64be_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
178 | u64 ioread64be_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~[17:15:37] Starting KUnit Kernel (1/1)...
[17:15:37] ============================================================ Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt [17:15:37] =================== guc_dbm (7 subtests) =================== [17:15:37] [PASSED] test_empty [17:15:37] [PASSED] test_default [17:15:37] ======================== test_size ======================== [17:15:37] [PASSED] 4 [17:15:37] [PASSED] 8 [17:15:37] [PASSED] 32 [17:15:37] [PASSED] 256 [17:15:37] ==================== [PASSED] test_size ==================== [17:15:37] ======================= test_reuse ======================== [17:15:37] [PASSED] 4 [17:15:37] [PASSED] 8 [17:15:37] [PASSED] 32 [17:15:37] [PASSED] 256 [17:15:37] =================== [PASSED] test_reuse ==================== [17:15:37] =================== test_range_overlap ==================== [17:15:37] [PASSED] 4 [17:15:37] [PASSED] 8 [17:15:37] [PASSED] 32 [17:15:37] [PASSED] 256 [17:15:37] =============== [PASSED] test_range_overlap ================ [17:15:37] =================== test_range_compact ==================== [17:15:37] [PASSED] 4 [17:15:37] [PASSED] 8 [17:15:37] [PASSED] 32 [17:15:37] [PASSED] 256 [17:15:37] =============== [PASSED] test_range_compact ================ [17:15:37] ==================== test_range_spare ===================== [17:15:37] [PASSED] 4 [17:15:37] [PASSED] 8 [17:15:37] [PASSED] 32 [17:15:37] [PASSED] 256 [17:15:37] ================ [PASSED] test_range_spare ================= [17:15:37] ===================== [PASSED] guc_dbm ===================== [17:15:37] =================== guc_idm (6 subtests) =================== [17:15:37] [PASSED] bad_init [17:15:37] [PASSED] no_init [17:15:37] [PASSED] init_fini [17:15:37] [PASSED] check_used [17:15:37] [PASSED] check_quota [17:15:37] [PASSED] check_all [17:15:37] ===================== [PASSED] guc_idm ===================== [17:15:37] ================== no_relay (3 subtests) =================== [17:15:37] [PASSED] xe_drops_guc2pf_if_not_ready [17:15:37] [PASSED] xe_drops_guc2vf_if_not_ready [17:15:37] [PASSED] xe_rejects_send_if_not_ready [17:15:37] ==================== [PASSED] no_relay ===================== [17:15:37] ================== pf_relay (14 subtests) ================== [17:15:37] [PASSED] pf_rejects_guc2pf_too_short [17:15:37] [PASSED] pf_rejects_guc2pf_too_long [17:15:37] [PASSED] pf_rejects_guc2pf_no_payload [17:15:37] [PASSED] pf_fails_no_payload [17:15:37] [PASSED] pf_fails_bad_origin [17:15:37] [PASSED] pf_fails_bad_type [17:15:37] [PASSED] pf_txn_reports_error [17:15:37] [PASSED] pf_txn_sends_pf2guc [17:15:37] [PASSED] pf_sends_pf2guc [17:15:37] [SKIPPED] pf_loopback_nop [17:15:37] [SKIPPED] pf_loopback_echo [17:15:37] [SKIPPED] pf_loopback_fail [17:15:37] [SKIPPED] pf_loopback_busy [17:15:37] [SKIPPED] pf_loopback_retry [17:15:37] ==================== [PASSED] pf_relay ===================== [17:15:37] ================== vf_relay (3 subtests) =================== [17:15:37] [PASSED] vf_rejects_guc2vf_too_short [17:15:37] [PASSED] vf_rejects_guc2vf_too_long [17:15:37] [PASSED] vf_rejects_guc2vf_no_payload [17:15:37] ==================== [PASSED] vf_relay ===================== [17:15:37] ================= pf_service (11 subtests) ================= [17:15:37] [PASSED] pf_negotiate_any [17:15:37] [PASSED] pf_negotiate_base_match [17:15:37] [PASSED] pf_negotiate_base_newer [17:15:37] [PASSED] pf_negotiate_base_next [17:15:37] [SKIPPED] pf_negotiate_base_older [17:15:37] [PASSED] pf_negotiate_base_prev [17:15:37] [PASSED] pf_negotiate_latest_match [17:15:37] [PASSED] pf_negotiate_latest_newer [17:15:37] [PASSED] pf_negotiate_latest_next [17:15:37] [SKIPPED] pf_negotiate_latest_older [17:15:37] [SKIPPED] pf_negotiate_latest_prev [17:15:37] =================== [PASSED] pf_service ==================== [17:15:37] ===================== lmtt (1 subtest) ===================== [17:15:37] ======================== test_ops ========================= [17:15:37] [PASSED] 2-level [17:15:37] [PASSED] multi-level [17:15:37] ==================== [PASSED] test_ops ===================== [17:15:37] ====================== [PASSED] lmtt ======================= [17:15:37] =================== xe_mocs (2 subtests) =================== [17:15:37] ================ xe_live_mocs_kernel_kunit ================ [17:15:37] =========== [SKIPPED] xe_live_mocs_kernel_kunit ============ [17:15:37] ================ xe_live_mocs_reset_kunit ================= [17:15:37] ============ [SKIPPED] xe_live_mocs_reset_kunit ============ [17:15:37] ==================== [SKIPPED] xe_mocs ===================== [17:15:37] ================= xe_migrate (2 subtests) ================== [17:15:37] ================= xe_migrate_sanity_kunit ================= [17:15:37] ============ [SKIPPED] xe_migrate_sanity_kunit ============= [17:15:37] ================== xe_validate_ccs_kunit ================== [17:15:37] ============= [SKIPPED] xe_validate_ccs_kunit ============== [17:15:37] =================== [SKIPPED] xe_migrate =================== [17:15:37] ================== xe_dma_buf (1 subtest) ================== [17:15:37] ==================== xe_dma_buf_kunit ===================== [17:15:37] ================ [SKIPPED] xe_dma_buf_kunit ================ [17:15:37] =================== [SKIPPED] xe_dma_buf =================== [17:15:37] ==================== xe_bo (3 subtests) ==================== [17:15:37] ================== xe_ccs_migrate_kunit =================== [17:15:37] ============== [SKIPPED] xe_ccs_migrate_kunit ============== [17:15:37] ==================== xe_bo_evict_kunit ==================== [17:15:37] =============== [SKIPPED] xe_bo_evict_kunit ================ [17:15:37] =================== xe_bo_shrink_kunit ==================== [17:15:37] =============== [SKIPPED] xe_bo_shrink_kunit =============== [17:15:37] ===================== [SKIPPED] xe_bo ====================== [17:15:37] ==================== args (11 subtests) ==================== [17:15:37] [PASSED] count_args_test [17:15:37] [PASSED] call_args_example [17:15:37] [PASSED] call_args_test [17:15:37] [PASSED] drop_first_arg_example [17:15:37] [PASSED] drop_first_arg_test [17:15:37] [PASSED] first_arg_example [17:15:37] [PASSED] first_arg_test [17:15:37] [PASSED] last_arg_example [17:15:37] [PASSED] last_arg_test [17:15:37] [PASSED] pick_arg_example [17:15:37] [PASSED] sep_comma_examplestty: 'standard input': Inappropriate ioctl for device
[17:15:37] ====================== [PASSED] args ======================= [17:15:37] =================== xe_pci (2 subtests) ==================== [17:15:37] [PASSED] xe_gmdid_graphics_ip
[17:15:37] [PASSED] xe_gmdid_media_ip
[17:15:37] ===================== [PASSED] xe_pci ====================== [17:15:37] =================== xe_rtp (2 subtests) ==================== [17:15:37] =============== xe_rtp_process_to_sr_tests ================ [17:15:37] [PASSED] coalesce-same-reg
[17:15:37] [PASSED] no-match-no-add
[17:15:37] [PASSED] match-or
[17:15:37] [PASSED] match-or-xfail
[17:15:37] [PASSED] no-match-no-add-multiple-rules
[17:15:37] [PASSED] two-regs-two-entries
[17:15:37] [PASSED] clr-one-set-other
[17:15:37] [PASSED] set-field
[17:15:37] [PASSED] conflict-duplicate
[17:15:37] [PASSED] conflict-not-disjoint
[17:15:37] [PASSED] conflict-reg-type
[17:15:37] =========== [PASSED] xe_rtp_process_to_sr_tests ============ [17:15:37] ================== xe_rtp_process_tests =================== [17:15:37] [PASSED] active1
[17:15:37] [PASSED] active2
[17:15:37] [PASSED] active-inactive
[17:15:37] [PASSED] inactive-active
[17:15:37] [PASSED] inactive-1st_or_active-inactive
[17:15:37] [PASSED] inactive-2nd_or_active-inactive
[17:15:37] [PASSED] inactive-last_or_active-inactive
[17:15:37] [PASSED] inactive-no_or_active-inactive
[17:15:37] ============== [PASSED] xe_rtp_process_tests =============== [17:15:37] ===================== [PASSED] xe_rtp ====================== [17:15:37] ==================== xe_wa (1 subtest) ===================== [17:15:37] ======================== xe_wa_gt ========================= [17:15:37] [PASSED] TIGERLAKE (B0)
[17:15:37] [PASSED] DG1 (A0)
[17:15:37] [PASSED] DG1 (B0)
[17:15:37] [PASSED] ALDERLAKE_S (A0)
[17:15:37] [PASSED] ALDERLAKE_S (B0)
[17:15:37] [PASSED] ALDERLAKE_S (C0)
[17:15:37] [PASSED] ALDERLAKE_S (D0)
[17:15:37] [PASSED] ALDERLAKE_P (A0)
[17:15:37] [PASSED] ALDERLAKE_P (B0)
[17:15:37] [PASSED] ALDERLAKE_P (C0)
[17:15:37] [PASSED] ALDERLAKE_S_RPLS (D0)
[17:15:37] [PASSED] ALDERLAKE_P_RPLU (E0)
[17:15:37] [PASSED] DG2_G10 (C0)
[17:15:37] [PASSED] DG2_G11 (B1)
[17:15:37] [PASSED] DG2_G12 (A1)
[17:15:37] [PASSED] METEORLAKE (g:A0, m:A0)
[17:15:37] [PASSED] METEORLAKE (g:A0, m:A0)
[17:15:37] [PASSED] METEORLAKE (g:A0, m:A0)
[17:15:37] [PASSED] LUNARLAKE (g:A0, m:A0)
[17:15:37] [PASSED] LUNARLAKE (g:B0, m:A0)
[17:15:37] [PASSED] BATTLEMAGE (g:A0, m:A1)
[17:15:37] ==================== [PASSED] xe_wa_gt ===================== [17:15:37] ====================== [PASSED] xe_wa ====================== [17:15:37] ============================================================ [17:15:37] Testing complete. Ran 122 tests: passed: 106, skipped: 16 [17:15:37] Elapsed time: 32.563s total, 4.433s configuring, 27.864s building, 0.220s running
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/tests/.kunitconfig [17:15:37] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[17:15:39] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
156 | u64 ioread64_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
163 | u64 ioread64_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
170 | u64 ioread64be_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
178 | u64 ioread64be_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~[17:16:01] Starting KUnit Kernel (1/1)...
[17:16:01] ============================================================ Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt [17:16:01] ================== drm_buddy (7 subtests) ================== [17:16:01] [PASSED] drm_test_buddy_alloc_limit [17:16:01] [PASSED] drm_test_buddy_alloc_optimistic [17:16:01] [PASSED] drm_test_buddy_alloc_pessimistic [17:16:01] [PASSED] drm_test_buddy_alloc_pathological [17:16:01] [PASSED] drm_test_buddy_alloc_contiguous [17:16:01] [PASSED] drm_test_buddy_alloc_clear [17:16:01] [PASSED] drm_test_buddy_alloc_range_bias [17:16:01] ==================== [PASSED] drm_buddy ==================== [17:16:01] ============= drm_cmdline_parser (40 subtests) ============= [17:16:01] [PASSED] drm_test_cmdline_force_d_only [17:16:01] [PASSED] drm_test_cmdline_force_D_only_dvi [17:16:01] [PASSED] drm_test_cmdline_force_D_only_hdmi [17:16:01] [PASSED] drm_test_cmdline_force_D_only_not_digital [17:16:01] [PASSED] drm_test_cmdline_force_e_only [17:16:01] [PASSED] drm_test_cmdline_res [17:16:01] [PASSED] drm_test_cmdline_res_vesa [17:16:01] [PASSED] drm_test_cmdline_res_vesa_rblank [17:16:01] [PASSED] drm_test_cmdline_res_rblank [17:16:01] [PASSED] drm_test_cmdline_res_bpp [17:16:01] [PASSED] drm_test_cmdline_res_refresh [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh_margins [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh_force_off [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_analog [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_digital [17:16:01] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced_margins_force_on [17:16:01] [PASSED] drm_test_cmdline_res_margins_force_on [17:16:01] [PASSED] drm_test_cmdline_res_vesa_margins [17:16:01] [PASSED] drm_test_cmdline_name [17:16:01] [PASSED] drm_test_cmdline_name_bpp [17:16:01] [PASSED] drm_test_cmdline_name_option [17:16:01] [PASSED] drm_test_cmdline_name_bpp_option [17:16:01] [PASSED] drm_test_cmdline_rotate_0 [17:16:01] [PASSED] drm_test_cmdline_rotate_90 [17:16:01] [PASSED] drm_test_cmdline_rotate_180 [17:16:01] [PASSED] drm_test_cmdline_rotate_270 [17:16:01] [PASSED] drm_test_cmdline_hmirror [17:16:01] [PASSED] drm_test_cmdline_vmirror [17:16:01] [PASSED] drm_test_cmdline_margin_options [17:16:01] [PASSED] drm_test_cmdline_multiple_options [17:16:01] [PASSED] drm_test_cmdline_bpp_extra_and_option [17:16:01] [PASSED] drm_test_cmdline_extra_and_option [17:16:01] [PASSED] drm_test_cmdline_freestanding_options [17:16:01] [PASSED] drm_test_cmdline_freestanding_force_e_and_options [17:16:01] [PASSED] drm_test_cmdline_panel_orientation [17:16:01] ================ drm_test_cmdline_invalid ================= [17:16:01] [PASSED] margin_only [17:16:01] [PASSED] interlace_only [17:16:01] [PASSED] res_missing_x [17:16:01] [PASSED] res_missing_y [17:16:01] [PASSED] res_bad_y [17:16:01] [PASSED] res_missing_y_bpp [17:16:01] [PASSED] res_bad_bpp [17:16:01] [PASSED] res_bad_refresh [17:16:01] [PASSED] res_bpp_refresh_force_on_off [17:16:01] [PASSED] res_invalid_mode [17:16:01] [PASSED] res_bpp_wrong_place_mode [17:16:01] [PASSED] name_bpp_refresh [17:16:01] [PASSED] name_refresh [17:16:01] [PASSED] name_refresh_wrong_mode [17:16:01] [PASSED] name_refresh_invalid_mode [17:16:01] [PASSED] rotate_multiple [17:16:01] [PASSED] rotate_invalid_val [17:16:01] [PASSED] rotate_truncated [17:16:01] [PASSED] invalid_option [17:16:01] [PASSED] invalid_tv_option [17:16:01] [PASSED] truncated_tv_option [17:16:01] ============ [PASSED] drm_test_cmdline_invalid ============= [17:16:01] =============== drm_test_cmdline_tv_options =============== [17:16:01] [PASSED] NTSC [17:16:01] [PASSED] NTSC_443 [17:16:01] [PASSED] NTSC_J [17:16:01] [PASSED] PAL [17:16:01] [PASSED] PAL_M [17:16:01] [PASSED] PAL_N [17:16:01] [PASSED] SECAM [17:16:01] [PASSED] MONO_525 [17:16:01] [PASSED] MONO_625 [17:16:01] =========== [PASSED] drm_test_cmdline_tv_options =========== [17:16:01] =============== [PASSED] drm_cmdline_parser ================ [17:16:01] ========== drmm_connector_hdmi_init (19 subtests) ========== [17:16:01] [PASSED] drm_test_connector_hdmi_init_valid [17:16:01] [PASSED] drm_test_connector_hdmi_init_bpc_8 [17:16:01] [PASSED] drm_test_connector_hdmi_init_bpc_10 [17:16:01] [PASSED] drm_test_connector_hdmi_init_bpc_12 [17:16:01] [PASSED] drm_test_connector_hdmi_init_bpc_invalid [17:16:01] [PASSED] drm_test_connector_hdmi_init_bpc_null [17:16:01] [PASSED] drm_test_connector_hdmi_init_formats_empty [17:16:01] [PASSED] drm_test_connector_hdmi_init_formats_no_rgb [17:16:01] [PASSED] drm_test_connector_hdmi_init_null_ddc [17:16:01] [PASSED] drm_test_connector_hdmi_init_null_product [17:16:01] [PASSED] drm_test_connector_hdmi_init_null_vendor [17:16:01] [PASSED] drm_test_connector_hdmi_init_product_length_exact [17:16:01] [PASSED] drm_test_connector_hdmi_init_product_length_too_long [17:16:01] [PASSED] drm_test_connector_hdmi_init_product_valid [17:16:01] [PASSED] drm_test_connector_hdmi_init_vendor_length_exact [17:16:01] [PASSED] drm_test_connector_hdmi_init_vendor_length_too_long [17:16:01] [PASSED] drm_test_connector_hdmi_init_vendor_valid [17:16:01] ========= drm_test_connector_hdmi_init_type_valid ========= [17:16:01] [PASSED] HDMI-A [17:16:01] [PASSED] HDMI-B [17:16:01] ===== [PASSED] drm_test_connector_hdmi_init_type_valid ===== [17:16:01] ======== drm_test_connector_hdmi_init_type_invalid ======== [17:16:01] [PASSED] Unknown [17:16:01] [PASSED] VGA [17:16:01] [PASSED] DVI-I [17:16:01] [PASSED] DVI-D [17:16:01] [PASSED] DVI-A [17:16:01] [PASSED] Composite [17:16:01] [PASSED] SVIDEO [17:16:01] [PASSED] LVDS [17:16:01] [PASSED] Component [17:16:01] [PASSED] DIN [17:16:01] [PASSED] DP [17:16:01] [PASSED] TV [17:16:01] [PASSED] eDP [17:16:01] [PASSED] Virtual [17:16:01] [PASSED] DSI [17:16:01] [PASSED] DPI [17:16:01] [PASSED] Writeback [17:16:01] [PASSED] SPI [17:16:01] [PASSED] USB [17:16:01] ==== [PASSED] drm_test_connector_hdmi_init_type_invalid ==== [17:16:01] ============ [PASSED] drmm_connector_hdmi_init ============= [17:16:01] ============= drmm_connector_init (3 subtests) ============= [17:16:01] [PASSED] drm_test_drmm_connector_init [17:16:01] [PASSED] drm_test_drmm_connector_init_null_ddc [17:16:01] ========= drm_test_drmm_connector_init_type_valid ========= [17:16:01] [PASSED] Unknown [17:16:01] [PASSED] VGA [17:16:01] [PASSED] DVI-I [17:16:01] [PASSED] DVI-D [17:16:01] [PASSED] DVI-A [17:16:01] [PASSED] Composite [17:16:01] [PASSED] SVIDEO [17:16:01] [PASSED] LVDS [17:16:01] [PASSED] Component [17:16:01] [PASSED] DIN [17:16:01] [PASSED] DP [17:16:01] [PASSED] HDMI-A [17:16:01] [PASSED] HDMI-B [17:16:01] [PASSED] TV [17:16:01] [PASSED] eDP [17:16:01] [PASSED] Virtual [17:16:01] [PASSED] DSI [17:16:01] [PASSED] DPI [17:16:01] [PASSED] Writeback [17:16:01] [PASSED] SPI [17:16:01] [PASSED] USB [17:16:01] ===== [PASSED] drm_test_drmm_connector_init_type_valid ===== [17:16:01] =============== [PASSED] drmm_connector_init =============== [17:16:01] = drm_connector_attach_broadcast_rgb_property (2 subtests) = [17:16:01] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property [17:16:01] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property_hdmi_connector [17:16:01] === [PASSED] drm_connector_attach_broadcast_rgb_property === [17:16:01] ========== drm_get_tv_mode_from_name (2 subtests) ========== [17:16:01] ========== drm_test_get_tv_mode_from_name_valid =========== [17:16:01] [PASSED] NTSC [17:16:01] [PASSED] NTSC-443 [17:16:01] [PASSED] NTSC-J [17:16:01] [PASSED] PAL [17:16:01] [PASSED] PAL-M [17:16:01] [PASSED] PAL-N [17:16:01] [PASSED] SECAM [17:16:01] [PASSED] Mono [17:16:01] ====== [PASSED] drm_test_get_tv_mode_from_name_valid ======= [17:16:01] [PASSED] drm_test_get_tv_mode_from_name_truncated [17:16:01] ============ [PASSED] drm_get_tv_mode_from_name ============ [17:16:01] = drm_test_connector_hdmi_compute_mode_clock (12 subtests) = [17:16:01] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb [17:16:01] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc [17:16:01] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc_vic_1 [17:16:01] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc [17:16:01] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc_vic_1 [17:16:01] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_double [17:16:01] = drm_test_connector_hdmi_compute_mode_clock_yuv420_valid = [17:16:01] [PASSED] VIC 96 [17:16:01] [PASSED] VIC 97 [17:16:01] [PASSED] VIC 101 [17:16:01] [PASSED] VIC 102 [17:16:01] [PASSED] VIC 106 [17:16:01] [PASSED] VIC 107 [17:16:01] === [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_valid === [17:16:01] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_10_bpc [17:16:01] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_12_bpc [17:16:01] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_8_bpc [17:16:01] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_10_bpc [17:16:01] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_12_bpc [17:16:01] === [PASSED] drm_test_connector_hdmi_compute_mode_clock ==== [17:16:01] == drm_hdmi_connector_get_broadcast_rgb_name (2 subtests) == [17:16:01] === drm_test_drm_hdmi_connector_get_broadcast_rgb_name ==== [17:16:01] [PASSED] Automatic [17:16:01] [PASSED] Full [17:16:01] [PASSED] Limited 16:235 [17:16:01] === [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name === [17:16:01] [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name_invalid [17:16:01] ==== [PASSED] drm_hdmi_connector_get_broadcast_rgb_name ==== [17:16:01] == drm_hdmi_connector_get_output_format_name (2 subtests) == [17:16:01] === drm_test_drm_hdmi_connector_get_output_format_name ==== [17:16:01] [PASSED] RGB [17:16:01] [PASSED] YUV 4:2:0 [17:16:01] [PASSED] YUV 4:2:2 [17:16:01] [PASSED] YUV 4:4:4 [17:16:01] === [PASSED] drm_test_drm_hdmi_connector_get_output_format_name === [17:16:01] [PASSED] drm_test_drm_hdmi_connector_get_output_format_name_invalid [17:16:01] ==== [PASSED] drm_hdmi_connector_get_output_format_name ==== [17:16:01] ============= drm_damage_helper (21 subtests) ============== [17:16:01] [PASSED] drm_test_damage_iter_no_damage [17:16:01] [PASSED] drm_test_damage_iter_no_damage_fractional_src [17:16:01] [PASSED] drm_test_damage_iter_no_damage_src_moved [17:16:01] [PASSED] drm_test_damage_iter_no_damage_fractional_src_moved [17:16:01] [PASSED] drm_test_damage_iter_no_damage_not_visible [17:16:01] [PASSED] drm_test_damage_iter_no_damage_no_crtc [17:16:01] [PASSED] drm_test_damage_iter_no_damage_no_fb [17:16:01] [PASSED] drm_test_damage_iter_simple_damage [17:16:01] [PASSED] drm_test_damage_iter_single_damage [17:16:01] [PASSED] drm_test_damage_iter_single_damage_intersect_src [17:16:01] [PASSED] drm_test_damage_iter_single_damage_outside_src [17:16:01] [PASSED] drm_test_damage_iter_single_damage_fractional_src [17:16:01] [PASSED] drm_test_damage_iter_single_damage_intersect_fractional_src [17:16:01] [PASSED] drm_test_damage_iter_single_damage_outside_fractional_src [17:16:01] [PASSED] drm_test_damage_iter_single_damage_src_moved [17:16:01] [PASSED] drm_test_damage_iter_single_damage_fractional_src_moved [17:16:01] [PASSED] drm_test_damage_iter_damage [17:16:01] [PASSED] drm_test_damage_iter_damage_one_intersect [17:16:01] [PASSED] drm_test_damage_iter_damage_one_outside [17:16:01] [PASSED] drm_test_damage_iter_damage_src_moved [17:16:01] [PASSED] drm_test_damage_iter_damage_not_visible [17:16:01] ================ [PASSED] drm_damage_helper ================ [17:16:01] ============== drm_dp_mst_helper (3 subtests) ============== [17:16:01] ============== drm_test_dp_mst_calc_pbn_mode ============== [17:16:01] [PASSED] Clock 154000 BPP 30 DSC disabled [17:16:01] [PASSED] Clock 234000 BPP 30 DSC disabled [17:16:01] [PASSED] Clock 297000 BPP 24 DSC disabled [17:16:01] [PASSED] Clock 332880 BPP 24 DSC enabled [17:16:01] [PASSED] Clock 324540 BPP 24 DSC enabled [17:16:01] ========== [PASSED] drm_test_dp_mst_calc_pbn_mode ========== [17:16:01] ============== drm_test_dp_mst_calc_pbn_div =============== [17:16:01] [PASSED] Link rate 2000000 lane count 4 [17:16:01] [PASSED] Link rate 2000000 lane count 2 [17:16:01] [PASSED] Link rate 2000000 lane count 1 [17:16:01] [PASSED] Link rate 1350000 lane count 4 [17:16:01] [PASSED] Link rate 1350000 lane count 2 [17:16:01] [PASSED] Link rate 1350000 lane count 1 [17:16:01] [PASSED] Link rate 1000000 lane count 4 [17:16:01] [PASSED] Link rate 1000000 lane count 2 [17:16:01] [PASSED] Link rate 1000000 lane count 1 [17:16:01] [PASSED] Link rate 810000 lane count 4 [17:16:01] [PASSED] Link rate 810000 lane count 2 [17:16:01] [PASSED] Link rate 810000 lane count 1 [17:16:01] [PASSED] Link rate 540000 lane count 4 [17:16:01] [PASSED] Link rate 540000 lane count 2 [17:16:01] [PASSED] Link rate 540000 lane count 1 [17:16:01] [PASSED] Link rate 270000 lane count 4 [17:16:01] [PASSED] Link rate 270000 lane count 2 [17:16:01] [PASSED] Link rate 270000 lane count 1 [17:16:01] [PASSED] Link rate 162000 lane count 4 [17:16:01] [PASSED] Link rate 162000 lane count 2 [17:16:01] [PASSED] Link rate 162000 lane count 1 [17:16:01] ========== [PASSED] drm_test_dp_mst_calc_pbn_div =========== [17:16:01] ========= drm_test_dp_mst_sideband_msg_req_decode ========= [17:16:01] [PASSED] DP_ENUM_PATH_RESOURCES with port number [17:16:01] [PASSED] DP_POWER_UP_PHY with port number [17:16:01] [PASSED] DP_POWER_DOWN_PHY with port number [17:16:01] [PASSED] DP_ALLOCATE_PAYLOAD with SDP stream sinks [17:16:01] [PASSED] DP_ALLOCATE_PAYLOAD with port number [17:16:01] [PASSED] DP_ALLOCATE_PAYLOAD with VCPI [17:16:01] [PASSED] DP_ALLOCATE_PAYLOAD with PBN [17:16:01] [PASSED] DP_QUERY_PAYLOAD with port number [17:16:01] [PASSED] DP_QUERY_PAYLOAD with VCPI [17:16:01] [PASSED] DP_REMOTE_DPCD_READ with port number [17:16:01] [PASSED] DP_REMOTE_DPCD_READ with DPCD address [17:16:01] [PASSED] DP_REMOTE_DPCD_READ with max number of bytes [17:16:01] [PASSED] DP_REMOTE_DPCD_WRITE with port number [17:16:01] [PASSED] DP_REMOTE_DPCD_WRITE with DPCD address [17:16:01] [PASSED] DP_REMOTE_DPCD_WRITE with data array [17:16:01] [PASSED] DP_REMOTE_I2C_READ with port number [17:16:01] [PASSED] DP_REMOTE_I2C_READ with I2C device ID [17:16:01] [PASSED] DP_REMOTE_I2C_READ with transactions array [17:16:01] [PASSED] DP_REMOTE_I2C_WRITE with port number [17:16:01] [PASSED] DP_REMOTE_I2C_WRITE with I2C device ID [17:16:01] [PASSED] DP_REMOTE_I2C_WRITE with data array [17:16:01] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream ID [17:16:01] [PASSED] DP_QUERY_STREAM_ENC_STATUS with client ID [17:16:01] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream event [17:16:01] [PASSED] DP_QUERY_STREAM_ENC_STATUS with valid stream event [17:16:01] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream behavior [17:16:01] [PASSED] DP_QUERY_STREAM_ENC_STATUS with a valid stream behavior [17:16:01] ===== [PASSED] drm_test_dp_mst_sideband_msg_req_decode ===== [17:16:01] ================ [PASSED] drm_dp_mst_helper ================ [17:16:01] ================== drm_exec (7 subtests) =================== [17:16:01] [PASSED] sanitycheck [17:16:01] [PASSED] test_lock [17:16:01] [PASSED] test_lock_unlock [17:16:01] [PASSED] test_duplicates [17:16:01] [PASSED] test_prepare [17:16:01] [PASSED] test_prepare_array [17:16:01] [PASSED] test_multiple_loops [17:16:01] ==================== [PASSED] drm_exec ===================== [17:16:01] =========== drm_format_helper_test (17 subtests) =========== [17:16:01] ============== drm_test_fb_xrgb8888_to_gray8 ============== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ========== [PASSED] drm_test_fb_xrgb8888_to_gray8 ========== [17:16:01] ============= drm_test_fb_xrgb8888_to_rgb332 ============== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb332 ========== [17:16:01] ============= drm_test_fb_xrgb8888_to_rgb565 ============== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb565 ========== [17:16:01] ============ drm_test_fb_xrgb8888_to_xrgb1555 ============= [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======== [PASSED] drm_test_fb_xrgb8888_to_xrgb1555 ========= [17:16:01] ============ drm_test_fb_xrgb8888_to_argb1555 ============= [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======== [PASSED] drm_test_fb_xrgb8888_to_argb1555 ========= [17:16:01] ============ drm_test_fb_xrgb8888_to_rgba5551 ============= [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======== [PASSED] drm_test_fb_xrgb8888_to_rgba5551 ========= [17:16:01] ============= drm_test_fb_xrgb8888_to_rgb888 ============== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb888 ========== [17:16:01] ============ drm_test_fb_xrgb8888_to_argb8888 ============= [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======== [PASSED] drm_test_fb_xrgb8888_to_argb8888 ========= [17:16:01] =========== drm_test_fb_xrgb8888_to_xrgb2101010 =========== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======= [PASSED] drm_test_fb_xrgb8888_to_xrgb2101010 ======= [17:16:01] =========== drm_test_fb_xrgb8888_to_argb2101010 =========== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======= [PASSED] drm_test_fb_xrgb8888_to_argb2101010 ======= [17:16:01] ============== drm_test_fb_xrgb8888_to_mono =============== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ========== [PASSED] drm_test_fb_xrgb8888_to_mono =========== [17:16:01] ==================== drm_test_fb_swab ===================== [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ================ [PASSED] drm_test_fb_swab ================= [17:16:01] ============ drm_test_fb_xrgb8888_to_xbgr8888 ============= [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======== [PASSED] drm_test_fb_xrgb8888_to_xbgr8888 ========= [17:16:01] ============ drm_test_fb_xrgb8888_to_abgr8888 ============= [17:16:01] [PASSED] single_pixel_source_buffer [17:16:01] [PASSED] single_pixel_clip_rectangle [17:16:01] [PASSED] well_known_colors [17:16:01] [PASSED] destination_pitch [17:16:01] ======== [PASSED] drm_test_fb_xrgb8888_to_abgr8888 ========= [17:16:01] ================= drm_test_fb_clip_offset ================= [17:16:01] [PASSED] pass through [17:16:01] [PASSED] horizontal offset [17:16:01] [PASSED] vertical offset [17:16:01] [PASSED] horizontal and vertical offset [17:16:01] [PASSED] horizontal offset (custom pitch) [17:16:01] [PASSED] vertical offset (custom pitch) [17:16:01] [PASSED] horizontal and vertical offset (custom pitch) [17:16:01] ============= [PASSED] drm_test_fb_clip_offset ============= [17:16:01] ============== drm_test_fb_build_fourcc_list ============== [17:16:01] [PASSED] no native formats [17:16:01] [PASSED] XRGB8888 as native format [17:16:01] [PASSED] remove duplicates [17:16:01] [PASSED] convert alpha formats [17:16:01] [PASSED] random formats [17:16:01] ========== [PASSED] drm_test_fb_build_fourcc_list ========== [17:16:01] =================== drm_test_fb_memcpy ==================== [17:16:01] [PASSED] single_pixel_source_buffer: XR24 little-endian (0x34325258) [17:16:01] [PASSED] single_pixel_source_buffer: XRA8 little-endian (0x38415258) [17:16:01] [PASSED] single_pixel_source_buffer: YU24 little-endian (0x34325559) [17:16:01] [PASSED] single_pixel_clip_rectangle: XB24 little-endian (0x34324258) [17:16:01] [PASSED] single_pixel_clip_rectangle: XRA8 little-endian (0x38415258) [17:16:01] [PASSED] single_pixel_clip_rectangle: YU24 little-endian (0x34325559) [17:16:01] [PASSED] well_known_colors: XB24 little-endian (0x34324258) [17:16:01] [PASSED] well_known_colors: XRA8 little-endian (0x38415258) [17:16:01] [PASSED] well_known_colors: YU24 little-endian (0x34325559) [17:16:01] [PASSED] destination_pitch: XB24 little-endian (0x34324258) [17:16:01] [PASSED] destination_pitch: XRA8 little-endian (0x38415258) [17:16:01] [PASSED] destination_pitch: YU24 little-endian (0x34325559) [17:16:01] =============== [PASSED] drm_test_fb_memcpy ================ [17:16:01] ============= [PASSED] drm_format_helper_test ============== [17:16:01] ================= drm_format (18 subtests) ================= [17:16:01] [PASSED] drm_test_format_block_width_invalid [17:16:01] [PASSED] drm_test_format_block_width_one_plane [17:16:01] [PASSED] drm_test_format_block_width_two_plane [17:16:01] [PASSED] drm_test_format_block_width_three_plane [17:16:01] [PASSED] drm_test_format_block_width_tiled [17:16:01] [PASSED] drm_test_format_block_height_invalid [17:16:01] [PASSED] drm_test_format_block_height_one_plane [17:16:01] [PASSED] drm_test_format_block_height_two_plane [17:16:01] [PASSED] drm_test_format_block_height_three_plane [17:16:01] [PASSED] drm_test_format_block_height_tiled [17:16:01] [PASSED] drm_test_format_min_pitch_invalid [17:16:01] [PASSED] drm_test_format_min_pitch_one_plane_8bpp [17:16:01] [PASSED] drm_test_format_min_pitch_one_plane_16bpp [17:16:01] [PASSED] drm_test_format_min_pitch_one_plane_24bpp [17:16:01] [PASSED] drm_test_format_min_pitch_one_plane_32bpp [17:16:01] [PASSED] drm_test_format_min_pitch_two_plane [17:16:01] [PASSED] drm_test_format_min_pitch_three_plane_8bpp [17:16:01] [PASSED] drm_test_format_min_pitch_tiled [17:16:01] =================== [PASSED] drm_format ==================== [17:16:01] ============== drm_framebuffer (10 subtests) =============== [17:16:01] ========== drm_test_framebuffer_check_src_coords ========== [17:16:01] [PASSED] Success: source fits into fb [17:16:01] [PASSED] Fail: overflowing fb with x-axis coordinate [17:16:01] [PASSED] Fail: overflowing fb with y-axis coordinate [17:16:01] [PASSED] Fail: overflowing fb with source width [17:16:01] [PASSED] Fail: overflowing fb with source height [17:16:01] ====== [PASSED] drm_test_framebuffer_check_src_coords ====== [17:16:01] [PASSED] drm_test_framebuffer_cleanup [17:16:01] =============== drm_test_framebuffer_create =============== [17:16:01] [PASSED] ABGR8888 normal sizes [17:16:01] [PASSED] ABGR8888 max sizes [17:16:01] [PASSED] ABGR8888 pitch greater than min required [17:16:01] [PASSED] ABGR8888 pitch less than min required [17:16:01] [PASSED] ABGR8888 Invalid width [17:16:01] [PASSED] ABGR8888 Invalid buffer handle [17:16:01] [PASSED] No pixel format [17:16:01] [PASSED] ABGR8888 Width 0 [17:16:01] [PASSED] ABGR8888 Height 0 [17:16:01] [PASSED] ABGR8888 Out of bound height * pitch combination [17:16:01] [PASSED] ABGR8888 Large buffer offset [17:16:01] [PASSED] ABGR8888 Buffer offset for inexistent plane [17:16:01] [PASSED] ABGR8888 Invalid flag [17:16:01] [PASSED] ABGR8888 Set DRM_MODE_FB_MODIFIERS without modifiers [17:16:01] [PASSED] ABGR8888 Valid buffer modifier [17:16:01] [PASSED] ABGR8888 Invalid buffer modifier(DRM_FORMAT_MOD_SAMSUNG_64_32_TILE) [17:16:01] [PASSED] ABGR8888 Extra pitches without DRM_MODE_FB_MODIFIERS [17:16:01] [PASSED] ABGR8888 Extra pitches with DRM_MODE_FB_MODIFIERS [17:16:01] [PASSED] NV12 Normal sizes [17:16:01] [PASSED] NV12 Max sizes [17:16:01] [PASSED] NV12 Invalid pitch [17:16:01] [PASSED] NV12 Invalid modifier/missing DRM_MODE_FB_MODIFIERS flag [17:16:01] [PASSED] NV12 different modifier per-plane [17:16:01] [PASSED] NV12 with DRM_FORMAT_MOD_SAMSUNG_64_32_TILE [17:16:01] [PASSED] NV12 Valid modifiers without DRM_MODE_FB_MODIFIERS [17:16:01] [PASSED] NV12 Modifier for inexistent plane [17:16:01] [PASSED] NV12 Handle for inexistent plane [17:16:01] [PASSED] NV12 Handle for inexistent plane without DRM_MODE_FB_MODIFIERS [17:16:01] [PASSED] YVU420 DRM_MODE_FB_MODIFIERS set without modifier [17:16:01] [PASSED] YVU420 Normal sizes [17:16:01] [PASSED] YVU420 Max sizes [17:16:01] [PASSED] YVU420 Invalid pitch [17:16:01] [PASSED] YVU420 Different pitches [17:16:01] [PASSED] YVU420 Different buffer offsets/pitches [17:16:01] [PASSED] YVU420 Modifier set just for plane 0, without DRM_MODE_FB_MODIFIERS [17:16:01] [PASSED] YVU420 Modifier set just for planes 0, 1, without DRM_MODE_FB_MODIFIERS [17:16:01] [PASSED] YVU420 Modifier set just for plane 0, 1, with DRM_MODE_FB_MODIFIERS [17:16:01] [PASSED] YVU420 Valid modifier [17:16:01] [PASSED] YVU420 Different modifiers per plane [17:16:01] [PASSED] YVU420 Modifier for inexistent plane [17:16:01] [PASSED] YUV420_10BIT Invalid modifier(DRM_FORMAT_MOD_LINEAR) [17:16:01] [PASSED] X0L2 Normal sizes [17:16:01] [PASSED] X0L2 Max sizes [17:16:01] [PASSED] X0L2 Invalid pitch [17:16:01] [PASSED] X0L2 Pitch greater than minimum required [17:16:01] [PASSED] X0L2 Handle for inexistent plane [17:16:01] [PASSED] X0L2 Offset for inexistent plane, without DRM_MODE_FB_MODIFIERS set [17:16:01] [PASSED] X0L2 Modifier without DRM_MODE_FB_MODIFIERS set [17:16:01] [PASSED] X0L2 Valid modifier [17:16:01] [PASSED] X0L2 Modifier for inexistent plane [17:16:01] =========== [PASSED] drm_test_framebuffer_create =========== [17:16:01] [PASSED] drm_test_framebuffer_free [17:16:01] [PASSED] drm_test_framebuffer_init [17:16:01] [PASSED] drm_test_framebuffer_init_bad_format [17:16:01] [PASSED] drm_test_framebuffer_init_dev_mismatch [17:16:01] [PASSED] drm_test_framebuffer_lookup [17:16:01] [PASSED] drm_test_framebuffer_lookup_inexistent [17:16:01] [PASSED] drm_test_framebuffer_modifiers_not_supported [17:16:01] ================= [PASSED] drm_framebuffer ================= [17:16:01] ================ drm_gem_shmem (8 subtests) ================ [17:16:01] [PASSED] drm_gem_shmem_test_obj_create [17:16:01] [PASSED] drm_gem_shmem_test_obj_create_private [17:16:01] [PASSED] drm_gem_shmem_test_pin_pages [17:16:01] [PASSED] drm_gem_shmem_test_vmap [17:16:01] [PASSED] drm_gem_shmem_test_get_pages_sgt [17:16:01] [PASSED] drm_gem_shmem_test_get_sg_table [17:16:01] [PASSED] drm_gem_shmem_test_madvise [17:16:01] [PASSED] drm_gem_shmem_test_purge [17:16:01] ================== [PASSED] drm_gem_shmem ================== [17:16:01] === drm_atomic_helper_connector_hdmi_check (22 subtests) === [17:16:01] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode [17:16:01] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode_vic_1 [17:16:01] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode [17:16:01] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode_vic_1 [17:16:01] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode [17:16:01] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode_vic_1 [17:16:01] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_changed [17:16:01] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_not_changed [17:16:01] [PASSED] drm_test_check_hdmi_funcs_reject_rate [17:16:01] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback [17:16:01] [PASSED] drm_test_check_max_tmds_rate_format_fallback [17:16:01] [PASSED] drm_test_check_output_bpc_crtc_mode_changed [17:16:01] [PASSED] drm_test_check_output_bpc_crtc_mode_not_changed [17:16:01] [PASSED] drm_test_check_output_bpc_dvi [17:16:01] [PASSED] drm_test_check_output_bpc_format_vic_1 [17:16:01] [PASSED] drm_test_check_output_bpc_format_display_8bpc_only [17:16:01] [PASSED] drm_test_check_output_bpc_format_display_rgb_only [17:16:01] [PASSED] drm_test_check_output_bpc_format_driver_8bpc_only [17:16:01] [PASSED] drm_test_check_output_bpc_format_driver_rgb_only [17:16:01] [PASSED] drm_test_check_tmds_char_rate_rgb_8bpc [17:16:01] [PASSED] drm_test_check_tmds_char_rate_rgb_10bpc [17:16:01] [PASSED] drm_test_check_tmds_char_rate_rgb_12bpc [17:16:01] ===== [PASSED] drm_atomic_helper_connector_hdmi_check ====== [17:16:01] === drm_atomic_helper_connector_hdmi_reset (6 subtests) ==== [17:16:01] [PASSED] drm_test_check_broadcast_rgb_value [17:16:01] [PASSED] drm_test_check_bpc_8_value [17:16:01] [PASSED] drm_test_check_bpc_10_value [17:16:01] [PASSED] drm_test_check_bpc_12_value [17:16:01] [PASSED] drm_test_check_format_value [17:16:01] [PASSED] drm_test_check_tmds_char_value [17:16:01] ===== [PASSED] drm_atomic_helper_connector_hdmi_reset ====== [17:16:01] ================= drm_managed (2 subtests) ================= [17:16:01] [PASSED] drm_test_managed_release_action [17:16:01] [PASSED] drm_test_managed_run_action [17:16:01] =================== [PASSED] drm_managed =================== [17:16:01] =================== drm_mm (6 subtests) ==================== [17:16:01] [PASSED] drm_test_mm_init [17:16:01] [PASSED] drm_test_mm_debug [17:16:01] [PASSED] drm_test_mm_align32 [17:16:01] [PASSED] drm_test_mm_align64 [17:16:01] [PASSED] drm_test_mm_lowest [17:16:01] [PASSED] drm_test_mm_highest [17:16:01] ===================== [PASSED] drm_mm ====================== [17:16:01] ============= drm_modes_analog_tv (5 subtests) ============= [17:16:01] [PASSED] drm_test_modes_analog_tv_mono_576i [17:16:01] [PASSED] drm_test_modes_analog_tv_ntsc_480i [17:16:01] [PASSED] drm_test_modes_analog_tv_ntsc_480i_inlined [17:16:01] [PASSED] drm_test_modes_analog_tv_pal_576i [17:16:01] [PASSED] drm_test_modes_analog_tv_pal_576i_inlined [17:16:01] =============== [PASSED] drm_modes_analog_tv =============== stty: 'standard input': Inappropriate ioctl for device [17:16:01] ============== drm_plane_helper (2 subtests) =============== [17:16:01] =============== drm_test_check_plane_state ================ [17:16:01] [PASSED] clipping_simple [17:16:01] [PASSED] clipping_rotate_reflect [17:16:01] [PASSED] positioning_simple [17:16:01] [PASSED] upscaling [17:16:01] [PASSED] downscaling [17:16:01] [PASSED] rounding1 [17:16:01] [PASSED] rounding2 [17:16:01] [PASSED] rounding3 [17:16:01] [PASSED] rounding4 [17:16:01] =========== [PASSED] drm_test_check_plane_state ============ [17:16:01] =========== drm_test_check_invalid_plane_state ============ [17:16:01] [PASSED] positioning_invalid [17:16:01] [PASSED] upscaling_invalid [17:16:01] [PASSED] downscaling_invalid [17:16:01] ======= [PASSED] drm_test_check_invalid_plane_state ======== [17:16:01] ================ [PASSED] drm_plane_helper ================= [17:16:01] ====== drm_connector_helper_tv_get_modes (1 subtest) ======= [17:16:01] ====== drm_test_connector_helper_tv_get_modes_check ======= [17:16:01] [PASSED] None [17:16:01] [PASSED] PAL [17:16:01] [PASSED] NTSC [17:16:01] [PASSED] Both, NTSC Default [17:16:01] [PASSED] Both, PAL Default [17:16:01] [PASSED] Both, NTSC Default, with PAL on command-line [17:16:01] [PASSED] Both, PAL Default, with NTSC on command-line [17:16:01] == [PASSED] drm_test_connector_helper_tv_get_modes_check === [17:16:01] ======== [PASSED] drm_connector_helper_tv_get_modes ======== [17:16:01] ================== drm_rect (9 subtests) =================== [17:16:01] [PASSED] drm_test_rect_clip_scaled_div_by_zero [17:16:01] [PASSED] drm_test_rect_clip_scaled_not_clipped [17:16:01] [PASSED] drm_test_rect_clip_scaled_clipped [17:16:01] [PASSED] drm_test_rect_clip_scaled_signed_vs_unsigned [17:16:01] ================= drm_test_rect_intersect ================= [17:16:01] [PASSED] top-left x bottom-right: 2x2+1+1 x 2x2+0+0 [17:16:01] [PASSED] top-right x bottom-left: 2x2+0+0 x 2x2+1-1 [17:16:01] [PASSED] bottom-left x top-right: 2x2+1-1 x 2x2+0+0 [17:16:01] [PASSED] bottom-right x top-left: 2x2+0+0 x 2x2+1+1 [17:16:01] [PASSED] right x left: 2x1+0+0 x 3x1+1+0 [17:16:01] [PASSED] left x right: 3x1+1+0 x 2x1+0+0 [17:16:01] [PASSED] up x bottom: 1x2+0+0 x 1x3+0-1 [17:16:01] [PASSED] bottom x up: 1x3+0-1 x 1x2+0+0 [17:16:01] [PASSED] touching corner: 1x1+0+0 x 2x2+1+1 [17:16:01] [PASSED] touching side: 1x1+0+0 x 1x1+1+0 [17:16:01] [PASSED] equal rects: 2x2+0+0 x 2x2+0+0 [17:16:01] [PASSED] inside another: 2x2+0+0 x 1x1+1+1 [17:16:01] [PASSED] far away: 1x1+0+0 x 1x1+3+6 [17:16:01] [PASSED] points intersecting: 0x0+5+10 x 0x0+5+10 [17:16:01] [PASSED] points not intersecting: 0x0+0+0 x 0x0+5+10 [17:16:01] ============= [PASSED] drm_test_rect_intersect ============= [17:16:01] ================ drm_test_rect_calc_hscale ================ [17:16:01] [PASSED] normal use [17:16:01] [PASSED] out of max range [17:16:01] [PASSED] out of min range [17:16:01] [PASSED] zero dst [17:16:01] [PASSED] negative src [17:16:01] [PASSED] negative dst [17:16:01] ============ [PASSED] drm_test_rect_calc_hscale ============ [17:16:01] ================ drm_test_rect_calc_vscale ================ [17:16:01] [PASSED] normal use [17:16:01] [PASSED] out of max range [17:16:01] [PASSED] out of min range [17:16:01] [PASSED] zero dst [17:16:01] [PASSED] negative src [17:16:01] [PASSED] negative dst [17:16:01] ============ [PASSED] drm_test_rect_calc_vscale ============ [17:16:01] ================== drm_test_rect_rotate =================== [17:16:01] [PASSED] reflect-x [17:16:01] [PASSED] reflect-y [17:16:01] [PASSED] rotate-0 [17:16:01] [PASSED] rotate-90 [17:16:01] [PASSED] rotate-180 [17:16:01] [PASSED] rotate-270 [17:16:01] ============== [PASSED] drm_test_rect_rotate =============== [17:16:01] ================ drm_test_rect_rotate_inv ================= [17:16:01] [PASSED] reflect-x [17:16:01] [PASSED] reflect-y [17:16:01] [PASSED] rotate-0 [17:16:01] [PASSED] rotate-90 [17:16:01] [PASSED] rotate-180 [17:16:01] [PASSED] rotate-270 [17:16:01] ============ [PASSED] drm_test_rect_rotate_inv ============= [17:16:01] ==================== [PASSED] drm_rect ===================== [17:16:01] ============================================================ [17:16:01] Testing complete. Ran 526 tests: passed: 526 [17:16:02] Elapsed time: 24.181s total, 1.681s configuring, 22.280s building, 0.179s running
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/ttm/tests/.kunitconfig [17:16:02] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [17:16:03] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make all compile_commands.json ARCH=um O=.kunit --jobs=48 [17:16:11] Starting KUnit Kernel (1/1)... [17:16:11] ============================================================ Running tests with: $ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt [17:16:11] ================= ttm_device (5 subtests) ================== [17:16:11] [PASSED] ttm_device_init_basic [17:16:11] [PASSED] ttm_device_init_multiple [17:16:11] [PASSED] ttm_device_fini_basic [17:16:11] [PASSED] ttm_device_init_no_vma_man [17:16:11] ================== ttm_device_init_pools ================== [17:16:11] [PASSED] No DMA allocations, no DMA32 required [17:16:11] [PASSED] DMA allocations, DMA32 required [17:16:11] [PASSED] No DMA allocations, DMA32 required [17:16:11] [PASSED] DMA allocations, no DMA32 required [17:16:11] ============== [PASSED] ttm_device_init_pools ============== [17:16:11] =================== [PASSED] ttm_device ==================== [17:16:11] ================== ttm_pool (8 subtests) =================== [17:16:11] ================== ttm_pool_alloc_basic =================== [17:16:11] [PASSED] One page [17:16:11] [PASSED] More than one page [17:16:11] [PASSED] Above the allocation limit [17:16:11] [PASSED] One page, with coherent DMA mappings enabled [17:16:11] [PASSED] Above the allocation limit, with coherent DMA mappings enabled [17:16:11] ============== [PASSED] ttm_pool_alloc_basic =============== [17:16:11] ============== ttm_pool_alloc_basic_dma_addr ============== [17:16:11] [PASSED] One page [17:16:11] [PASSED] More than one page [17:16:11] [PASSED] Above the allocation limit [17:16:11] [PASSED] One page, with coherent DMA mappings enabled [17:16:11] [PASSED] Above the allocation limit, with coherent DMA mappings enabled [17:16:11] ========== [PASSED] ttm_pool_alloc_basic_dma_addr ========== [17:16:11] [PASSED] ttm_pool_alloc_order_caching_match [17:16:11] [PASSED] ttm_pool_alloc_caching_mismatch [17:16:11] [PASSED] ttm_pool_alloc_order_mismatch [17:16:11] [PASSED] ttm_pool_free_dma_alloc [17:16:11] [PASSED] ttm_pool_free_no_dma_alloc [17:16:11] [PASSED] ttm_pool_fini_basic [17:16:11] ==================== [PASSED] ttm_pool ===================== [17:16:11] ================ ttm_resource (8 subtests) ================= [17:16:11] ================= ttm_resource_init_basic ================= [17:16:11] [PASSED] Init resource in TTM_PL_SYSTEM [17:16:11] [PASSED] Init resource in TTM_PL_VRAM [17:16:11] [PASSED] Init resource in a private placement [17:16:11] [PASSED] Init resource in TTM_PL_SYSTEM, set placement flags [17:16:11] ============= [PASSED] ttm_resource_init_basic ============= [17:16:11] [PASSED] ttm_resource_init_pinned [17:16:11] [PASSED] ttm_resource_fini_basic [17:16:11] [PASSED] ttm_resource_manager_init_basic [17:16:11] [PASSED] ttm_resource_manager_usage_basic [17:16:11] [PASSED] ttm_resource_manager_set_used_basic [17:16:11] [PASSED] ttm_sys_man_alloc_basic [17:16:11] [PASSED] ttm_sys_man_free_basic [17:16:11] ================== [PASSED] ttm_resource =================== [17:16:11] =================== ttm_tt (15 subtests) =================== [17:16:11] ==================== ttm_tt_init_basic ==================== [17:16:11] [PASSED] Page-aligned size [17:16:11] [PASSED] Extra pages requested [17:16:11] ================ [PASSED] ttm_tt_init_basic ================ [17:16:11] [PASSED] ttm_tt_init_misaligned [17:16:11] [PASSED] ttm_tt_fini_basic [17:16:11] [PASSED] ttm_tt_fini_sg [17:16:11] [PASSED] ttm_tt_fini_shmem [17:16:11] [PASSED] ttm_tt_create_basic [17:16:11] [PASSED] ttm_tt_create_invalid_bo_type [17:16:11] [PASSED] ttm_tt_create_ttm_exists [17:16:11] [PASSED] ttm_tt_create_failed [17:16:11] [PASSED] ttm_tt_destroy_basic [17:16:11] [PASSED] ttm_tt_populate_null_ttm [17:16:11] [PASSED] ttm_tt_populate_populated_ttm [17:16:11] [PASSED] ttm_tt_unpopulate_basic [17:16:11] [PASSED] ttm_tt_unpopulate_empty_ttm [17:16:11] [PASSED] ttm_tt_swapin_basic [17:16:11] ===================== [PASSED] ttm_tt ====================== [17:16:11] =================== ttm_bo (14 subtests) =================== [17:16:11] =========== ttm_bo_reserve_optimistic_no_ticket =========== [17:16:11] [PASSED] Cannot be interrupted and sleeps [17:16:11] [PASSED] Cannot be interrupted, locks straight away [17:16:11] [PASSED] Can be interrupted, sleeps [17:16:11] ======= [PASSED] ttm_bo_reserve_optimistic_no_ticket ======= [17:16:11] [PASSED] ttm_bo_reserve_locked_no_sleep [17:16:11] [PASSED] ttm_bo_reserve_no_wait_ticket [17:16:11] [PASSED] ttm_bo_reserve_double_resv [17:16:11] [PASSED] ttm_bo_reserve_interrupted [17:16:11] [PASSED] ttm_bo_reserve_deadlock [17:16:11] [PASSED] ttm_bo_unreserve_basic [17:16:11] [PASSED] ttm_bo_unreserve_pinned [17:16:11] [PASSED] ttm_bo_unreserve_bulk [17:16:11] [PASSED] ttm_bo_put_basic [17:16:11] [PASSED] ttm_bo_put_shared_resv [17:16:11] [PASSED] ttm_bo_pin_basic [17:16:11] [PASSED] ttm_bo_pin_unpin_resource [17:16:11] [PASSED] ttm_bo_multiple_pin_one_unpin [17:16:11] ===================== [PASSED] ttm_bo ====================== [17:16:11] ============== ttm_bo_validate (22 subtests) =============== [17:16:11] ============== ttm_bo_init_reserved_sys_man =============== [17:16:11] [PASSED] Buffer object for userspace [17:16:11] [PASSED] Kernel buffer object [17:16:11] [PASSED] Shared buffer object [17:16:11] ========== [PASSED] ttm_bo_init_reserved_sys_man =========== [17:16:11] ============== ttm_bo_init_reserved_mock_man ============== [17:16:11] [PASSED] Buffer object for userspace [17:16:11] [PASSED] Kernel buffer object [17:16:11] [PASSED] Shared buffer object [17:16:11] ========== [PASSED] ttm_bo_init_reserved_mock_man ========== [17:16:11] [PASSED] ttm_bo_init_reserved_resv [17:16:11] ================== ttm_bo_validate_basic ================== [17:16:11] [PASSED] Buffer object for userspace [17:16:11] [PASSED] Kernel buffer object [17:16:11] [PASSED] Shared buffer object [17:16:11] ============== [PASSED] ttm_bo_validate_basic ============== [17:16:11] [PASSED] ttm_bo_validate_invalid_placement [17:16:11] ============= ttm_bo_validate_same_placement ============== [17:16:11] [PASSED] System manager [17:16:11] [PASSED] VRAM manager [17:16:11] ========= [PASSED] ttm_bo_validate_same_placement ========== [17:16:11] [PASSED] ttm_bo_validate_failed_alloc [17:16:11] [PASSED] ttm_bo_validate_pinned [17:16:11] [PASSED] ttm_bo_validate_busy_placement [17:16:11] ================ ttm_bo_validate_multihop ================= [17:16:11] [PASSED] Buffer object for userspace [17:16:11] [PASSED] Kernel buffer object [17:16:11] [PASSED] Shared buffer object [17:16:11] ============ [PASSED] ttm_bo_validate_multihop ============= [17:16:11] ========== ttm_bo_validate_no_placement_signaled ========== [17:16:11] [PASSED] Buffer object in system domain, no page vector [17:16:11] [PASSED] Buffer object in system domain with an existing page vector [17:16:11] ====== [PASSED] ttm_bo_validate_no_placement_signaled ====== [17:16:11] ======== ttm_bo_validate_no_placement_not_signaled ======== [17:16:11] [PASSED] Buffer object for userspace [17:16:11] [PASSED] Kernel buffer object [17:16:11] [PASSED] Shared buffer object [17:16:11] ==== [PASSED] ttm_bo_validate_no_placement_not_signaled ==== [17:16:11] [PASSED] ttm_bo_validate_move_fence_signaled [17:16:11] ========= ttm_bo_validate_move_fence_not_signaled ========= [17:16:11] [PASSED] Waits for GPU [17:16:11] [PASSED] Tries to lock straight away [17:16:11] ===== [PASSED] ttm_bo_validate_move_fence_not_signaled ===== [17:16:11] [PASSED] ttm_bo_validate_swapout [17:16:11] [PASSED] ttm_bo_validate_happy_evict [17:16:11] [PASSED] ttm_bo_validate_all_pinned_evict [17:16:11] [PASSED] ttm_bo_validate_allowed_only_evict [17:16:11] [PASSED] ttm_bo_validate_deleted_evict [17:16:11] [PASSED] ttm_bo_validate_busy_domain_evict [17:16:11] [PASSED] ttm_bo_validate_evict_gutting [17:16:11] [PASSED] ttm_bo_validate_recrusive_evict stty: 'standard input': Inappropriate ioctl for device [17:16:11] ================= [PASSED] ttm_bo_validate ================= [17:16:11] ============================================================ [17:16:11] Testing complete. Ran 102 tests: passed: 102 [17:16:12] Elapsed time: 9.919s total, 1.591s configuring, 7.661s building, 0.554s running
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
Patchwork
CI✓ CI.Build: success for drm/i915/display: bunch of struct intel_display conversions
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: bunch of struct intel_display conversions
URL : https://patchwork.freedesktop.org/series/140323/
State : success
== Summary ==
lib/modules/6.12.0-rc4-xe/kernel/sound/core/snd-hwdep.ko lib/modules/6.12.0-rc4-xe/kernel/sound/core/snd.ko lib/modules/6.12.0-rc4-xe/kernel/sound/core/snd-pcm.ko lib/modules/6.12.0-rc4-xe/kernel/sound/core/snd-compress.ko lib/modules/6.12.0-rc4-xe/kernel/sound/core/snd-timer.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soundcore.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/atom/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/atom/snd-soc-sst-atom-hifi2-platform.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/atom/sst/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/atom/sst/snd-intel-sst-core.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/common/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/intel/common/snd-soc-acpi-intel-match.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/amd/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/amd/acp/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/amd/acp/snd-soc-acpi-amd-match.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/amd/snd-acp-config.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-pci-intel-tgl.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-intel-hda-mlink.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-pci-intel-ptl.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-pci-intel-cnl.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-pci-intel-lnl.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-intel-hda-common.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-intel-hda-generic.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-intel-hda.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/intel/snd-sof-pci-intel-mtl.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/amd/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/amd/snd-sof-amd-renoir.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/amd/snd-sof-amd-acp.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/snd-sof-utils.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/snd-sof-pci.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/snd-sof.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/snd-sof-probes.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/xtensa/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/sof/xtensa/snd-sof-xtensa-dsp.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/snd-soc-core.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/snd-soc-acpi.ko lib/modules/6.12.0-rc4-xe/kernel/sound/soc/codecs/ lib/modules/6.12.0-rc4-xe/kernel/sound/soc/codecs/snd-soc-hdac-hda.ko lib/modules/6.12.0-rc4-xe/kernel/sound/hda/ lib/modules/6.12.0-rc4-xe/kernel/sound/hda/snd-intel-sdw-acpi.ko lib/modules/6.12.0-rc4-xe/kernel/sound/hda/ext/ lib/modules/6.12.0-rc4-xe/kernel/sound/hda/ext/snd-hda-ext-core.ko lib/modules/6.12.0-rc4-xe/kernel/sound/hda/snd-intel-dspcfg.ko lib/modules/6.12.0-rc4-xe/kernel/sound/hda/snd-hda-core.ko lib/modules/6.12.0-rc4-xe/kernel/arch/ lib/modules/6.12.0-rc4-xe/kernel/arch/x86/ lib/modules/6.12.0-rc4-xe/kernel/arch/x86/kernel/ lib/modules/6.12.0-rc4-xe/kernel/arch/x86/kernel/msr.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/kernel/cpuid.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/ lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/sha512-ssse3.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/crct10dif-pclmul.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/ghash-clmulni-intel.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/sha1-ssse3.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/crc32-pclmul.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/sha256-ssse3.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/aesni-intel.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/crypto/polyval-clmulni.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/events/ lib/modules/6.12.0-rc4-xe/kernel/arch/x86/events/intel/ lib/modules/6.12.0-rc4-xe/kernel/arch/x86/events/intel/intel-cstate.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/events/rapl.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/kvm/ lib/modules/6.12.0-rc4-xe/kernel/arch/x86/kvm/kvm.ko lib/modules/6.12.0-rc4-xe/kernel/arch/x86/kvm/kvm-intel.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/ lib/modules/6.12.0-rc4-xe/kernel/crypto/crypto_simd.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/cmac.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/ccm.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/cryptd.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/polyval-generic.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/async_tx/ lib/modules/6.12.0-rc4-xe/kernel/crypto/async_tx/async_xor.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/async_tx/async_tx.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/async_tx/async_memcpy.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/async_tx/async_pq.ko lib/modules/6.12.0-rc4-xe/kernel/crypto/async_tx/async_raid6_recov.ko lib/modules/6.12.0-rc4-xe/build lib/modules/6.12.0-rc4-xe/modules.alias.bin lib/modules/6.12.0-rc4-xe/modules.builtin lib/modules/6.12.0-rc4-xe/modules.softdep lib/modules/6.12.0-rc4-xe/modules.alias lib/modules/6.12.0-rc4-xe/modules.order lib/modules/6.12.0-rc4-xe/modules.symbols lib/modules/6.12.0-rc4-xe/modules.dep.bin
+ mv kernel-nodebug.tar.gz ..
+ cd ..
+ rm -rf archive
++ date +%s
+ echo -e '\e[0Ksection_end:1729618063:package_x86_64_nodebug\r\e[0K'
+ sync
[0Ksection_end:1729618063:package_x86_64_nodebug
[0K
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel