drm/i915: Keep drm_crtc->state in sync
Subsystems (2)
cover drm/i915: Keep drm_crtc->state in sync
When we implement atomic support, we'll need to keep a crtc current state in the drm_crtc->state pointer, and save the new config into a separate state object passed down the call chain. This series moves in that direction by making struct intel_crtc_config the state struct for our driver, and by getting rid of intel_crtc->new_config and passing it down the call chain.
I'm not sure if this actually goes in the right direction, so I'm sending this RFC.
Thanks,
Ander
Ander Conselvan de Oliveira (8):
drm/i915: Rename struct intel_crtc_config to intel_crtc_state drm/i915: Embedded struct drm_crtc_state in intel_crtc_state drm/i915: Pass new_config down do crtc_compute_clock drm/i915: Use local pipe_config varariable when available drm/i915: Don't access to crtc->new_config from
intel_mode_max_pixclk()
drm/i915: Remove intel_crtc->new_config pointer drm/i915: Make intel_crtc->config a pointer drm/i915: Keep drm_crtc->state in sync with intel_crtc->config
drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 7 +- drivers/gpu/drm/i915/i915_irq.c | 8 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 16 +- drivers/gpu/drm/i915/intel_ddi.c | 103 ++--- drivers/gpu/drm/i915/intel_display.c | 714 ++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp.c | 34 +- drivers/gpu/drm/i915/intel_dp_mst.c | 15 +- drivers/gpu/drm/i915/intel_drv.h | 45 +-- drivers/gpu/drm/i915/intel_dsi.c | 18 +- drivers/gpu/drm/i915/intel_dvo.c | 20 +- drivers/gpu/drm/i915/intel_fbdev.c | 10 +- drivers/gpu/drm/i915/intel_hdmi.c | 48 +-- drivers/gpu/drm/i915/intel_lvds.c | 16 +- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 16 +- drivers/gpu/drm/i915/intel_pm.c | 60 +-- drivers/gpu/drm/i915/intel_psr.c | 8 +- drivers/gpu/drm/i915/intel_sdvo.c | 28 +- drivers/gpu/drm/i915/intel_sprite.c | 2 +- drivers/gpu/drm/i915/intel_tv.c | 10 +- 22 files changed, 604 insertions(+), 590 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 1/8 drm/i915: Rename struct intel_crtc_config to intel_crtc_state
The objective is to make this structure usable with the atomic helpers, so let's start with the rename. Patch generated with coccinelle:
@@ @@
-struct intel_crtc_config
+struct intel_crtc_state
--- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/intel_crt.c | 6 +-- drivers/gpu/drm/i915/intel_ddi.c | 10 ++-- drivers/gpu/drm/i915/intel_display.c | 100 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_dp.c | 12 ++--- drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 28 +++++----- drivers/gpu/drm/i915/intel_dsi.c | 4 +- drivers/gpu/drm/i915/intel_dvo.c | 6 +-- drivers/gpu/drm/i915/intel_hdmi.c | 4 +- drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_panel.c | 8 +-- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 6 +-- drivers/gpu/drm/i915/intel_tv.c | 4 +- 15 files changed, 101 insertions(+), 101 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -458,7 +458,7 @@ struct drm_i915_error_state {struct intel_connector ;struct intel_encoder ; -struct intel_crtc_config ; +struct intel_crtc_state ;struct intel_plane_config ;struct intel_crtc ;struct intel_limit ;
@@ -497,7 +497,7 @@ struct drm_i915_display_funcs {/* Returns the active state of the crtc, and if the crtc is active, * fills out the pipe-config with the hw state. */ bool (*get_pipe_config)(struct intel_crtc *, -struct intel_crtc_config *); +struct intel_crtc_state *);void (*get_plane_config)(struct intel_crtc *,struct intel_plane_config *);int (*crtc_compute_clock)(struct intel_crtc *crtc);
drivers/gpu/drm/i915/intel_crt.c +3 -3
@@ -110,7 +110,7 @@ static unsigned int intel_crt_get_flags(struct intel_encoder *encoder) }static void intel_crt_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_device *dev = encoder->base.dev;int dotclock;
@@ -126,7 +126,7 @@ static void intel_crt_get_config(struct intel_encoder *encoder, }static void hsw_crt_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {intel_ddi_get_config (encoder, pipe_config);
@@ -303,7 +303,7 @@ intel_crt_mode_valid(struct drm_connector *connector, }static bool intel_crt_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_device *dev = encoder->base.dev;
drivers/gpu/drm/i915/intel_ddi.c +5 -5
@@ -732,7 +732,7 @@ static int skl_calc_wrpll_link(struct drm_i915_private *dev_priv,static void skl_ddi_clock_get (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;int link_clock =0 ;
@@ -776,7 +776,7 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, }static void hsw_ddi_clock_get (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;int link_clock =0 ;
@@ -832,7 +832,7 @@ static void hsw_ddi_clock_get(struct intel_encoder *encoder, }void intel_ddi_clock_get (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {hsw_ddi_clock_get (encoder, pipe_config); }
@@ -2022,7 +2022,7 @@ static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder) }void intel_ddi_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);
@@ -2119,7 +2119,7 @@ static void intel_ddi_destroy(struct drm_encoder *encoder) }static bool intel_ddi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {int type = encoder->type;int port =intel_ddi_get_encoder_port (encoder);
drivers/gpu/drm/i915/intel_display.c +50 -50
384 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +6 -6
@@ -1074,7 +1074,7 @@ intel_dp_connector_unregister(struct intel_connector *intel_connector) }static void -skl_edp_set_pll_config (struct intel_crtc_config *pipe_config,int link_bw) +skl_edp_set_pll_config (struct intel_crtc_state *pipe_config,int link_bw) {u32 ctrl1;
@@ -1101,7 +1101,7 @@ skl_edp_set_pll_config(struct intel_crtc_config *pipe_config, int link_bw) }static void -hsw_dp_set_ddi_pll_sel (struct intel_crtc_config *pipe_config,int link_bw) +hsw_dp_set_ddi_pll_sel (struct intel_crtc_state *pipe_config,int link_bw) {switch (link_bw) {case DP_LINK_BW_1_62 :
@@ -1118,7 +1118,7 @@ hsw_dp_set_ddi_pll_sel(struct intel_crtc_config *pipe_config, int link_bw)static void intel_dp_set_clock (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config,int link_bw) +struct intel_crtc_state *pipe_config,int link_bw) {struct drm_device *dev = encoder->base.dev;const struct dp_link_dpll *divisor =NULL ;
@@ -1151,7 +1151,7 @@ intel_dp_set_clock(struct intel_encoder *encoder,bool intel_dp_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2013,7 +2013,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder, }static void intel_dp_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ;
@@ -4750,7 +4750,7 @@ void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_encoder *encoder;struct intel_dp *intel_dp =NULL ; -struct intel_crtc_config *config =NULL ; +struct intel_crtc_state *config =NULL ;struct intel_crtc *intel_crtc =NULL ;struct intel_connector *intel_connector = dev_priv->drrs.connector;u32 reg, val;
drivers/gpu/drm/i915/intel_dp_mst.c +2 -2
@@ -30,7 +30,7 @@#include <drm/drm_edid.h> static bool intel_dp_mst_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -216,7 +216,7 @@ static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder, }static void intel_dp_mst_enc_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
drivers/gpu/drm/i915/intel_drv.h +14 -14
@@ -143,7 +143,7 @@ struct intel_encoder {bool connectors_active;void (*hot_plug)(struct intel_encoder *);bool (*compute_config)(struct intel_encoder *, -struct intel_crtc_config *); +struct intel_crtc_state *);void (*pre_pll_enable)(struct intel_encoder *);void (*pre_enable)(struct intel_encoder *);void (*enable)(struct intel_encoder *);
@@ -159,7 +159,7 @@ struct intel_encoder {* pre-filled the pipe config. Note that intel_encoder->base.crtc must * be set correctly before calling this function. */ void (*get_config)(struct intel_encoder *, -struct intel_crtc_config *pipe_config); +struct intel_crtc_state *pipe_config);/* * Called during system suspend after all pending requests for the * encoder are flushed (for example for DP AUX transactions) and
@@ -259,7 +259,7 @@ struct intel_plane_config {u32 base; }; -struct intel_crtc_config { +struct intel_crtc_state {/** * quirks - bitfield with hw state readout quirks *
@@ -447,8 +447,8 @@ struct intel_crtc {uint32_t cursor_base;struct intel_plane_config plane_config; -struct intel_crtc_config config; -struct intel_crtc_config *new_config; +struct intel_crtc_state config; +struct intel_crtc_state *new_config;bool new_enabled;/* reset counter value when the last flip was submitted */
@@ -832,11 +832,11 @@ void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector);void intel_ddi_fdi_disable (struct drm_crtc *crtc);void intel_ddi_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config); +struct intel_crtc_state *pipe_config);void intel_ddi_init_dp_buf_reg (struct intel_encoder *encoder);void intel_ddi_clock_get (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config); +struct intel_crtc_state *pipe_config);void intel_ddi_set_vc_payload_alloc (struct drm_crtc *crtc,bool state);/* intel_frontbuffer.c */
@@ -967,11 +967,11 @@ void intel_finish_reset(struct drm_device *dev);void hsw_enable_pc8 (struct drm_i915_private *dev_priv);void hsw_disable_pc8 (struct drm_i915_private *dev_priv);void intel_dp_get_m_n (struct intel_crtc *crtc, -struct intel_crtc_config *pipe_config); +struct intel_crtc_state *pipe_config);void intel_dp_set_m_n (struct intel_crtc *crtc);int intel_dotclock_calculate (int link_freq,const struct intel_link_m_n *m_n);void -ironlake_check_encoder_dotclock (const struct intel_crtc_config *pipe_config, +ironlake_check_encoder_dotclock (const struct intel_crtc_state *pipe_config,int dotclock);bool intel_crtc_active (struct drm_crtc *crtc);void hsw_enable_ips (struct intel_crtc *crtc);
@@ -979,7 +979,7 @@ void hsw_disable_ips(struct intel_crtc *crtc);enum intel_display_power_domain intel_display_port_power_domain (struct intel_encoder *intel_encoder);void intel_mode_from_pipe_config (struct drm_display_mode *mode, -struct intel_crtc_config *pipe_config); +struct intel_crtc_state *pipe_config);int intel_format_to_fourcc (int format);void intel_crtc_wait_for_pending_flips (struct drm_crtc *crtc);void intel_modeset_preclose (struct drm_device *dev,struct drm_file *file);
@@ -996,7 +996,7 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder);void intel_dp_check_link_status (struct intel_dp *intel_dp);int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc);bool intel_dp_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config); +struct intel_crtc_state *pipe_config);bool intel_dp_is_edp (struct drm_device *dev,enum port port);bool intel_dp_hpd_pulse (struct intel_digital_port *intel_dig_port,bool long_hpd);
@@ -1069,7 +1069,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, struct intel_connector *intel_connector);struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder);bool intel_hdmi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config); +struct intel_crtc_state *pipe_config);/* intel_lvds.c */
@@ -1104,10 +1104,10 @@ void intel_panel_fini(struct intel_panel *panel);void intel_fixed_panel_mode (const struct drm_display_mode *fixed_mode,struct drm_display_mode *adjusted_mode);void intel_pch_panel_fitting (struct intel_crtc *crtc, -struct intel_crtc_config *pipe_config, +struct intel_crtc_state *pipe_config,int fitting_mode);void intel_gmch_panel_fitting (struct intel_crtc *crtc, -struct intel_crtc_config *pipe_config, +struct intel_crtc_state *pipe_config,int fitting_mode);void intel_panel_set_backlight_acpi (struct intel_connector *connector,u32 level,u32 max);
drivers/gpu/drm/i915/intel_dsi.c +2 -2
@@ -78,7 +78,7 @@ static void intel_dsi_hot_plug(struct intel_encoder *encoder) }static bool intel_dsi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *config) +struct intel_crtc_state *config) { struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);
@@ -420,7 +420,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, }static void intel_dsi_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {u32 pclk;DRM_DEBUG_KMS ("\n" );
drivers/gpu/drm/i915/intel_dvo.c +3 -3
@@ -144,7 +144,7 @@ static bool intel_dvo_get_hw_state(struct intel_encoder *encoder, }static void intel_dvo_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);
@@ -200,7 +200,7 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode) {struct intel_dvo *intel_dvo =intel_attached_dvo (connector);struct drm_crtc *crtc; -struct intel_crtc_config *config; +struct intel_crtc_state *config;/* dvo supports only 2 dpms states. */ if (mode !=DRM_MODE_DPMS_ON )
@@ -261,7 +261,7 @@ intel_dvo_mode_valid(struct drm_connector *connector, }static bool intel_dvo_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_dvo *intel_dvo =enc_to_dvo (encoder);struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
drivers/gpu/drm/i915/intel_hdmi.c +2 -2
@@ -759,7 +759,7 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, }static void intel_hdmi_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct drm_device *dev = encoder->base.dev;
@@ -975,7 +975,7 @@ static bool hdmi_12bpc_possible(struct intel_crtc *crtc) }bool intel_hdmi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct drm_device *dev = encoder->base.dev;
drivers/gpu/drm/i915/intel_lvds.c +2 -2
@@ -93,7 +93,7 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder, }static void intel_lvds_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -277,7 +277,7 @@ intel_lvds_mode_valid(struct drm_connector *connector, }static bool intel_lvds_compute_config (struct intel_encoder *intel_encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_device *dev = intel_encoder->base.dev; struct intel_lvds_encoder *lvds_encoder =
drivers/gpu/drm/i915/intel_panel.c +4 -4
@@ -98,7 +98,7 @@ intel_find_panel_downclock(struct drm_device *dev,/* adjusted_mode has been preset to be the panel's fixed mode */ void intel_pch_panel_fitting (struct intel_crtc *intel_crtc, -struct intel_crtc_config *pipe_config, +struct intel_crtc_state *pipe_config,int fitting_mode) {struct drm_display_mode *adjusted_mode;
@@ -223,7 +223,7 @@ static inline u32 panel_fitter_scaling(u32 source, u32 target)return (FACTOR * ratio +FACTOR /2 ) /FACTOR ; } -static void i965_scale_aspect (struct intel_crtc_config *pipe_config, +static void i965_scale_aspect (struct intel_crtc_state *pipe_config,u32 *pfit_control) {struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
@@ -243,7 +243,7 @@ static void i965_scale_aspect(struct intel_crtc_config *pipe_config, *pfit_control |=PFIT_ENABLE |PFIT_SCALING_AUTO ; } -static void i9xx_scale_aspect (struct intel_crtc_config *pipe_config, +static void i9xx_scale_aspect (struct intel_crtc_state *pipe_config,u32 *pfit_control,u32 *pfit_pgm_ratios,u32 *border) {
@@ -301,7 +301,7 @@ static void i9xx_scale_aspect(struct intel_crtc_config *pipe_config, }void intel_gmch_panel_fitting (struct intel_crtc *intel_crtc, -struct intel_crtc_config *pipe_config, +struct intel_crtc_state *pipe_config,int fitting_mode) {struct drm_device *dev = intel_crtc->base.dev;
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -3174,7 +3174,7 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc, } -static uint32_t skl_pipe_pixel_rate (const struct intel_crtc_config *config) +static uint32_t skl_pipe_pixel_rate (const struct intel_crtc_state *config) {/* TODO: Take into account the scalers once we support them */ return config->adjusted_mode.crtc_clock;
drivers/gpu/drm/i915/intel_sdvo.c +3 -3
@@ -1085,7 +1085,7 @@ intel_sdvo_get_preferred_input_mode(struct intel_sdvo *intel_sdvo,return true; } -static void i9xx_adjust_sdvo_tv_clock (struct intel_crtc_config *pipe_config) +static void i9xx_adjust_sdvo_tv_clock (struct intel_crtc_state *pipe_config) {unsigned dotclock = pipe_config->port_clock;struct dpll *clock = &pipe_config->dpll;
@@ -1112,7 +1112,7 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_config *pipe_config) }static bool intel_sdvo_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_sdvo *intel_sdvo =to_sdvo (encoder);struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
@@ -1338,7 +1338,7 @@ static bool intel_sdvo_get_hw_state(struct intel_encoder *encoder, }static void intel_sdvo_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;
drivers/gpu/drm/i915/intel_tv.c +2 -2
@@ -908,14 +908,14 @@ intel_tv_mode_valid(struct drm_connector *connector,static void intel_tv_get_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) { pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; }static bool intel_tv_compute_config (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +struct intel_crtc_state *pipe_config) {struct intel_tv *intel_tv =enc_to_tv (encoder);const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 2/8 drm/i915: Embedded struct drm_crtc_state in intel_crtc_state
In reply to Ander Conselvan de OliveiraAnd get rid of the duplicate mode structures. The bulk of the patch was generated with the following semantic patch.
@@ struct intel_crtc_state *state; @@
-state->adjusted_mode
+state->base.adjusted_mode
@@ struct intel_crtc_state *state; @@
-state->requested_mode
+state->base.mode
@@ struct intel_crtc_state state; @@
-state.adjusted_mode
+state.base.adjusted_mode
@@ struct intel_crtc_state state; @@
-state.requested_mode
+state.base.mode
--- drivers/gpu/drm/i915/i915_irq.c | 8 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 10 +-- drivers/gpu/drm/i915/intel_ddi.c | 18 ++--- drivers/gpu/drm/i915/intel_display.c | 147 ++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp.c | 8 +- drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 12 +-- drivers/gpu/drm/i915/intel_dsi.c | 8 +- drivers/gpu/drm/i915/intel_dvo.c | 12 +-- drivers/gpu/drm/i915/intel_fbdev.c | 8 +- drivers/gpu/drm/i915/intel_hdmi.c | 16 ++-- drivers/gpu/drm/i915/intel_lvds.c | 8 +- drivers/gpu/drm/i915/intel_panel.c | 8 +- drivers/gpu/drm/i915/intel_pm.c | 30 +++---- drivers/gpu/drm/i915/intel_psr.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 12 +-- drivers/gpu/drm/i915/intel_sprite.c | 2 +- drivers/gpu/drm/i915/intel_tv.c | 6 +- 19 files changed, 157 insertions(+), 164 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +4 -4
@@ -567,7 +567,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)struct intel_crtc *intel_crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[pipe]);const struct drm_display_mode *mode = - &intel_crtc->config.adjusted_mode; + &intel_crtc->config.base.adjusted_mode; htotal = mode->crtc_htotal; hsync_start = mode->crtc_hsync_start;
@@ -638,7 +638,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; -const struct drm_display_mode *mode = &crtc->config.adjusted_mode; +const struct drm_display_mode *mode = &crtc->config.base.adjusted_mode;enum pipe pipe = crtc->pipe;int position, vtotal;
@@ -665,7 +665,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,struct drm_i915_private *dev_priv = dev->dev_private;struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -const struct drm_display_mode *mode = &intel_crtc->config.adjusted_mode; +const struct drm_display_mode *mode = &intel_crtc->config.base.adjusted_mode;int position;int vbl_start, vbl_end, hsync_start, htotal, vtotal;bool in_vbl = true;
@@ -823,7 +823,7 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,return drm_calc_vbltimestamp_from_scanoutpos (dev, pipe, max_error, vblank_time, flags, crtc, - &to_intel_crtc (crtc)->config.adjusted_mode); + &to_intel_crtc (crtc)->config.base.adjusted_mode); } static bool intel_hpd_irq_event(struct drm_device *dev,
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -397,7 +397,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) {struct drm_encoder *encoder = &intel_encoder->base;struct intel_crtc *crtc =to_intel_crtc (encoder->crtc); -struct drm_display_mode *mode = &crtc->config.adjusted_mode; +struct drm_display_mode *mode = &crtc->config.base.adjusted_mode;struct drm_connector *connector;struct drm_device *dev = encoder->dev;struct drm_i915_private *dev_priv = dev->dev_private;
drivers/gpu/drm/i915/intel_crt.c +5 -5
@@ -115,14 +115,14 @@ static void intel_crt_get_config(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;int dotclock; - pipe_config->adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); dotclock = pipe_config->port_clock;if (HAS_PCH_SPLIT (dev))ironlake_check_encoder_dotclock (pipe_config, dotclock); - pipe_config->adjusted_mode.crtc_clock = dotclock; + pipe_config->base.adjusted_mode.crtc_clock = dotclock; } static void hsw_crt_get_config(struct intel_encoder *encoder,
@@ -130,11 +130,11 @@ static void hsw_crt_get_config(struct intel_encoder *encoder, {intel_ddi_get_config (encoder, pipe_config); - pipe_config->adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC | + pipe_config->base.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_NVSYNC ); - pipe_config->adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); }static void hsw_crt_pre_enable (struct intel_encoder *encoder)
@@ -157,7 +157,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crt *crt =intel_encoder_to_crt (encoder);struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode;u32 adpa;if (INTEL_INFO (dev)->gen >=5 )
drivers/gpu/drm/i915/intel_ddi.c +9 -9
@@ -768,11 +768,11 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, pipe_config->port_clock = link_clock;if (pipe_config->has_dp_encoder) - pipe_config->adjusted_mode.crtc_clock = + pipe_config->base.adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->dp_m_n);else - pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void hsw_ddi_clock_get(struct intel_encoder *encoder,
@@ -820,15 +820,15 @@ static void hsw_ddi_clock_get(struct intel_encoder *encoder, pipe_config->port_clock = link_clock *2 ;if (pipe_config->has_pch_encoder) - pipe_config->adjusted_mode.crtc_clock = + pipe_config->base.adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->fdi_m_n);else if (pipe_config->has_dp_encoder) - pipe_config->adjusted_mode.crtc_clock = + pipe_config->base.adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->dp_m_n);else - pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; } void intel_ddi_clock_get(struct intel_encoder *encoder,
@@ -1256,9 +1256,9 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc)BUG (); } -if (intel_crtc->config.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) +if (intel_crtc->config.base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) temp |=TRANS_DDI_PVSYNC ; -if (intel_crtc->config.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) +if (intel_crtc->config.base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) temp |=TRANS_DDI_PHSYNC ;if (cpu_transcoder ==TRANSCODER_EDP ) {
@@ -1528,7 +1528,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder) intel_hdmi->set_infoframes (encoder, crtc->config.has_hdmi_sink, - &crtc->config.adjusted_mode); + &crtc->config.base.adjusted_mode); } }
@@ -2041,7 +2041,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->adjusted_mode.flags |= flags; + pipe_config->base.adjusted_mode.flags |= flags;switch (temp &TRANS_DDI_BPC_MASK ) {case TRANS_DDI_BPC_6 :
drivers/gpu/drm/i915/intel_display.c +74 -73
325 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +4 -4
@@ -1155,7 +1155,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->port;struct intel_crtc *intel_crtc = encoder->new_crtc;
@@ -1324,7 +1324,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder)struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->port;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode;/* * There are four kinds of DP registers:
@@ -2050,7 +2050,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, flags |=DRM_MODE_FLAG_NVSYNC ; } - pipe_config->adjusted_mode.flags |= flags; + pipe_config->base.adjusted_mode.flags |= flags;if (!HAS_PCH_SPLIT (dev) && !IS_VALLEYVIEW (dev) && tmp &DP_COLOR_RANGE_16_235 )
@@ -2073,7 +2073,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,if (HAS_PCH_SPLIT (dev_priv->dev) && port !=PORT_A )ironlake_check_encoder_dotclock (pipe_config, dotclock); - pipe_config->adjusted_mode.crtc_clock = dotclock; + pipe_config->base.adjusted_mode.crtc_clock = dotclock;if (is_edp (intel_dp) && dev_priv->vbt.edp_bpp && pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
drivers/gpu/drm/i915/intel_dp_mst.c +2 -2
@@ -38,7 +38,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;int bpp;int lane_count, slots; -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_connector *found =NULL , *intel_connector;int mst_pbn;
@@ -254,7 +254,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,default :break ; } - pipe_config->adjusted_mode.flags |= flags; + pipe_config->base.adjusted_mode.flags |= flags;intel_dp_get_m_n (crtc, pipe_config);intel_ddi_clock_get (&intel_dig_port->base, pipe_config);
drivers/gpu/drm/i915/intel_drv.h +2 -10
@@ -260,6 +260,8 @@ struct intel_plane_config { };struct intel_crtc_state { +struct drm_crtc_state base; +/** * quirks - bitfield with hw state readout quirks *
@@ -272,16 +274,6 @@ struct intel_crtc_state {#define PIPE_CONFIG_QUIRK_INHERITED_MODE (1<<1)/* mode inherited from firmware */ unsigned long quirks; -/* User requested mode, only valid as a starting point to -* compute adjusted_mode, except in the case of (S)DVO where -* it's also for the output timings of the (S)DVO chip. -* adjusted_mode will then correspond to the S(DVO) chip's -* preferred input timings. */ -struct drm_display_mode requested_mode; -/* Actual pipe timings ie. what we program into the pipe timing -* registers. adjusted_mode.crtc_clock is the pipe pixel clock. */ -struct drm_display_mode adjusted_mode; -/* Pipe source size (ie. panel fitter input size) * All planes will be positioned inside this space, * and get clipped at the edges. */
drivers/gpu/drm/i915/intel_dsi.c +4 -4
@@ -84,8 +84,8 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder, base);struct intel_connector *intel_connector = intel_dsi->attached_connector;struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; -struct drm_display_mode *adjusted_mode = &config->adjusted_mode; -struct drm_display_mode *mode = &config->requested_mode; +struct drm_display_mode *adjusted_mode = &config->base.adjusted_mode; +struct drm_display_mode *mode = &config->base.mode;DRM_DEBUG_KMS ("\n" );
@@ -435,7 +435,7 @@ static void intel_dsi_get_config(struct intel_encoder *encoder,if (!pclk)return ; - pipe_config->adjusted_mode.crtc_clock = pclk; + pipe_config->base.adjusted_mode.crtc_clock = pclk; pipe_config->port_clock = pclk; }
@@ -549,7 +549,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.adjusted_mode; + &intel_crtc->config.base.adjusted_mode;enum port port;unsigned int bpp = intel_crtc->config.pipe_bpp;u32 val, tmp;
drivers/gpu/drm/i915/intel_dvo.c +6 -6
@@ -160,9 +160,9 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->adjusted_mode.flags |= flags; + pipe_config->base.adjusted_mode.flags |= flags; - pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; }static void intel_disable_dvo (struct intel_encoder *encoder)
@@ -186,8 +186,8 @@ static void intel_enable_dvo(struct intel_encoder *encoder)u32 temp =I915_READ (dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, - &crtc->config.requested_mode, - &crtc->config.adjusted_mode); + &crtc->config.base.mode, + &crtc->config.base.adjusted_mode);I915_WRITE (dvo_reg, temp |DVO_ENABLE );I915_READ (dvo_reg);
@@ -264,7 +264,7 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) {struct intel_dvo *intel_dvo =enc_to_dvo (encoder); -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;/* If we have timings from the BIOS for the panel, put them in * to the adjusted mode. The CRTC will be set up for this mode,
@@ -295,7 +295,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);int pipe = crtc->pipe;u32 dvo_val;
drivers/gpu/drm/i915/intel_fbdev.c +4 -4
@@ -563,7 +563,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,* pipe. Note we need to use the selected fb's pitch and bpp * rather than the current pipe's, since they differ. */ - cur_size = intel_crtc->config.adjusted_mode.crtc_hdisplay; + cur_size = intel_crtc->config.base.adjusted_mode.crtc_hdisplay; cur_size = cur_size * fb->base.bits_per_pixel /8 ;if (fb->base.pitches[0 ] < cur_size) { DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n",
@@ -574,13 +574,13 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,break ; } - cur_size = intel_crtc->config.adjusted_mode.crtc_vdisplay; + cur_size = intel_crtc->config.base.adjusted_mode.crtc_vdisplay; cur_size =ALIGN (cur_size, plane_config->tiled ? (IS_GEN2 (dev) ?16 :8 ) :1 ); cur_size *= fb->base.pitches[0 ];DRM_DEBUG_KMS ("pipe %c area: %dx%d, bpp: %d, size: %d\n" ,pipe_name (intel_crtc->pipe), - intel_crtc->config.adjusted_mode.crtc_hdisplay, - intel_crtc->config.adjusted_mode.crtc_vdisplay, + intel_crtc->config.base.adjusted_mode.crtc_hdisplay, + intel_crtc->config.base.adjusted_mode.crtc_vdisplay, fb->base.bits_per_pixel, cur_size);
drivers/gpu/drm/i915/intel_hdmi.c +8 -8
@@ -700,7 +700,7 @@ static void intel_hdmi_prepare(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base); -struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode;u32 hdmi_val; hdmi_val =SDVO_ENCODING_HDMI ;
@@ -792,7 +792,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, tmp & HDMI_COLOR_RANGE_16_235) pipe_config->limited_color_range = true; - pipe_config->adjusted_mode.flags |= flags; + pipe_config->base.adjusted_mode.flags |= flags;if ((tmp &SDVO_COLOR_FORMAT_MASK ) == HDMI_COLOR_FORMAT_12bpc) dotclock = pipe_config->port_clock *2 /3 ;
@@ -802,7 +802,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,if (HAS_PCH_SPLIT (dev_priv->dev))ironlake_check_encoder_dotclock (pipe_config, dotclock); - pipe_config->adjusted_mode.crtc_clock = dotclock; + pipe_config->base.adjusted_mode.crtc_clock = dotclock; }static void intel_enable_hdmi (struct intel_encoder *encoder)
@@ -979,8 +979,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct drm_device *dev = encoder->base.dev; -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; -int clock_12bpc = pipe_config->adjusted_mode.crtc_clock *3 /2 ; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +int clock_12bpc = pipe_config->base.adjusted_mode.crtc_clock *3 /2 ;int portclock_limit =hdmi_portclock_limit (intel_hdmi, false);int desired_bpp;
@@ -1252,7 +1252,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder)struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.adjusted_mode; + &intel_crtc->config.base.adjusted_mode;intel_hdmi_prepare (encoder);
@@ -1270,7 +1270,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.adjusted_mode; + &intel_crtc->config.base.adjusted_mode;enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;u32 val;
@@ -1467,7 +1467,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.adjusted_mode; + &intel_crtc->config.base.adjusted_mode;enum dpio_channel ch =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;int data, i;
drivers/gpu/drm/i915/intel_lvds.c +4 -4
@@ -115,7 +115,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_PVSYNC ; - pipe_config->adjusted_mode.flags |= flags; + pipe_config->base.adjusted_mode.flags |= flags;/* gen2/3 store dither state in pfit control, needs to match */ if (INTEL_INFO (dev)->gen <4 ) {
@@ -129,7 +129,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,if (HAS_PCH_SPLIT (dev_priv->dev))ironlake_check_encoder_dotclock (pipe_config, dotclock); - pipe_config->adjusted_mode.crtc_clock = dotclock; + pipe_config->base.adjusted_mode.crtc_clock = dotclock; }static void intel_pre_enable_lvds (struct intel_encoder *encoder)
@@ -139,7 +139,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);const struct drm_display_mode *adjusted_mode = - &crtc->config.adjusted_mode; + &crtc->config.base.adjusted_mode;int pipe = crtc->pipe;u32 temp;
@@ -284,7 +284,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,to_lvds_encoder (&intel_encoder->base);struct intel_connector *intel_connector = &lvds_encoder->attached_connector->base; -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_crtc *intel_crtc = lvds_encoder->base.new_crtc;unsigned int lvds_bpp;
drivers/gpu/drm/i915/intel_panel.c +4 -4
@@ -104,7 +104,7 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc,struct drm_display_mode *adjusted_mode;int x, y, width, height; - adjusted_mode = &pipe_config->adjusted_mode; + adjusted_mode = &pipe_config->base.adjusted_mode; x = y = width = height =0 ;
@@ -226,7 +226,7 @@ static inline u32 panel_fitter_scaling(u32 source, u32 target)static void i965_scale_aspect (struct intel_crtc_state *pipe_config,u32 *pfit_control) { -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;u32 scaled_width = adjusted_mode->hdisplay * pipe_config->pipe_src_h; u32 scaled_height = pipe_config->pipe_src_w *
@@ -247,7 +247,7 @@ static void i9xx_scale_aspect(struct intel_crtc_state *pipe_config, u32 *pfit_control, u32 *pfit_pgm_ratios, u32 *border) { -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;u32 scaled_width = adjusted_mode->hdisplay * pipe_config->pipe_src_h; u32 scaled_height = pipe_config->pipe_src_w *
@@ -308,7 +308,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,u32 pfit_control =0 , pfit_pgm_ratios =0 , border =0 ;struct drm_display_mode *adjusted_mode; - adjusted_mode = &pipe_config->adjusted_mode; + adjusted_mode = &pipe_config->base.adjusted_mode;/* Native modes don't need fitting */ if (adjusted_mode->hdisplay == pipe_config->pipe_src_w &&
drivers/gpu/drm/i915/intel_pm.c +15 -15
@@ -574,7 +574,7 @@ void intel_update_fbc(struct drm_device *dev) intel_crtc =to_intel_crtc (crtc); fb = crtc->primary->fb; obj =intel_fb_obj (fb); - adjusted_mode = &intel_crtc->config.adjusted_mode; + adjusted_mode = &intel_crtc->config.base.adjusted_mode;if (i915.enable_fbc <0 ) {if (set_no_fbc_reason (dev_priv,FBC_CHIP_DEFAULT ))
@@ -1157,7 +1157,7 @@ static void pineview_update_wm(struct drm_crtc *unused_crtc)int pixel_size = crtc->primary->fb->bits_per_pixel /8 ;int clock; - adjusted_mode = &to_intel_crtc (crtc)->config.adjusted_mode; + adjusted_mode = &to_intel_crtc (crtc)->config.base.adjusted_mode; clock = adjusted_mode->crtc_clock;/* Display SR */
@@ -1226,7 +1226,7 @@ static bool g4x_compute_wm0(struct drm_device *dev,return false; } - adjusted_mode = &to_intel_crtc (crtc)->config.adjusted_mode; + adjusted_mode = &to_intel_crtc (crtc)->config.base.adjusted_mode; clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config.pipe_src_w;
@@ -1313,7 +1313,7 @@ static bool g4x_compute_srwm(struct drm_device *dev, } crtc =intel_get_crtc_for_plane (dev, plane); - adjusted_mode = &to_intel_crtc (crtc)->config.adjusted_mode; + adjusted_mode = &to_intel_crtc (crtc)->config.base.adjusted_mode; clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config.pipe_src_w;
@@ -1347,7 +1347,7 @@ static bool vlv_compute_drain_latency(struct drm_crtc *crtc, {struct drm_device *dev = crtc->dev;int entries; -int clock =to_intel_crtc (crtc)->config.adjusted_mode.crtc_clock; +int clock =to_intel_crtc (crtc)->config.base.adjusted_mode.crtc_clock;if (WARN (clock ==0 ,"Pixel clock is zero!\n" ))return false;
@@ -1677,7 +1677,7 @@ static void i965_update_wm(struct drm_crtc *unused_crtc)/* self-refresh has much higher latency */ static const int sr_latency_ns =12000 ;const struct drm_display_mode *adjusted_mode = - &to_intel_crtc (crtc)->config.adjusted_mode; + &to_intel_crtc (crtc)->config.base.adjusted_mode;int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (crtc)->config.pipe_src_w;
@@ -1762,7 +1762,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)if (IS_GEN2 (dev)) cpp =4 ; - adjusted_mode = &to_intel_crtc (crtc)->config.adjusted_mode; + adjusted_mode = &to_intel_crtc (crtc)->config.base.adjusted_mode; planea_wm =intel_calculate_wm (adjusted_mode->crtc_clock, wm_info, fifo_size, cpp, pessimal_latency_ns);
@@ -1784,7 +1784,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)if (IS_GEN2 (dev)) cpp =4 ; - adjusted_mode = &to_intel_crtc (crtc)->config.adjusted_mode; + adjusted_mode = &to_intel_crtc (crtc)->config.base.adjusted_mode; planeb_wm =intel_calculate_wm (adjusted_mode->crtc_clock, wm_info, fifo_size, cpp, pessimal_latency_ns);
@@ -1823,7 +1823,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)/* self-refresh has much higher latency */ static const int sr_latency_ns =6000 ;const struct drm_display_mode *adjusted_mode = - &to_intel_crtc (enabled)->config.adjusted_mode; + &to_intel_crtc (enabled)->config.base.adjusted_mode;int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (enabled)->config.pipe_src_w;
@@ -1879,7 +1879,7 @@ static void i845_update_wm(struct drm_crtc *unused_crtc)if (crtc ==NULL )return ; - adjusted_mode = &to_intel_crtc (crtc)->config.adjusted_mode; + adjusted_mode = &to_intel_crtc (crtc)->config.base.adjusted_mode; planea_wm = intel_calculate_wm(adjusted_mode->crtc_clock, &i845_wm_info, dev_priv->display.get_fifo_size(dev, 0),
@@ -1898,7 +1898,7 @@ static uint32_t ilk_pipe_pixel_rate(struct drm_device *dev,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t pixel_rate; - pixel_rate = intel_crtc->config.adjusted_mode.crtc_clock; + pixel_rate = intel_crtc->config.base.adjusted_mode.crtc_clock;/* We only use IF-ID interlacing. If we ever use PF-ID we'll need to * adjust the pixel_rate here. */
@@ -2261,7 +2261,7 @@ hsw_compute_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc) {struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct drm_display_mode *mode = &intel_crtc->config.adjusted_mode; +struct drm_display_mode *mode = &intel_crtc->config.base.adjusted_mode;u32 linetime, ips_linetime;if (!intel_crtc_active (crtc))
@@ -2521,7 +2521,7 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,return ; p->active = true; - p->pipe_htotal = intel_crtc->config.adjusted_mode.crtc_htotal; + p->pipe_htotal = intel_crtc->config.base.adjusted_mode.crtc_htotal; p->pixel_rate =ilk_pipe_pixel_rate (dev, crtc); p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel /8 ; p->cur.bytes_per_pixel =4 ;
@@ -3177,7 +3177,7 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc,static uint32_t skl_pipe_pixel_rate (const struct intel_crtc_state *config) {/* TODO: Take into account the scalers once we support them */ -return config->adjusted_mode.crtc_clock; +return config->base.adjusted_mode.crtc_clock; }/*
@@ -3265,7 +3265,7 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, p->active =intel_crtc_active (crtc);if (p->active) { - p->pipe_htotal = intel_crtc->config.adjusted_mode.crtc_htotal; + p->pipe_htotal = intel_crtc->config.base.adjusted_mode.crtc_htotal; p->pixel_rate =skl_pipe_pixel_rate (&intel_crtc->config);/*
drivers/gpu/drm/i915/intel_psr.c +1 -1
@@ -280,7 +280,7 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)return false; } -if (intel_crtc->config.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) { +if (intel_crtc->config.base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) {DRM_DEBUG_KMS ("PSR condition failed: Interlaced is Enabled\n" );return false; }
drivers/gpu/drm/i915/intel_sdvo.c +6 -6
@@ -1115,8 +1115,8 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) {struct intel_sdvo *intel_sdvo =to_sdvo (encoder); -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; -struct drm_display_mode *mode = &pipe_config->requested_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *mode = &pipe_config->base.mode;DRM_DEBUG_KMS ("forcing bpc to 8 for SDVO\n" ); pipe_config->pipe_bpp =8 *3 ;
@@ -1181,8 +1181,8 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (intel_encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &crtc->config.adjusted_mode; -struct drm_display_mode *mode = &crtc->config.requested_mode; + &crtc->config.base.adjusted_mode; +struct drm_display_mode *mode = &crtc->config.base.mode;struct intel_sdvo *intel_sdvo =to_sdvo (intel_encoder);u32 sdvox;struct intel_sdvo_in_out_map in_out;
@@ -1370,7 +1370,7 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, flags |=DRM_MODE_FLAG_NVSYNC ; } - pipe_config->adjusted_mode.flags |= flags; + pipe_config->base.adjusted_mode.flags |= flags;/* * pixel multiplier readout is tricky: Only on i915g/gm it is stored in
@@ -1392,7 +1392,7 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,if (HAS_PCH_SPLIT (dev))ironlake_check_encoder_dotclock (pipe_config, dotclock); - pipe_config->adjusted_mode.crtc_clock = dotclock; + pipe_config->base.adjusted_mode.crtc_clock = dotclock;/* Cross check the port pixel multiplier with the sdvo encoder state. */ if (intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_CLOCK_RATE_MULT,
drivers/gpu/drm/i915/intel_sprite.c +1 -1
@@ -79,7 +79,7 @@ static int usecs_to_scanlines(const struct drm_display_mode *mode, int usecs)bool intel_pipe_update_start (struct intel_crtc *crtc,uint32_t *start_vbl_count) {struct drm_device *dev = crtc->base.dev; -const struct drm_display_mode *mode = &crtc->config.adjusted_mode; +const struct drm_display_mode *mode = &crtc->config.base.adjusted_mode;enum pipe pipe = crtc->pipe;long timeout =msecs_to_jiffies_timeout (1 );int scanline, min, max, vblank_start;
drivers/gpu/drm/i915/intel_tv.c +3 -3
@@ -910,7 +910,7 @@ static void intel_tv_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { - pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; } static bool
@@ -923,12 +923,12 @@ intel_tv_compute_config(struct intel_encoder *encoder,if (!tv_mode)return false; - pipe_config->adjusted_mode.crtc_clock = tv_mode->clock; + pipe_config->base.adjusted_mode.crtc_clock = tv_mode->clock;DRM_DEBUG_KMS ("forcing bpc to 8 for TV\n" ); pipe_config->pipe_bpp =8 *3 ;/* TV has it's own notion of sync and other mode flags, so clear them. */ - pipe_config->adjusted_mode.flags =0 ; + pipe_config->base.adjusted_mode.flags =0 ;/* * FIXME: We don't check whether the input mode is actually what we want
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 3/8 drm/i915: Pass new_config down do crtc_compute_clock
In reply to Ander Conselvan de OliveiraThis reduces the number of direct users of crtc->new_config. At some point we'll be able to get rid of that pointer altogether, in favor of drm core state structs.
--- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_ddi.c | 29 ++++---- drivers/gpu/drm/i915/intel_display.c | 131 +++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_drv.h | 6 +- 4 files changed, 94 insertions(+), 75 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -500,7 +500,8 @@ struct drm_i915_display_funcs { struct intel_crtc_state *);void (*get_plane_config)(struct intel_crtc *,struct intel_plane_config *); -int (*crtc_compute_clock)(struct intel_crtc *crtc); +int (*crtc_compute_clock)(struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state);void (*crtc_enable)(struct drm_crtc *crtc);void (*crtc_disable)(struct drm_crtc *crtc);void (*off)(struct drm_crtc *crtc);
drivers/gpu/drm/i915/intel_ddi.c +17 -12
@@ -904,6 +904,7 @@ hsw_ddi_calculate_wrpll(int clock /* in Hz */,static bool hsw_ddi_pll_select (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,struct intel_encoder *intel_encoder,int clock) {
@@ -918,16 +919,16 @@ hsw_ddi_pll_select(struct intel_crtc *intel_crtc,WRPLL_DIVIDER_REFERENCE (r2) |WRPLL_DIVIDER_FEEDBACK (n2) |WRPLL_DIVIDER_POST (p); - intel_crtc->new_config->dpll_hw_state.wrpll = val; + crtc_state->dpll_hw_state.wrpll = val; - pll =intel_get_shared_dpll (intel_crtc); + pll =intel_get_shared_dpll (intel_crtc, crtc_state);if (pll ==NULL ) {DRM_DEBUG_DRIVER ("failed to find PLL for pipe %c\n" ,pipe_name (intel_crtc->pipe));return false; } - intel_crtc->new_config->ddi_pll_sel =PORT_CLK_SEL_WRPLL (pll->id); + crtc_state->ddi_pll_sel =PORT_CLK_SEL_WRPLL (pll->id); }return true;
@@ -1090,6 +1091,7 @@ found:static bool skl_ddi_pll_select (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,struct intel_encoder *intel_encoder,int clock) {
@@ -1139,11 +1141,11 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc, }else /* eDP */ return true; - intel_crtc->new_config->dpll_hw_state.ctrl1 = ctrl1; - intel_crtc->new_config->dpll_hw_state.cfgcr1 = cfgcr1; - intel_crtc->new_config->dpll_hw_state.cfgcr2 = cfgcr2; + crtc_state->dpll_hw_state.ctrl1 = ctrl1; + crtc_state->dpll_hw_state.cfgcr1 = cfgcr1; + crtc_state->dpll_hw_state.cfgcr2 = cfgcr2; - pll =intel_get_shared_dpll (intel_crtc); + pll =intel_get_shared_dpll (intel_crtc, crtc_state);if (pll ==NULL ) {DRM_DEBUG_DRIVER ("failed to find PLL for pipe %c\n" ,pipe_name (intel_crtc->pipe));
@@ -1151,7 +1153,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc, }/* shared DPLL id 0 is DPLL 1 */ - intel_crtc->new_config->ddi_pll_sel = pll->id +1 ; + crtc_state->ddi_pll_sel = pll->id +1 ;return true; }
@@ -1163,17 +1165,20 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,* For private DPLLs, compute_config() should do the selection for us. This * function should be folded into compute_config() eventually. */ -bool intel_ddi_pll_select (struct intel_crtc *intel_crtc) +bool intel_ddi_pll_select (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state) {struct drm_device *dev = intel_crtc->base.dev;struct intel_encoder *intel_encoder =intel_ddi_get_crtc_new_encoder (intel_crtc); -int clock = intel_crtc->new_config->port_clock; +int clock = crtc_state->port_clock;if (IS_SKYLAKE (dev)) -return skl_ddi_pll_select (intel_crtc, intel_encoder, clock); +return skl_ddi_pll_select (intel_crtc, crtc_state, + intel_encoder, clock);else -return hsw_ddi_pll_select (intel_crtc, intel_encoder, clock); +return hsw_ddi_pll_select (intel_crtc, crtc_state, + intel_encoder, clock); }void intel_ddi_set_pipe_settings (struct drm_crtc *crtc)
drivers/gpu/drm/i915/intel_display.c +71 -60
347 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +4 -2
@@ -818,7 +818,8 @@ void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder);void intel_ddi_enable_pipe_clock (struct intel_crtc *intel_crtc);void intel_ddi_disable_pipe_clock (struct intel_crtc *intel_crtc); -bool intel_ddi_pll_select (struct intel_crtc *crtc); +bool intel_ddi_pll_select (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state);void intel_ddi_set_pipe_settings (struct drm_crtc *crtc);void intel_ddi_prepare_link_retrain (struct drm_encoder *encoder);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector);
@@ -929,7 +930,8 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv, bool state);#define assert_shared_dpll_enabled (d, p) assert_shared_dpll(d, p, true)#define assert_shared_dpll_disabled (d, p) assert_shared_dpll(d, p, false) -struct intel_shared_dpll *intel_get_shared_dpll (struct intel_crtc *crtc); +struct intel_shared_dpll *intel_get_shared_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *state);void intel_put_shared_dpll (struct intel_crtc *crtc); void vlv_force_pll_on(struct drm_device *dev, enum pipe pipe,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC][PATCH 3/8] drm/i915: Pass new_config down do crtc_compute_clock
Quoted 3 lines · Ander Conselvan de Oliveira
This reduces the number of direct users of
crtc->new_config. At some point we'll be able to get rid of that pointer altogether, in favor of drm core state structs.
Just an aside: If we want to use drm_obj->state instead of new_config then we deviate a bit from the helpers: The helpers only apply the new state to state pointers in ->commit, we have our ->new_config pointer already set in the compute/check config phase. Essentially it's not the same thing.
Now with the drm core you can just look up any state object you need, but that'll lead to a bit more cumbersome code maybe. Otoh if we keep using ->new_config we need those in our ->atomic_check and then reapply in ->atomic_commit.
I'm ok with either approach really, so will leave it to you. -Daniel
Quoted 516 lines
--- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_ddi.c | 29 ++++---- drivers/gpu/drm/i915/intel_display.c | 131 +++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_drv.h | 6 +- 4 files changed, 94 insertions(+), 75 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -500,7 +500,8 @@ struct drm_i915_display_funcs { struct intel_crtc_state *);void (*get_plane_config)(struct intel_crtc *,struct intel_plane_config *); -int (*crtc_compute_clock)(struct intel_crtc *crtc); +int (*crtc_compute_clock)(struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state);void (*crtc_enable)(struct drm_crtc *crtc);void (*crtc_disable)(struct drm_crtc *crtc);void (*off)(struct drm_crtc *crtc);drivers/gpu/drm/i915/intel_ddi.c +17
-12@@ -904,6 +904,7 @@ hsw_ddi_calculate_wrpll(int clock /* in Hz */,static bool hsw_ddi_pll_select (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,struct intel_encoder *intel_encoder,int clock) {@@ -918,16 +919,16 @@ hsw_ddi_pll_select(struct intel_crtc *intel_crtc,WRPLL_DIVIDER_REFERENCE (r2) |WRPLL_DIVIDER_FEEDBACK (n2) |WRPLL_DIVIDER_POST (p); - intel_crtc->new_config->dpll_hw_state.wrpll = val; + crtc_state->dpll_hw_state.wrpll = val; - pll =intel_get_shared_dpll (intel_crtc); + pll =intel_get_shared_dpll (intel_crtc, crtc_state);if (pll ==NULL ) {DRM_DEBUG_DRIVER ("failed to find PLL for pipe %c\n" ,pipe_name (intel_crtc->pipe));return false; } - intel_crtc->new_config->ddi_pll_sel =PORT_CLK_SEL_WRPLL (pll->id); + crtc_state->ddi_pll_sel =PORT_CLK_SEL_WRPLL (pll->id); }return true;@@ -1090,6 +1091,7 @@ found:static bool skl_ddi_pll_select (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,struct intel_encoder *intel_encoder,int clock) {@@ -1139,11 +1141,11 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc, }else /* eDP */ return true; - intel_crtc->new_config->dpll_hw_state.ctrl1 = ctrl1; - intel_crtc->new_config->dpll_hw_state.cfgcr1 = cfgcr1; - intel_crtc->new_config->dpll_hw_state.cfgcr2 = cfgcr2; + crtc_state->dpll_hw_state.ctrl1 = ctrl1; + crtc_state->dpll_hw_state.cfgcr1 = cfgcr1; + crtc_state->dpll_hw_state.cfgcr2 = cfgcr2; - pll =intel_get_shared_dpll (intel_crtc); + pll =intel_get_shared_dpll (intel_crtc, crtc_state);if (pll ==NULL ) {DRM_DEBUG_DRIVER ("failed to find PLL for pipe %c\n" ,pipe_name (intel_crtc->pipe));@@ -1151,7 +1153,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc, }/* shared DPLL id 0 is DPLL 1 */ - intel_crtc->new_config->ddi_pll_sel = pll->id +1 ; + crtc_state->ddi_pll_sel = pll->id +1 ;return true; }@@ -1163,17 +1165,20 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,* For private DPLLs, compute_config() should do the selection for us. This * function should be folded into compute_config() eventually. */ -bool intel_ddi_pll_select (struct intel_crtc *intel_crtc) +bool intel_ddi_pll_select (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state) {struct drm_device *dev = intel_crtc->base.dev;struct intel_encoder *intel_encoder =intel_ddi_get_crtc_new_encoder (intel_crtc); -int clock = intel_crtc->new_config->port_clock; +int clock = crtc_state->port_clock;if (IS_SKYLAKE (dev)) -return skl_ddi_pll_select (intel_crtc, intel_encoder, clock); +return skl_ddi_pll_select (intel_crtc, crtc_state, + intel_encoder, clock);else -return hsw_ddi_pll_select (intel_crtc, intel_encoder, clock); +return hsw_ddi_pll_select (intel_crtc, crtc_state, + intel_encoder, clock); }void intel_ddi_set_pipe_settings (struct drm_crtc *crtc)drivers/gpu/drm/i915/intel_display.c +71
-60@@ -3858,7 +3858,8 @@ void intel_put_shared_dpll(struct intel_crtc *crtc) crtc->config.shared_dpll =DPLL_ID_PRIVATE ; } -struct intel_shared_dpll *intel_get_shared_dpll (struct intel_crtc *crtc) +struct intel_shared_dpll *intel_get_shared_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;struct intel_shared_dpll *pll;@@ -3884,7 +3885,7 @@ struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc)if (pll->new_config->crtc_mask ==0 )continue ; -if (memcmp (&crtc->new_config->dpll_hw_state, +if (memcmp (&crtc_state->dpll_hw_state, &pll->new_config->hw_state,sizeof (pll->new_config->hw_state)) ==0 ) { DRM_DEBUG_KMS("CRTC:%d sharing existing %s (crtc mask 0x%08x, ative %d)\n",@@ -3909,9 +3910,9 @@ struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc) found:if (pll->new_config->crtc_mask ==0 ) - pll->new_config->hw_state = crtc->new_config->dpll_hw_state; + pll->new_config->hw_state = crtc_state->dpll_hw_state; - crtc->new_config->shared_dpll = i; + crtc_state->shared_dpll = i;DRM_DEBUG_DRIVER ("using %s for pipe %c\n" , pll->name,pipe_name (crtc->pipe));@@ -5726,30 +5727,31 @@ static uint32_t i9xx_dpll_compute_fp(struct dpll *dpll) }static void i9xx_update_pll_dividers (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state,intel_clock_t *reduced_clock) {struct drm_device *dev = crtc->base.dev;u32 fp, fp2 =0 ;if (IS_PINEVIEW (dev)) { - fp =pnv_dpll_compute_fp (&crtc->new_config->dpll); + fp =pnv_dpll_compute_fp (&crtc_state->dpll);if (reduced_clock) fp2 =pnv_dpll_compute_fp (reduced_clock); }else { - fp =i9xx_dpll_compute_fp (&crtc->new_config->dpll); + fp =i9xx_dpll_compute_fp (&crtc_state->dpll);if (reduced_clock) fp2 =i9xx_dpll_compute_fp (reduced_clock); } - crtc->new_config->dpll_hw_state.fp0 = fp; + crtc_state->dpll_hw_state.fp0 = fp; crtc->lowfreq_avail = false;if (intel_pipe_will_have_type (crtc,INTEL_OUTPUT_LVDS ) && reduced_clock && i915.powersave) { - crtc->new_config->dpll_hw_state.fp1 = fp2; + crtc_state->dpll_hw_state.fp1 = fp2; crtc->lowfreq_avail = true; }else { - crtc->new_config->dpll_hw_state.fp1 = fp; + crtc_state->dpll_hw_state.fp1 = fp; } }@@ -6084,6 +6086,7 @@ void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe) }static void i9xx_update_pll (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state,intel_clock_t *reduced_clock,int num_connectors) {@@ -6091,9 +6094,9 @@ static void i9xx_update_pll(struct intel_crtc *crtc,struct drm_i915_private *dev_priv = dev->dev_private;u32 dpll;bool is_sdvo; -struct dpll *clock = &crtc->new_config->dpll; +struct dpll *clock = &crtc_state->dpll; -i9xx_update_pll_dividers (crtc, reduced_clock); +i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock); is_sdvo =intel_pipe_will_have_type (crtc,INTEL_OUTPUT_SDVO ) ||intel_pipe_will_have_type (crtc,INTEL_OUTPUT_HDMI );@@ -6106,14 +6109,14 @@ static void i9xx_update_pll(struct intel_crtc *crtc, dpll |=DPLLB_MODE_DAC_SERIAL ;if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) { - dpll |= (crtc->new_config->pixel_multiplier -1 ) + dpll |= (crtc_state->pixel_multiplier -1 ) <<SDVO_MULTIPLIER_SHIFT_HIRES ; }if (is_sdvo) dpll |=DPLL_SDVO_HIGH_SPEED ; -if (crtc->new_config->has_dp_encoder) +if (crtc_state->has_dp_encoder) dpll |=DPLL_SDVO_HIGH_SPEED ;/* compute bitmask from p1 value */ @@ -6141,7 +6144,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,if (INTEL_INFO (dev)->gen >=4 ) dpll |= (6 <<PLL_LOAD_PULSE_PHASE_SHIFT ); -if (crtc->new_config->sdvo_tv_clock) +if (crtc_state->sdvo_tv_clock) dpll |=PLL_REF_INPUT_TVCLKINBC ;else if (intel_pipe_will_have_type (crtc,INTEL_OUTPUT_LVDS ) &&intel_panel_use_ssc (dev_priv) && num_connectors <2 )@@ -6150,25 +6153,26 @@ static void i9xx_update_pll(struct intel_crtc *crtc, dpll |=PLL_REF_INPUT_DREFCLK ; dpll |=DPLL_VCO_ENABLE ; - crtc->new_config->dpll_hw_state.dpll = dpll; + crtc_state->dpll_hw_state.dpll = dpll;if (INTEL_INFO (dev)->gen >=4 ) { -u32 dpll_md = (crtc->new_config->pixel_multiplier -1 ) +u32 dpll_md = (crtc_state->pixel_multiplier -1 ) <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; - crtc->new_config->dpll_hw_state.dpll_md = dpll_md; + crtc_state->dpll_hw_state.dpll_md = dpll_md; } }static void i8xx_update_pll (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state,intel_clock_t *reduced_clock,int num_connectors) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 dpll; -struct dpll *clock = &crtc->new_config->dpll; +struct dpll *clock = &crtc_state->dpll; -i9xx_update_pll_dividers (crtc, reduced_clock); +i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock); dpll =DPLL_VGA_MODE_DIS ;@@ -6193,7 +6197,7 @@ static void i8xx_update_pll(struct intel_crtc *crtc, dpll |=PLL_REF_INPUT_DREFCLK ; dpll |=DPLL_VCO_ENABLE ; - crtc->new_config->dpll_hw_state.dpll = dpll; + crtc_state->dpll_hw_state.dpll = dpll; }static void intel_set_pipe_timings (struct intel_crtc *intel_crtc)@@ -6389,7 +6393,8 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)POSTING_READ (PIPECONF (intel_crtc->pipe)); } -static int i9xx_crtc_compute_clock (struct intel_crtc *crtc) +static int i9xx_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;@@ -6421,7 +6426,7 @@ static int i9xx_crtc_compute_clock(struct intel_crtc *crtc)if (is_dsi)return 0 ; -if (!crtc->new_config->clock_set) { +if (!crtc_state->clock_set) { refclk =i9xx_get_refclk (crtc, num_connectors);/* @@ -6432,7 +6437,7 @@ static int i9xx_crtc_compute_clock(struct intel_crtc *crtc)*/ limit =intel_limit (crtc, refclk); ok = dev_priv->display.find_dpll (limit, crtc, - crtc->new_config->port_clock, + crtc_state->port_clock, refclk,NULL , &clock);if (!ok) {DRM_ERROR ("Couldn't find PLL settings for mode!\n" );@@ -6453,23 +6458,23 @@ static int i9xx_crtc_compute_clock(struct intel_crtc *crtc) &reduced_clock); }/* Compat-code for transition, will disappear. */ - crtc->new_config->dpll.n = clock.n; - crtc->new_config->dpll.m1 = clock.m1; - crtc->new_config->dpll.m2 = clock.m2; - crtc->new_config->dpll.p1 = clock.p1; - crtc->new_config->dpll.p2 = clock.p2; + crtc_state->dpll.n = clock.n; + crtc_state->dpll.m1 = clock.m1; + crtc_state->dpll.m2 = clock.m2; + crtc_state->dpll.p1 = clock.p1; + crtc_state->dpll.p2 = clock.p2; }if (IS_GEN2 (dev)) { -i8xx_update_pll (crtc, +i8xx_update_pll (crtc, crtc_state, has_reduced_clock ? &reduced_clock :NULL , num_connectors); }else if (IS_CHERRYVIEW (dev)) { -chv_update_pll (crtc, crtc->new_config); +chv_update_pll (crtc, crtc_state); }else if (IS_VALLEYVIEW (dev)) { -vlv_update_pll (crtc, crtc->new_config); +vlv_update_pll (crtc, crtc_state); }else { -i9xx_update_pll (crtc, +i9xx_update_pll (crtc, crtc_state, has_reduced_clock ? &reduced_clock :NULL , num_connectors); }@@ -7260,6 +7265,7 @@ static void haswell_set_pipeconf(struct drm_crtc *crtc) }static bool ironlake_compute_clocks (struct drm_crtc *crtc, +struct intel_crtc_state *crtc_state,intel_clock_t *clock,bool *has_reduced_clock,intel_clock_t *reduced_clock)@@ -7282,7 +7288,7 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc,*/ limit =intel_limit (intel_crtc, refclk); ret = dev_priv->display.find_dpll (limit, intel_crtc, - intel_crtc->new_config->port_clock, + crtc_state->port_clock, refclk,NULL , clock);if (!ret)return false;@@ -7321,6 +7327,7 @@ static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor) }static uint32_t ironlake_compute_dpll (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,u32 *fp,intel_clock_t *reduced_clock,u32 *fp2) {@@ -7358,10 +7365,10 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc, dev_priv->vbt.lvds_ssc_freq == 100000) || (HAS_PCH_IBX(dev) && intel_is_dual_link_lvds(dev))) factor =25 ; - }else if (intel_crtc->new_config->sdvo_tv_clock) + }else if (crtc_state->sdvo_tv_clock) factor =20 ; -if (ironlake_needs_fb_cb_tune (&intel_crtc->new_config->dpll, factor)) +if (ironlake_needs_fb_cb_tune (&crtc_state->dpll, factor)) *fp |=FP_CB_TUNE ;if (fp2 && (reduced_clock->m < factor * reduced_clock->n))@@ -7374,20 +7381,20 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,else dpll |=DPLLB_MODE_DAC_SERIAL ; - dpll |= (intel_crtc->new_config->pixel_multiplier -1 ) + dpll |= (crtc_state->pixel_multiplier -1 ) <<PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT ;if (is_sdvo) dpll |=DPLL_SDVO_HIGH_SPEED ; -if (intel_crtc->new_config->has_dp_encoder) +if (crtc_state->has_dp_encoder) dpll |=DPLL_SDVO_HIGH_SPEED ;/* compute bitmask from p1 value */ - dpll |= (1 << (intel_crtc->new_config->dpll.p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; + dpll |= (1 << (crtc_state->dpll.p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ;/* also FPA1 */ - dpll |= (1 << (intel_crtc->new_config->dpll.p1 -1 )) <<DPLL_FPA1_P1_POST_DIV_SHIFT ; + dpll |= (1 << (crtc_state->dpll.p1 -1 )) <<DPLL_FPA1_P1_POST_DIV_SHIFT ; -switch (intel_crtc->new_config->dpll.p2) { +switch (crtc_state->dpll.p2) {case 5 : dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 ;break ;@@ -7410,7 +7417,8 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,return dpll |DPLL_VCO_ENABLE ; } -static int ironlake_crtc_compute_clock (struct intel_crtc *crtc) +static int ironlake_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc->base.dev;intel_clock_t clock, reduced_clock;@@ -7424,39 +7432,39 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc)WARN (!(HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev)),"Unexpected PCH type %d\n" ,INTEL_PCH_TYPE (dev)); - ok =ironlake_compute_clocks (&crtc->base, &clock, + ok =ironlake_compute_clocks (&crtc->base, crtc_state, &clock, &has_reduced_clock, &reduced_clock); -if (!ok && !crtc->new_config->clock_set) { +if (!ok && !crtc_state->clock_set) {DRM_ERROR ("Couldn't find PLL settings for mode!\n" );return -EINVAL ; }/* Compat-code for transition, will disappear. */ -if (!crtc->new_config->clock_set) { - crtc->new_config->dpll.n = clock.n; - crtc->new_config->dpll.m1 = clock.m1; - crtc->new_config->dpll.m2 = clock.m2; - crtc->new_config->dpll.p1 = clock.p1; - crtc->new_config->dpll.p2 = clock.p2; +if (!crtc_state->clock_set) { + crtc_state->dpll.n = clock.n; + crtc_state->dpll.m1 = clock.m1; + crtc_state->dpll.m2 = clock.m2; + crtc_state->dpll.p1 = clock.p1; + crtc_state->dpll.p2 = clock.p2; }/* CPU eDP is the only output that doesn't need a PCH PLL of its own. */ -if (crtc->new_config->has_pch_encoder) { - fp =i9xx_dpll_compute_fp (&crtc->new_config->dpll); +if (crtc_state->has_pch_encoder) { + fp =i9xx_dpll_compute_fp (&crtc_state->dpll);if (has_reduced_clock) fp2 =i9xx_dpll_compute_fp (&reduced_clock); - dpll =ironlake_compute_dpll (crtc, + dpll =ironlake_compute_dpll (crtc, crtc_state, &fp, &reduced_clock, has_reduced_clock ? &fp2 :NULL ); - crtc->new_config->dpll_hw_state.dpll = dpll; - crtc->new_config->dpll_hw_state.fp0 = fp; + crtc_state->dpll_hw_state.dpll = dpll; + crtc_state->dpll_hw_state.fp0 = fp;if (has_reduced_clock) - crtc->new_config->dpll_hw_state.fp1 = fp2; + crtc_state->dpll_hw_state.fp1 = fp2;else - crtc->new_config->dpll_hw_state.fp1 = fp; + crtc_state->dpll_hw_state.fp1 = fp; - pll =intel_get_shared_dpll (crtc); + pll =intel_get_shared_dpll (crtc, crtc_state);if (pll ==NULL ) {DRM_DEBUG_DRIVER ("failed to find PLL for pipe %c\n" ,pipe_name (crtc->pipe));@@ -7967,9 +7975,10 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv)intel_prepare_ddi (dev); } -static int haswell_crtc_compute_clock (struct intel_crtc *crtc) +static int haswell_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) { -if (!intel_ddi_pll_select (crtc)) +if (!intel_ddi_pll_select (crtc, crtc_state))return -EINVAL ; crtc->lowfreq_avail = false;@@ -10961,7 +10970,9 @@ static int __intel_set_mode(struct drm_crtc *crtc, goto done;for_each_intel_crtc_masked (dev, modeset_pipes, intel_crtc) { - ret = dev_priv->display.crtc_compute_clock (intel_crtc); +struct intel_crtc_state *state = intel_crtc->new_config; + ret = dev_priv->display.crtc_compute_clock (intel_crtc, + state);if (ret) {intel_shared_dpll_abort_config (dev_priv); goto done;drivers/gpu/drm/i915/intel_drv.h +4
-2@@ -818,7 +818,8 @@ void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder);void intel_ddi_enable_pipe_clock (struct intel_crtc *intel_crtc);void intel_ddi_disable_pipe_clock (struct intel_crtc *intel_crtc); -bool intel_ddi_pll_select (struct intel_crtc *crtc); +bool intel_ddi_pll_select (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state);void intel_ddi_set_pipe_settings (struct drm_crtc *crtc);void intel_ddi_prepare_link_retrain (struct drm_encoder *encoder);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector);@@ -929,7 +930,8 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv, bool state);#define assert_shared_dpll_enabled (d, p) assert_shared_dpll(d, p, true)#define assert_shared_dpll_disabled (d, p) assert_shared_dpll(d, p, false) -struct intel_shared_dpll *intel_get_shared_dpll (struct intel_crtc *crtc); +struct intel_shared_dpll *intel_get_shared_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *state);void intel_put_shared_dpll (struct intel_crtc *crtc); void vlv_force_pll_on(struct drm_device *dev, enum pipe pipe,Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 4/8 drm/i915: Use local pipe_config varariable when available
In reply to Ander Conselvan de OliveiraIn function that define a local pipe_config variable to point to crtc->config, replace remaining references to crtc->config with the local variable. This makes the code more consistent and easier to change in an automated manner.
--- drivers/gpu/drm/i915/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +3 -3
@@ -4602,7 +4602,7 @@ static void i9xx_pfit_enable(struct intel_crtc *crtc)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc_state *pipe_config = &crtc->config; -if (!crtc->config.gmch_pfit.control) +if (!pipe_config->gmch_pfit.control)return ;/*
@@ -5925,7 +5925,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe),0x00d0000f ); -if (crtc->config.has_dp_encoder) { +if (pipe_config->has_dp_encoder) {/* Use SSC source */ if (pipe ==PIPE_A ) vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
@@ -7541,7 +7541,7 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,void intel_dp_get_m_n (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) { -if (crtc->config.has_pch_encoder) +if (pipe_config->has_pch_encoder)intel_pch_transcoder_get_m_n (crtc, &pipe_config->dp_m_n);else intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 5/8 drm/i915: Don't access to crtc->new_config from intel_mode_max_pixclk()
In reply to Ander Conselvan de OliveiraSo that we can get rid of the new_config pointer later.
--- drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +22 -8
@@ -4897,27 +4897,39 @@ static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv, }/* compute the max pixel clock for new configuration */ -static int intel_mode_max_pixclk (struct drm_i915_private *dev_priv) +static int intel_mode_max_pixclk (struct drm_i915_private *dev_priv, +struct intel_crtc *mode_set_crtc, +struct intel_crtc_state *crtc_new_state) {struct drm_device *dev = dev_priv->dev;struct intel_crtc *intel_crtc;int max_pixclk =0 ; +int pixclk;for_each_intel_crtc (dev, intel_crtc) { -if (intel_crtc->new_enabled) - max_pixclk =max (max_pixclk, - intel_crtc->new_config->base.adjusted_mode.crtc_clock); +if (!intel_crtc->new_enabled) +continue ; + +if (intel_crtc == mode_set_crtc) + pixclk = crtc_new_state->base.adjusted_mode.crtc_clock; +else + pixclk = intel_crtc->config->base.adjusted_mode.crtc_clock; + + max_pixclk =max (max_pixclk, pixclk); }return max_pixclk; }static void valleyview_modeset_global_pipes (struct drm_device *dev, -unsigned *prepare_pipes) +unsigned *prepare_pipes, +struct intel_crtc *mode_set_crtc, +struct intel_crtc_state *crtc_new_state) {struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc; -int max_pixclk =intel_mode_max_pixclk (dev_priv); +int max_pixclk = +intel_mode_max_pixclk (dev_priv, mode_set_crtc, crtc_new_state);if (valleyview_calc_cdclk (dev_priv, max_pixclk) == dev_priv->vlv_cdclk_freq)
@@ -4932,7 +4944,7 @@ static void valleyview_modeset_global_pipes(struct drm_device *dev,static void valleyview_modeset_global_resources (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -int max_pixclk =intel_mode_max_pixclk (dev_priv); +int max_pixclk =intel_mode_max_pixclk (dev_priv,NULL ,NULL );int req_cdclk =valleyview_calc_cdclk (dev_priv, max_pixclk);if (req_cdclk != dev_priv->vlv_cdclk_freq) {
@@ -10956,7 +10968,9 @@ static int __intel_set_mode(struct drm_crtc *crtc,* adjusted_mode bits in the crtc directly. */ if (IS_VALLEYVIEW (dev)) { -valleyview_modeset_global_pipes (dev, &prepare_pipes); +valleyview_modeset_global_pipes (dev, &prepare_pipes, +to_intel_crtc (crtc), + pipe_config);/* may have added more to prepare_pipes than we should */ prepare_pipes &= ~disable_pipes;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 6/8 drm/i915: Remove intel_crtc->new_config pointer
In reply to Ander Conselvan de OliveiraThere are no more users of that pointer since the new config is now passed down the call chain during mode set. Also, when the switch to atomic happens, the right config (state) should be derived from an atomic state structure.
--- drivers/gpu/drm/i915/intel_display.c | 46 ++++++++---------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 10 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/intel_display.c +10 -36
@@ -8583,7 +8583,6 @@ retry: intel_crtc =to_intel_crtc (crtc); intel_crtc->new_enabled = true; - intel_crtc->new_config = &intel_crtc->config; old->dpms_mode = connector->dpms; old->load_detect_temp = true; old->release_fb =NULL ;
@@ -8623,10 +8622,6 @@ retry: fail: intel_crtc->new_enabled = crtc->enabled; -if (intel_crtc->new_enabled) - intel_crtc->new_config = &intel_crtc->config; -else - intel_crtc->new_config =NULL ; fail_unlock:if (ret == -EDEADLK ) {drm_modeset_backoff (ctx);
@@ -8653,7 +8648,6 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,to_intel_connector (connector)->new_encoder =NULL ; intel_encoder->new_crtc =NULL ; intel_crtc->new_enabled = false; - intel_crtc->new_config =NULL ;intel_set_mode (crtc,NULL ,0 ,0 ,NULL );if (old->release_fb) {
@@ -9839,14 +9833,8 @@ static void intel_modeset_update_staged_output_state(struct drm_device *dev)to_intel_crtc (encoder->base.crtc); } -for_each_intel_crtc (dev, crtc) { +for_each_intel_crtc (dev, crtc) crtc->new_enabled = crtc->base.enabled; - -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; - } }/**
@@ -10355,12 +10343,8 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)intel_modeset_commit_output_state (dev);/* Double check state. */ -for_each_intel_crtc (dev, intel_crtc) { +for_each_intel_crtc (dev, intel_crtc)WARN_ON (intel_crtc->base.enabled !=intel_crtc_in_use (&intel_crtc->base)); -WARN_ON (intel_crtc->new_config && - intel_crtc->new_config != &intel_crtc->config); -WARN_ON (intel_crtc->base.enabled != !!intel_crtc->new_config); - }list_for_each_entry (connector, &dev->mode_config.connector_list, head) {if (!connector->encoder || !connector->encoder->crtc)
@@ -10957,9 +10941,6 @@ static int __intel_set_mode(struct drm_crtc *crtc, *saved_mode = crtc->mode; -if (modeset_pipes) -to_intel_crtc (crtc)->new_config = pipe_config; -/* * See if the config requires any additional preparation, e.g. * to adjust global state with pipes off. We need to do this
@@ -10984,7 +10965,13 @@ static int __intel_set_mode(struct drm_crtc *crtc, goto done;for_each_intel_crtc_masked (dev, modeset_pipes, intel_crtc) { -struct intel_crtc_state *state = intel_crtc->new_config; +struct intel_crtc_state *state; + +if (&intel_crtc->base == crtc) + state = pipe_config; +else + state = intel_crtc->config; + ret = dev_priv->display.crtc_compute_clock (intel_crtc, state);if (ret) {
@@ -11014,7 +11001,6 @@ static int __intel_set_mode(struct drm_crtc *crtc,/* mode_set/enable/disable functions rely on a correct pipe * config. */ to_intel_crtc (crtc)->config = *pipe_config; -to_intel_crtc (crtc)->new_config = &to_intel_crtc (crtc)->config;/* * Calculate and store various constants which
@@ -11177,15 +11163,9 @@ static void intel_set_config_restore_state(struct drm_device *dev,int count; count =0 ; -for_each_intel_crtc (dev, crtc) { +for_each_intel_crtc (dev, crtc) crtc->new_enabled = config->save_crtc_enabled[count++]; -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; - } - count =0 ;for_each_intel_encoder (dev, encoder) { encoder->new_crtc =
@@ -11391,11 +11371,6 @@ intel_modeset_stage_output_state(struct drm_device *dev, crtc->new_enabled ? "en" : "dis"); config->mode_changed = true; } - -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; }return 0 ;
@@ -11422,7 +11397,6 @@ static void disable_crtc_nofb(struct intel_crtc *crtc) } crtc->new_enabled = false; - crtc->new_config =NULL ; }static int intel_crtc_set_config (struct drm_mode_set *set)
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -440,7 +440,6 @@ struct intel_crtc {struct intel_plane_config plane_config;struct intel_crtc_state config; -struct intel_crtc_state *new_config;bool new_enabled;/* reset counter value when the last flip was submitted */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC][PATCH 6/8] drm/i915: Remove intel_crtc->new_config pointer
Quoted 4 lines · Ander Conselvan de Oliveira
There are no more users of that pointer since the new config is now passed down the call chain during mode set. Also, when the switch to atomic happens, the right config (state) should be derived from an atomic state structure.
Ah, doesn't seem much work actually to remove our usage of ->new_config. Which is nice since it'll align us more with how the helpers work.
So overall I think this patch series is good to go (but I've done only a rather cursory high-level reading).
Thanks, Daniel
Quoted 155 lines
--- drivers/gpu/drm/i915/intel_display.c | 46 ++++++++---------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 10 insertions(+), 37 deletions(-)drivers/gpu/drm/i915/intel_display.c +10
-36@@ -8583,7 +8583,6 @@ retry: intel_crtc =to_intel_crtc (crtc); intel_crtc->new_enabled = true; - intel_crtc->new_config = &intel_crtc->config; old->dpms_mode = connector->dpms; old->load_detect_temp = true; old->release_fb =NULL ;@@ -8623,10 +8622,6 @@ retry: fail: intel_crtc->new_enabled = crtc->enabled; -if (intel_crtc->new_enabled) - intel_crtc->new_config = &intel_crtc->config; -else - intel_crtc->new_config =NULL ; fail_unlock:if (ret == -EDEADLK ) {drm_modeset_backoff (ctx);@@ -8653,7 +8648,6 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,to_intel_connector (connector)->new_encoder =NULL ; intel_encoder->new_crtc =NULL ; intel_crtc->new_enabled = false; - intel_crtc->new_config =NULL ;intel_set_mode (crtc,NULL ,0 ,0 ,NULL );if (old->release_fb) {@@ -9839,14 +9833,8 @@ static void intel_modeset_update_staged_output_state(struct drm_device *dev)to_intel_crtc (encoder->base.crtc); } -for_each_intel_crtc (dev, crtc) { +for_each_intel_crtc (dev, crtc) crtc->new_enabled = crtc->base.enabled; - -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; - } }/** @@ -10355,12 +10343,8 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)intel_modeset_commit_output_state (dev);/* Double check state. */ -for_each_intel_crtc (dev, intel_crtc) { +for_each_intel_crtc (dev, intel_crtc)WARN_ON (intel_crtc->base.enabled !=intel_crtc_in_use (&intel_crtc->base)); -WARN_ON (intel_crtc->new_config && - intel_crtc->new_config != &intel_crtc->config); -WARN_ON (intel_crtc->base.enabled != !!intel_crtc->new_config); - }list_for_each_entry (connector, &dev->mode_config.connector_list, head) {if (!connector->encoder || !connector->encoder->crtc)@@ -10957,9 +10941,6 @@ static int __intel_set_mode(struct drm_crtc *crtc, *saved_mode = crtc->mode; -if (modeset_pipes) -to_intel_crtc (crtc)->new_config = pipe_config; -/* * See if the config requires any additional preparation, e.g. * to adjust global state with pipes off. We need to do this @@ -10984,7 +10965,13 @@ static int __intel_set_mode(struct drm_crtc *crtc, goto done;for_each_intel_crtc_masked (dev, modeset_pipes, intel_crtc) { -struct intel_crtc_state *state = intel_crtc->new_config; +struct intel_crtc_state *state; + +if (&intel_crtc->base == crtc) + state = pipe_config; +else + state = intel_crtc->config; + ret = dev_priv->display.crtc_compute_clock (intel_crtc, state);if (ret) {@@ -11014,7 +11001,6 @@ static int __intel_set_mode(struct drm_crtc *crtc,/* mode_set/enable/disable functions rely on a correct pipe * config. */ to_intel_crtc (crtc)->config = *pipe_config; -to_intel_crtc (crtc)->new_config = &to_intel_crtc (crtc)->config;/* * Calculate and store various constants which @@ -11177,15 +11163,9 @@ static void intel_set_config_restore_state(struct drm_device *dev,int count; count =0 ; -for_each_intel_crtc (dev, crtc) { +for_each_intel_crtc (dev, crtc) crtc->new_enabled = config->save_crtc_enabled[count++]; -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; - } - count =0 ;for_each_intel_encoder (dev, encoder) { encoder->new_crtc =@@ -11391,11 +11371,6 @@ intel_modeset_stage_output_state(struct drm_device *dev, crtc->new_enabled ? "en" : "dis"); config->mode_changed = true; } - -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; }return 0 ;@@ -11422,7 +11397,6 @@ static void disable_crtc_nofb(struct intel_crtc *crtc) } crtc->new_enabled = false; - crtc->new_config =NULL ; }static int intel_crtc_set_config (struct drm_mode_set *set)drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -440,7 +440,6 @@ struct intel_crtc {struct intel_plane_config plane_config;struct intel_crtc_state config; -struct intel_crtc_state *new_config;bool new_enabled;/* reset counter value when the last flip was submitted */ Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC][PATCH 6/8] drm/i915: Remove intel_crtc->new_config pointer
Quoted 8 lines · Daniel Vetter
Quoted 4 lines · Ander Conselvan de Oliveira
There are no more users of that pointer since the new config is now passed down the call chain during mode set. Also, when the switch to atomic happens, the right config (state) should be derived from an atomic state structure.
Ah, doesn't seem much work actually to remove our usage of ->new_config. Which is nice since it'll align us more with how the helpers work.
Except for the ugliness in patch 5, it was pretty straight forward. But that can be fixed once we have a global state object.
Quoted 2 lines
So overall I think this patch series is good to go (but I've done only a rather cursory high-level reading).
For some reason PRTS ignored this one (maybe because it is an RFC?), so I submitted a task manually. If that succeeds, I'll resend without the RFC status.
Cheers,
Ander
Quoted 150 lines
Thanks, Daniel
Quoted 147 lines
--- drivers/gpu/drm/i915/intel_display.c | 46 ++++++++---------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 10 insertions(+), 37 deletions(-)drivers/gpu/drm/i915/intel_display.c +10
-36@@ -8583,7 +8583,6 @@ retry: intel_crtc =to_intel_crtc (crtc); intel_crtc->new_enabled = true; - intel_crtc->new_config = &intel_crtc->config; old->dpms_mode = connector->dpms; old->load_detect_temp = true; old->release_fb =NULL ;@@ -8623,10 +8622,6 @@ retry: fail: intel_crtc->new_enabled = crtc->enabled; -if (intel_crtc->new_enabled) - intel_crtc->new_config = &intel_crtc->config; -else - intel_crtc->new_config =NULL ; fail_unlock:if (ret == -EDEADLK ) {drm_modeset_backoff (ctx);@@ -8653,7 +8648,6 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,to_intel_connector (connector)->new_encoder =NULL ; intel_encoder->new_crtc =NULL ; intel_crtc->new_enabled = false; - intel_crtc->new_config =NULL ;intel_set_mode (crtc,NULL ,0 ,0 ,NULL );if (old->release_fb) {@@ -9839,14 +9833,8 @@ static void intel_modeset_update_staged_output_state(struct drm_device *dev)to_intel_crtc (encoder->base.crtc); } -for_each_intel_crtc (dev, crtc) { +for_each_intel_crtc (dev, crtc) crtc->new_enabled = crtc->base.enabled; - -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; - } }/** @@ -10355,12 +10343,8 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)intel_modeset_commit_output_state (dev);/* Double check state. */ -for_each_intel_crtc (dev, intel_crtc) { +for_each_intel_crtc (dev, intel_crtc)WARN_ON (intel_crtc->base.enabled !=intel_crtc_in_use (&intel_crtc->base)); -WARN_ON (intel_crtc->new_config && - intel_crtc->new_config != &intel_crtc->config); -WARN_ON (intel_crtc->base.enabled != !!intel_crtc->new_config); - }list_for_each_entry (connector, &dev->mode_config.connector_list, head) {if (!connector->encoder || !connector->encoder->crtc)@@ -10957,9 +10941,6 @@ static int __intel_set_mode(struct drm_crtc *crtc, *saved_mode = crtc->mode; -if (modeset_pipes) -to_intel_crtc (crtc)->new_config = pipe_config; -/* * See if the config requires any additional preparation, e.g. * to adjust global state with pipes off. We need to do this @@ -10984,7 +10965,13 @@ static int __intel_set_mode(struct drm_crtc *crtc, goto done;for_each_intel_crtc_masked (dev, modeset_pipes, intel_crtc) { -struct intel_crtc_state *state = intel_crtc->new_config; +struct intel_crtc_state *state; + +if (&intel_crtc->base == crtc) + state = pipe_config; +else + state = intel_crtc->config; + ret = dev_priv->display.crtc_compute_clock (intel_crtc, state);if (ret) {@@ -11014,7 +11001,6 @@ static int __intel_set_mode(struct drm_crtc *crtc,/* mode_set/enable/disable functions rely on a correct pipe * config. */ to_intel_crtc (crtc)->config = *pipe_config; -to_intel_crtc (crtc)->new_config = &to_intel_crtc (crtc)->config;/* * Calculate and store various constants which @@ -11177,15 +11163,9 @@ static void intel_set_config_restore_state(struct drm_device *dev,int count; count =0 ; -for_each_intel_crtc (dev, crtc) { +for_each_intel_crtc (dev, crtc) crtc->new_enabled = config->save_crtc_enabled[count++]; -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; - } - count =0 ;for_each_intel_encoder (dev, encoder) { encoder->new_crtc =@@ -11391,11 +11371,6 @@ intel_modeset_stage_output_state(struct drm_device *dev, crtc->new_enabled ? "en" : "dis"); config->mode_changed = true; } - -if (crtc->new_enabled) - crtc->new_config = &crtc->config; -else - crtc->new_config =NULL ; }return 0 ;@@ -11422,7 +11397,6 @@ static void disable_crtc_nofb(struct intel_crtc *crtc) } crtc->new_enabled = false; - crtc->new_config =NULL ; }static int intel_crtc_set_config (struct drm_mode_set *set)drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -440,7 +440,6 @@ struct intel_crtc {struct intel_plane_config plane_config;struct intel_crtc_state config; -struct intel_crtc_state *new_config;bool new_enabled;
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +0
-1/* reset counter value when the last flip was submitted */ --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 7/8 drm/i915: Make intel_crtc->config a pointer
In reply to Ander Conselvan de OliveiraTo match the semantics of drm_crtc->state, which this will eventually become. Following coccinelle script did most of the work.
@@ struct intel_crtc *crtc; @@
-&crtc->config
+crtc->config
@@ struct intel_crtc *crtc; identifier member; @@
-crtc->config.member
+crtc->config->member
@@ struct drm_crtc *crtc; @@
-&to_intel_crtc(crtc)->config
+to_intel_crtc(crtc)->config
@@ struct drm_crtc *crtc; identifier member; @@
-to_intel_crtc(crtc)->config.member
+to_intel_crtc(crtc)->config->member
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/i915_irq.c | 8 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 52 +++---- drivers/gpu/drm/i915/intel_display.c | 275 ++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp.c | 16 +- drivers/gpu/drm/i915/intel_dp_mst.c | 7 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 8 +- drivers/gpu/drm/i915/intel_dvo.c | 8 +- drivers/gpu/drm/i915/intel_fbdev.c | 10 +- drivers/gpu/drm/i915/intel_hdmi.c | 36 ++--- drivers/gpu/drm/i915/intel_lvds.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 56 +++---- drivers/gpu/drm/i915/intel_psr.c | 8 +- drivers/gpu/drm/i915/intel_sdvo.c | 14 +- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 19 files changed, 270 insertions(+), 256 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -2572,7 +2572,7 @@ static int i915_display_info(struct seq_file *m, void *unused)seq_printf (m,"CRTC %d: pipe: %c, active=%s (size=%dx%d)\n" , crtc->base.base.id,pipe_name (crtc->pipe), -yesno (crtc->active), crtc->config.pipe_src_w, crtc->config.pipe_src_h); +yesno (crtc->active), crtc->config->pipe_src_w, crtc->config->pipe_src_h);if (crtc->active) {intel_crtc_info (m, crtc);
@@ -3280,9 +3280,9 @@ static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev)* relevant on hsw with pipe A when using the always-on power well * routing. */ -if (crtc->config.cpu_transcoder ==TRANSCODER_EDP && - !crtc->config.pch_pfit.enabled) { - crtc->config.pch_pfit.force_thru = true; +if (crtc->config->cpu_transcoder ==TRANSCODER_EDP && + !crtc->config->pch_pfit.enabled) { + crtc->config->pch_pfit.force_thru = true;intel_display_power_get (dev_priv,POWER_DOMAIN_PIPE_PANEL_FITTER (PIPE_A ));
@@ -3306,8 +3306,8 @@ static void hsw_undo_trans_edp_pipe_A_crc_wa(struct drm_device *dev)* relevant on hsw with pipe A when using the always-on power well * routing. */ -if (crtc->config.pch_pfit.force_thru) { - crtc->config.pch_pfit.force_thru = false; +if (crtc->config->pch_pfit.force_thru) { + crtc->config->pch_pfit.force_thru = false; dev_priv->display.crtc_disable (&crtc->base); dev_priv->display.crtc_enable (&crtc->base);
drivers/gpu/drm/i915/i915_irq.c +4 -4
@@ -567,7 +567,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)struct intel_crtc *intel_crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[pipe]);const struct drm_display_mode *mode = - &intel_crtc->config.base.adjusted_mode; + &intel_crtc->config->base.adjusted_mode; htotal = mode->crtc_htotal; hsync_start = mode->crtc_hsync_start;
@@ -638,7 +638,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; -const struct drm_display_mode *mode = &crtc->config.base.adjusted_mode; +const struct drm_display_mode *mode = &crtc->config->base.adjusted_mode;enum pipe pipe = crtc->pipe;int position, vtotal;
@@ -665,7 +665,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,struct drm_i915_private *dev_priv = dev->dev_private;struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -const struct drm_display_mode *mode = &intel_crtc->config.base.adjusted_mode; +const struct drm_display_mode *mode = &intel_crtc->config->base.adjusted_mode;int position;int vbl_start, vbl_end, hsync_start, htotal, vtotal;bool in_vbl = true;
@@ -823,7 +823,7 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,return drm_calc_vbltimestamp_from_scanoutpos (dev, pipe, max_error, vblank_time, flags, crtc, - &to_intel_crtc (crtc)->config.base.adjusted_mode); + &to_intel_crtc (crtc)->config->base.adjusted_mode); } static bool intel_hpd_irq_event(struct drm_device *dev,
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -397,7 +397,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) {struct drm_encoder *encoder = &intel_encoder->base;struct intel_crtc *crtc =to_intel_crtc (encoder->crtc); -struct drm_display_mode *mode = &crtc->config.base.adjusted_mode; +struct drm_display_mode *mode = &crtc->config->base.adjusted_mode;struct drm_connector *connector;struct drm_device *dev = encoder->dev;struct drm_i915_private *dev_priv = dev->dev_private;
drivers/gpu/drm/i915/intel_crt.c +1 -1
@@ -157,7 +157,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crt *crt =intel_encoder_to_crt (encoder);struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;u32 adpa;if (INTEL_INFO (dev)->gen >=5 )
drivers/gpu/drm/i915/intel_ddi.c +26 -26
178 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +144 -131
875 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +8 -8
@@ -1295,11 +1295,11 @@ static void ironlake_set_pll_cpu_edp(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv = dev->dev_private;u32 dpa_ctl; -DRM_DEBUG_KMS ("eDP PLL enable for clock %d\n" , crtc->config.port_clock); +DRM_DEBUG_KMS ("eDP PLL enable for clock %d\n" , crtc->config->port_clock); dpa_ctl =I915_READ (DP_A ); dpa_ctl &= ~DP_PLL_FREQ_MASK ; -if (crtc->config.port_clock ==162000 ) { +if (crtc->config->port_clock ==162000 ) {/* For a long time we've carried around a ILK-DevA w/a for the * 160MHz clock. If we're really unlucky, it's still required. */
@@ -1324,7 +1324,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder)struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->port;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;/* * There are four kinds of DP registers:
@@ -1352,7 +1352,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder) intel_dp->DP |=DP_VOLTAGE_0_4 |DP_PRE_EMPHASIS_0 ; intel_dp->DP |=DP_PORT_WIDTH (intel_dp->lane_count); -if (crtc->config.has_audio) +if (crtc->config->has_audio) intel_dp->DP |=DP_AUDIO_OUTPUT_ENABLE ;/* Split out the IBX/CPU vs CPT settings */
@@ -2102,7 +2102,7 @@ static void intel_disable_dp(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -if (crtc->config.has_audio) +if (crtc->config->has_audio)intel_audio_codec_disable (encoder);if (HAS_PSR (dev) && !HAS_DDI (dev))
@@ -2312,7 +2312,7 @@ static void intel_enable_dp(struct intel_encoder *encoder)intel_dp_complete_link_train (intel_dp);intel_dp_stop_link_train (intel_dp); -if (crtc->config.has_audio) { +if (crtc->config->has_audio) {DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" ,pipe_name (crtc->pipe));intel_audio_codec_enable (encoder);
@@ -4780,7 +4780,7 @@ void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate)return ; } - config = &intel_crtc->config; + config = intel_crtc->config;if (intel_dp->drrs_state.type <SEAMLESS_DRRS_SUPPORT ) {DRM_DEBUG_KMS ("Only Seamless DRRS supported.\n" );
@@ -4802,7 +4802,7 @@ void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) }if (INTEL_INFO (dev)->gen >6 &&INTEL_INFO (dev)->gen <8 ) { - reg =PIPECONF (intel_crtc->config.cpu_transcoder); + reg =PIPECONF (intel_crtc->config->cpu_transcoder); val =I915_READ (reg);if (index >DRRS_HIGH_RR ) { val |=PIPECONF_EDP_RR_MODE_SWITCH ;
drivers/gpu/drm/i915/intel_dp_mst.c +4 -3
@@ -157,7 +157,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)if (intel_dp->active_mst_links ==0 ) {enum port port =intel_ddi_get_encoder_port (encoder); -I915_WRITE (PORT_CLK_SEL (port), intel_crtc->config.ddi_pll_sel); +I915_WRITE (PORT_CLK_SEL (port), intel_crtc->config->ddi_pll_sel);intel_ddi_init_dp_buf_reg (&intel_dig_port->base);
@@ -170,7 +170,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder) } ret =drm_dp_mst_allocate_vcpi (&intel_dp->mst_mgr, - intel_mst->port, intel_crtc->config.pbn, &slots); + intel_mst->port, intel_crtc->config->pbn, + &slots);if (ret == false) {DRM_ERROR ("failed to allocate vcpi\n" );return ;
@@ -223,7 +224,7 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; -enum transcoder cpu_transcoder = crtc->config.cpu_transcoder; +enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;u32 temp, flags =0 ; pipe_config->has_dp_encoder = true;
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -439,7 +439,7 @@ struct intel_crtc {uint32_t cursor_base;struct intel_plane_config plane_config; -struct intel_crtc_state config; +struct intel_crtc_state *config;bool new_enabled;/* reset counter value when the last flip was submitted */
drivers/gpu/drm/i915/intel_dsi.c +4 -4
@@ -232,7 +232,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)I915_WRITE (DPLL (pipe), tmp);/* update the hw state for DPLL */ - intel_crtc->config.dpll_hw_state.dpll =DPLL_INTEGRATED_CLOCK_VLV | + intel_crtc->config->dpll_hw_state.dpll =DPLL_INTEGRATED_CLOCK_VLV |DPLL_REFA_CLK_ENABLE_VLV ; tmp =I915_READ (DSPCLK_GATE_D );
@@ -494,7 +494,7 @@ static void set_dsi_timings(struct drm_encoder *encoder,struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -unsigned int bpp = intel_crtc->config.pipe_bpp; +unsigned int bpp = intel_crtc->config->pipe_bpp;unsigned int lane_count = intel_dsi->lane_count;u16 hactive, hfp, hsync, hbp, vfp, vsync, vbp;
@@ -549,9 +549,9 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.base.adjusted_mode; + &intel_crtc->config->base.adjusted_mode;enum port port; -unsigned int bpp = intel_crtc->config.pipe_bpp; +unsigned int bpp = intel_crtc->config->pipe_bpp;u32 val, tmp;u16 mode_hdisplay;
drivers/gpu/drm/i915/intel_dvo.c +4 -4
@@ -186,8 +186,8 @@ static void intel_enable_dvo(struct intel_encoder *encoder)u32 temp =I915_READ (dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, - &crtc->config.base.mode, - &crtc->config.base.adjusted_mode); + &crtc->config->base.mode, + &crtc->config->base.adjusted_mode);I915_WRITE (dvo_reg, temp |DVO_ENABLE );I915_READ (dvo_reg);
@@ -221,7 +221,7 @@ static void intel_dvo_dpms(struct drm_connector *connector, int mode)/* We call connector dpms manually below in case pipe dpms doesn't * change due to cloning. */ if (mode ==DRM_MODE_DPMS_ON ) { - config = &to_intel_crtc (crtc)->config; + config =to_intel_crtc (crtc)->config; intel_dvo->base.connectors_active = true;
@@ -295,7 +295,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);int pipe = crtc->pipe;u32 dvo_val;
drivers/gpu/drm/i915/intel_fbdev.c +5 -5
@@ -431,7 +431,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,DRM_DEBUG_KMS ("looking for current mode on connector %s\n" , connector->name);intel_mode_from_pipe_config (&encoder->crtc->hwmode, - &to_intel_crtc (encoder->crtc)->config); +to_intel_crtc (encoder->crtc)->config); modes[i] = &encoder->crtc->hwmode; } crtcs[i] = new_crtc;
@@ -563,7 +563,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,* pipe. Note we need to use the selected fb's pitch and bpp * rather than the current pipe's, since they differ. */ - cur_size = intel_crtc->config.base.adjusted_mode.crtc_hdisplay; + cur_size = intel_crtc->config->base.adjusted_mode.crtc_hdisplay; cur_size = cur_size * fb->base.bits_per_pixel /8 ;if (fb->base.pitches[0 ] < cur_size) { DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n",
@@ -574,13 +574,13 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,break ; } - cur_size = intel_crtc->config.base.adjusted_mode.crtc_vdisplay; + cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay; cur_size =ALIGN (cur_size, plane_config->tiled ? (IS_GEN2 (dev) ?16 :8 ) :1 ); cur_size *= fb->base.pitches[0 ];DRM_DEBUG_KMS ("pipe %c area: %dx%d, bpp: %d, size: %d\n" ,pipe_name (intel_crtc->pipe), - intel_crtc->config.base.adjusted_mode.crtc_hdisplay, - intel_crtc->config.base.adjusted_mode.crtc_vdisplay, + intel_crtc->config->base.adjusted_mode.crtc_hdisplay, + intel_crtc->config->base.adjusted_mode.crtc_vdisplay, fb->base.bits_per_pixel, cur_size);
drivers/gpu/drm/i915/intel_hdmi.c +18 -18
@@ -337,13 +337,13 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,struct drm_device *dev = encoder->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); -u32 ctl_reg =HSW_TVIDEO_DIP_CTL (intel_crtc->config.cpu_transcoder); +u32 ctl_reg =HSW_TVIDEO_DIP_CTL (intel_crtc->config->cpu_transcoder);u32 data_reg;int i;u32 val =I915_READ (ctl_reg); data_reg =hsw_infoframe_data_reg (type, - intel_crtc->config.cpu_transcoder, + intel_crtc->config->cpu_transcoder, dev_priv);if (data_reg ==0 )return ;
@@ -371,7 +371,7 @@ static bool hsw_infoframe_enabled(struct drm_encoder *encoder)struct drm_device *dev = encoder->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); -u32 ctl_reg =HSW_TVIDEO_DIP_CTL (intel_crtc->config.cpu_transcoder); +u32 ctl_reg =HSW_TVIDEO_DIP_CTL (intel_crtc->config->cpu_transcoder);u32 val =I915_READ (ctl_reg); return val & (VIDEO_DIP_ENABLE_AVI_HSW | VIDEO_DIP_ENABLE_SPD_HSW |
@@ -436,7 +436,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, }if (intel_hdmi->rgb_quant_range_selectable) { -if (intel_crtc->config.limited_color_range) +if (intel_crtc->config->limited_color_range) frame.avi.quantization_range =HDMI_QUANTIZATION_RANGE_LIMITED ;else
@@ -672,7 +672,7 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,struct drm_i915_private *dev_priv = encoder->dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder); -u32 reg =HSW_TVIDEO_DIP_CTL (intel_crtc->config.cpu_transcoder); +u32 reg =HSW_TVIDEO_DIP_CTL (intel_crtc->config->cpu_transcoder);u32 val =I915_READ (reg);assert_hdmi_port_disabled (intel_hdmi);
@@ -700,7 +700,7 @@ static void intel_hdmi_prepare(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base); -struct drm_display_mode *adjusted_mode = &crtc->config.base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;u32 hdmi_val; hdmi_val =SDVO_ENCODING_HDMI ;
@@ -711,12 +711,12 @@ static void intel_hdmi_prepare(struct intel_encoder *encoder)if (adjusted_mode->flags &DRM_MODE_FLAG_PHSYNC ) hdmi_val |=SDVO_HSYNC_ACTIVE_HIGH ; -if (crtc->config.pipe_bpp >24 ) +if (crtc->config->pipe_bpp >24 ) hdmi_val |= HDMI_COLOR_FORMAT_12bpc;else hdmi_val |= SDVO_COLOR_FORMAT_8bpc; -if (crtc->config.has_hdmi_sink) +if (crtc->config->has_hdmi_sink) hdmi_val |=HDMI_MODE_SELECT_HDMI ;if (HAS_PCH_CPT (dev))
@@ -814,7 +814,7 @@ static void intel_enable_hdmi(struct intel_encoder *encoder)u32 temp;u32 enable_bits =SDVO_ENABLE ; -if (intel_crtc->config.has_audio) +if (intel_crtc->config->has_audio) enable_bits |=SDVO_AUDIO_ENABLE ; temp =I915_READ (intel_hdmi->hdmi_reg);
@@ -845,8 +845,8 @@ static void intel_enable_hdmi(struct intel_encoder *encoder)POSTING_READ (intel_hdmi->hdmi_reg); } -if (intel_crtc->config.has_audio) { -WARN_ON (!intel_crtc->config.has_hdmi_sink); +if (intel_crtc->config->has_audio) { +WARN_ON (!intel_crtc->config->has_hdmi_sink);DRM_DEBUG_DRIVER ("Enabling HDMI audio on pipe %c\n" ,pipe_name (intel_crtc->pipe));intel_audio_codec_enable (encoder);
@@ -866,7 +866,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)u32 temp;u32 enable_bits =SDVO_ENABLE |SDVO_AUDIO_ENABLE ; -if (crtc->config.has_audio) +if (crtc->config->has_audio)intel_audio_codec_disable (encoder); temp =I915_READ (intel_hdmi->hdmi_reg);
@@ -1252,12 +1252,12 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder)struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.base.adjusted_mode; + &intel_crtc->config->base.adjusted_mode;intel_hdmi_prepare (encoder); intel_hdmi->set_infoframes (&encoder->base, - intel_crtc->config.has_hdmi_sink, + intel_crtc->config->has_hdmi_sink, adjusted_mode); }
@@ -1270,7 +1270,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.base.adjusted_mode; + &intel_crtc->config->base.adjusted_mode;enum dpio_channel port =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;u32 val;
@@ -1302,7 +1302,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)mutex_unlock (&dev_priv->dpio_lock); intel_hdmi->set_infoframes (&encoder->base, - intel_crtc->config.has_hdmi_sink, + intel_crtc->config->has_hdmi_sink, adjusted_mode);intel_enable_hdmi (encoder);
@@ -1467,7 +1467,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &intel_crtc->config.base.adjusted_mode; + &intel_crtc->config->base.adjusted_mode;enum dpio_channel ch =vlv_dport_to_channel (dport);int pipe = intel_crtc->pipe;int data, i;
@@ -1593,7 +1593,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)mutex_unlock (&dev_priv->dpio_lock); intel_hdmi->set_infoframes (&encoder->base, - intel_crtc->config.has_hdmi_sink, + intel_crtc->config->has_hdmi_sink, adjusted_mode);intel_enable_hdmi (encoder);
drivers/gpu/drm/i915/intel_lvds.c +3 -3
@@ -139,7 +139,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);const struct drm_display_mode *adjusted_mode = - &crtc->config.base.adjusted_mode; + &crtc->config->base.adjusted_mode;int pipe = crtc->pipe;u32 temp;
@@ -167,7 +167,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)/* set the corresponsding LVDS_BORDER bit */ temp &= ~LVDS_BORDER_ENABLE ; - temp |= crtc->config.gmch_pfit.lvds_border_bits; + temp |= crtc->config->gmch_pfit.lvds_border_bits;/* Set the B0-B3 data pairs corresponding to whether we're going to * set the DPLLs for dual-channel mode or not. */
@@ -190,7 +190,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)if (INTEL_INFO (dev)->gen ==4 ) {/* Bspec wording suggests that LVDS port dithering only exists * for 18bpp panels. */ -if (crtc->config.dither && crtc->config.pipe_bpp ==18 ) +if (crtc->config->dither && crtc->config->pipe_bpp ==18 ) temp |=LVDS_ENABLE_DITHER ;else temp &= ~LVDS_ENABLE_DITHER ;
drivers/gpu/drm/i915/intel_overlay.c +1 -1
@@ -856,7 +856,7 @@ static int check_overlay_possible_on_crtc(struct intel_overlay *overlay,return -EINVAL ;/* can't use the overlay with double wide pipe */ -if (crtc->config.double_wide) +if (crtc->config->double_wide)return -EINVAL ;return 0 ;
drivers/gpu/drm/i915/intel_pm.c +28 -28
169 lines not on this page · raw message
drivers/gpu/drm/i915/intel_psr.c +4 -4
@@ -79,8 +79,8 @@ static void intel_psr_write_vsc(struct intel_dp *intel_dp,struct drm_device *dev = dig_port->base.base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (dig_port->base.base.crtc); -u32 ctl_reg =HSW_TVIDEO_DIP_CTL (crtc->config.cpu_transcoder); -u32 data_reg =HSW_TVIDEO_DIP_VSC_DATA (crtc->config.cpu_transcoder); +u32 ctl_reg =HSW_TVIDEO_DIP_CTL (crtc->config->cpu_transcoder); +u32 data_reg =HSW_TVIDEO_DIP_VSC_DATA (crtc->config->cpu_transcoder);uint32_t *data = (uint32_t *) vsc_psr;unsigned int i;
@@ -274,13 +274,13 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)if (IS_BROADWELL (dev)) goto out; -if (I915_READ (HSW_STEREO_3D_CTL (intel_crtc->config.cpu_transcoder)) & +if (I915_READ (HSW_STEREO_3D_CTL (intel_crtc->config->cpu_transcoder)) &S3D_ENABLE ) {DRM_DEBUG_KMS ("PSR condition failed: Stereo 3D is Enabled\n" );return false; } -if (intel_crtc->config.base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) { +if (intel_crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) {DRM_DEBUG_KMS ("PSR condition failed: Interlaced is Enabled\n" );return false; }
drivers/gpu/drm/i915/intel_sdvo.c +7 -7
@@ -1007,7 +1007,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, }if (intel_sdvo->rgb_quant_range_selectable) { -if (intel_crtc->config.limited_color_range) +if (intel_crtc->config->limited_color_range) frame.avi.quantization_range =HDMI_QUANTIZATION_RANGE_LIMITED ;else
@@ -1181,8 +1181,8 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *crtc =to_intel_crtc (intel_encoder->base.crtc);struct drm_display_mode *adjusted_mode = - &crtc->config.base.adjusted_mode; -struct drm_display_mode *mode = &crtc->config.base.mode; + &crtc->config->base.adjusted_mode; +struct drm_display_mode *mode = &crtc->config->base.mode;struct intel_sdvo *intel_sdvo =to_sdvo (intel_encoder);u32 sdvox;struct intel_sdvo_in_out_map in_out;
@@ -1224,7 +1224,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder)if (!intel_sdvo_set_target_input (intel_sdvo))return ; -if (crtc->config.has_hdmi_sink) { +if (crtc->config->has_hdmi_sink) {intel_sdvo_set_encode (intel_sdvo,SDVO_ENCODE_HDMI );intel_sdvo_set_colorimetry (intel_sdvo,SDVO_COLORIMETRY_RGB256 );
@@ -1244,7 +1244,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder)DRM_INFO ("Setting input timings on %s failed\n" ,SDVO_NAME (intel_sdvo)); -switch (crtc->config.pixel_multiplier) { +switch (crtc->config->pixel_multiplier) {default :WARN (1 ,"unknown pixel mutlipler specified\n" );case 1 : rate =SDVO_CLOCK_RATE_MULT_1X ;break ;
@@ -1259,7 +1259,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder)/* The real mode polarity is set by the SDVO commands, using * struct intel_sdvo_dtd. */ sdvox =SDVO_VSYNC_ACTIVE_HIGH |SDVO_HSYNC_ACTIVE_HIGH ; -if (!HAS_PCH_SPLIT (dev) && crtc->config.limited_color_range) +if (!HAS_PCH_SPLIT (dev) && crtc->config->limited_color_range) sdvox |=HDMI_COLOR_RANGE_16_235 ;if (INTEL_INFO (dev)->gen <5 ) sdvox |=SDVO_BORDER_ENABLE ;
@@ -1289,7 +1289,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder) }else if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) {/* done in crtc_mode_set as it lives inside the dpll register */ }else { - sdvox |= (crtc->config.pixel_multiplier -1 ) + sdvox |= (crtc->config->pixel_multiplier -1 ) <<SDVO_PORT_MULTIPLY_SHIFT ; }
drivers/gpu/drm/i915/intel_sprite.c +1 -1
@@ -79,7 +79,7 @@ static int usecs_to_scanlines(const struct drm_display_mode *mode, int usecs)bool intel_pipe_update_start (struct intel_crtc *crtc,uint32_t *start_vbl_count) {struct drm_device *dev = crtc->base.dev; -const struct drm_display_mode *mode = &crtc->config.base.adjusted_mode; +const struct drm_display_mode *mode = &crtc->config->base.adjusted_mode;enum pipe pipe = crtc->pipe;long timeout =msecs_to_jiffies_timeout (1 );int scanline, min, max, vblank_start;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH 8/8 drm/i915: Keep drm_crtc->state in sync with intel_crtc->config
In reply to Ander Conselvan de OliveiraSo that atomic operations will reference the right crtc state.
--- drivers/gpu/drm/i915/intel_display.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -10926,6 +10926,7 @@ static void intel_crtc_set_state(struct intel_crtc *crtc, {kfree (crtc->config); crtc->config = crtc_state; + crtc->base.state = &crtc_state->base; } static int __intel_set_mode(struct drm_crtc *crtc,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx