* [PATCH] drm/i915: Pass dev_priv to intel_setup_outputs()
@ 2016-11-23 13:48 Ander Conselvan de Oliveira
2016-11-23 13:59 ` Ville Syrjälä
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Ander Conselvan de Oliveira @ 2016-11-23 13:48 UTC (permalink / raw)
To: intel-gfx; +Cc: Ander Conselvan de Oliveira
Pass dev_priv to intel_setup_outputs() and functions called by it, since
those are all intel i915 specific functions. Also, in the majority of
the functions dev_priv is used more often than dev. In the rare cases
where there are a few calls back into drm core, a local dev variable was
added.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 4 +-
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/intel_crt.c | 7 +-
drivers/gpu/drm/i915/intel_ddi.c | 5 +-
drivers/gpu/drm/i915/intel_display.c | 120 ++++++++++++++++-------------------
drivers/gpu/drm/i915/intel_dp.c | 8 +--
drivers/gpu/drm/i915/intel_drv.h | 22 ++++---
drivers/gpu/drm/i915/intel_dsi.c | 8 +--
drivers/gpu/drm/i915/intel_dvo.c | 9 ++-
drivers/gpu/drm/i915/intel_hdmi.c | 8 +--
drivers/gpu/drm/i915/intel_lvds.c | 4 +-
drivers/gpu/drm/i915/intel_psr.c | 4 +-
drivers/gpu/drm/i915/intel_sdvo.c | 19 +++---
drivers/gpu/drm/i915/intel_tv.c | 4 +-
14 files changed, 107 insertions(+), 117 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 445fec9..5917af1 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1571,7 +1571,7 @@ static int i915_drm_resume(struct drm_device *dev)
intel_pps_unlock_regs_wa(dev_priv);
intel_opregion_setup(dev_priv);
- intel_init_pch_refclk(dev);
+ intel_init_pch_refclk(dev_priv);
drm_mode_config_reset(dev);
/*
@@ -2408,7 +2408,7 @@ static int intel_runtime_resume(struct device *kdev)
intel_guc_resume(dev);
if (IS_GEN6(dev_priv))
- intel_init_pch_refclk(dev);
+ intel_init_pch_refclk(dev_priv);
if (IS_BROXTON(dev_priv)) {
bxt_disable_dc9(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index be67aee..c0d0a0d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3487,7 +3487,7 @@ extern void intel_display_resume(struct drm_device *dev);
extern void i915_redisable_vga(struct drm_i915_private *dev_priv);
extern void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv);
extern bool ironlake_set_drps(struct drm_i915_private *dev_priv, u8 val);
-extern void intel_init_pch_refclk(struct drm_device *dev);
+extern void intel_init_pch_refclk(struct drm_i915_private *dev_priv);
extern void intel_set_rps(struct drm_i915_private *dev_priv, u8 val);
extern void intel_set_memory_cxsr(struct drm_i915_private *dev_priv,
bool enable);
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 86ecec5..385e29a 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -836,12 +836,11 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = {
.destroy = intel_encoder_destroy,
};
-void intel_crt_init(struct drm_device *dev)
+void intel_crt_init(struct drm_i915_private *dev_priv)
{
struct drm_connector *connector;
struct intel_crt *crt;
struct intel_connector *intel_connector;
- struct drm_i915_private *dev_priv = to_i915(dev);
i915_reg_t adpa_reg;
u32 adpa;
@@ -881,10 +880,10 @@ void intel_crt_init(struct drm_device *dev)
connector = &intel_connector->base;
crt->connector = intel_connector;
- drm_connector_init(dev, &intel_connector->base,
+ drm_connector_init(&dev_priv->drm, &intel_connector->base,
&intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
- drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs,
+ drm_encoder_init(&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs,
DRM_MODE_ENCODER_DAC, "CRT");
intel_connector_attach_encoder(intel_connector, &crt->base);
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 10ec9d4..a45dc37 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2154,9 +2154,8 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock)
return pll;
}
-void intel_ddi_init(struct drm_device *dev, enum port port)
+void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_port *intel_dig_port;
struct intel_encoder *intel_encoder;
struct drm_encoder *encoder;
@@ -2218,7 +2217,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
intel_encoder = &intel_dig_port->base;
encoder = &intel_encoder->base;
- drm_encoder_init(dev, encoder, &intel_ddi_funcs,
+ drm_encoder_init(&dev_priv->drm, encoder, &intel_ddi_funcs,
DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port));
intel_encoder->compute_config = intel_ddi_compute_config;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b7a7ed8..0f1b016 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8896,9 +8896,8 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
return ret;
}
-static void ironlake_init_pch_refclk(struct drm_device *dev)
+static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *encoder;
int i;
u32 val, final;
@@ -8910,7 +8909,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
bool using_ssc_source = false;
/* We need to take the global config into account */
- for_each_intel_encoder(dev, encoder) {
+ for_each_intel_encoder(&dev_priv->drm, encoder) {
switch (encoder->type) {
case INTEL_OUTPUT_LVDS:
has_panel = true;
@@ -9166,10 +9165,9 @@ static void lpt_program_fdi_mphy(struct drm_i915_private *dev_priv)
* - Sequence to enable CLKOUT_DP without spread
* - Sequence to enable CLKOUT_DP for FDI usage and configure PCH FDI I/O
*/
-static void lpt_enable_clkout_dp(struct drm_device *dev, bool with_spread,
- bool with_fdi)
+static void lpt_enable_clkout_dp(struct drm_i915_private *dev_priv,
+ bool with_spread, bool with_fdi)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
uint32_t reg, tmp;
if (WARN(with_fdi && !with_spread, "FDI requires downspread\n"))
@@ -9207,9 +9205,8 @@ static void lpt_enable_clkout_dp(struct drm_device *dev, bool with_spread,
}
/* Sequence to disable CLKOUT_DP */
-static void lpt_disable_clkout_dp(struct drm_device *dev)
+static void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
uint32_t reg, tmp;
mutex_lock(&dev_priv->sb_lock);
@@ -9294,12 +9291,12 @@ static void lpt_bend_clkout_dp(struct drm_i915_private *dev_priv, int steps)
#undef BEND_IDX
-static void lpt_init_pch_refclk(struct drm_device *dev)
+static void lpt_init_pch_refclk(struct drm_i915_private *dev_priv)
{
struct intel_encoder *encoder;
bool has_vga = false;
- for_each_intel_encoder(dev, encoder) {
+ for_each_intel_encoder(&dev_priv->drm, encoder) {
switch (encoder->type) {
case INTEL_OUTPUT_ANALOG:
has_vga = true;
@@ -9310,24 +9307,22 @@ static void lpt_init_pch_refclk(struct drm_device *dev)
}
if (has_vga) {
- lpt_bend_clkout_dp(to_i915(dev), 0);
- lpt_enable_clkout_dp(dev, true, true);
+ lpt_bend_clkout_dp(dev_priv, 0);
+ lpt_enable_clkout_dp(dev_priv, true, true);
} else {
- lpt_disable_clkout_dp(dev);
+ lpt_disable_clkout_dp(dev_priv);
}
}
/*
* Initialize reference clocks when the driver loads
*/
-void intel_init_pch_refclk(struct drm_device *dev)
+void intel_init_pch_refclk(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
-
if (HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))
- ironlake_init_pch_refclk(dev);
+ ironlake_init_pch_refclk(dev_priv);
else if (HAS_PCH_LPT(dev_priv))
- lpt_init_pch_refclk(dev);
+ lpt_init_pch_refclk(dev_priv);
}
static void ironlake_set_pipeconf(struct drm_crtc *crtc)
@@ -10174,7 +10169,6 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)
*/
void hsw_enable_pc8(struct drm_i915_private *dev_priv)
{
- struct drm_device *dev = &dev_priv->drm;
uint32_t val;
DRM_DEBUG_KMS("Enabling package C8+\n");
@@ -10185,19 +10179,18 @@ void hsw_enable_pc8(struct drm_i915_private *dev_priv)
I915_WRITE(SOUTH_DSPCLK_GATE_D, val);
}
- lpt_disable_clkout_dp(dev);
+ lpt_disable_clkout_dp(dev_priv);
hsw_disable_lcpll(dev_priv, true, true);
}
void hsw_disable_pc8(struct drm_i915_private *dev_priv)
{
- struct drm_device *dev = &dev_priv->drm;
uint32_t val;
DRM_DEBUG_KMS("Disabling package C8+\n");
hsw_restore_lcpll(dev_priv);
- lpt_init_pch_refclk(dev);
+ lpt_init_pch_refclk(dev_priv);
if (HAS_PCH_LPT_LP(dev_priv)) {
val = I915_READ(SOUTH_DSPCLK_GATE_D);
@@ -15454,9 +15447,8 @@ static void intel_pps_init(struct drm_i915_private *dev_priv)
intel_pps_unlock_regs_wa(dev_priv);
}
-static void intel_setup_outputs(struct drm_device *dev)
+static void intel_setup_outputs(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *encoder;
bool dpd_is_edp = false;
@@ -15467,10 +15459,10 @@ static void intel_setup_outputs(struct drm_device *dev)
* prevent the registeration of both eDP and LVDS and the incorrect
* sharing of the PPS.
*/
- intel_lvds_init(dev);
+ intel_lvds_init(dev_priv);
if (intel_crt_present(dev_priv))
- intel_crt_init(dev);
+ intel_crt_init(dev_priv);
if (IS_BROXTON(dev_priv)) {
/*
@@ -15478,11 +15470,11 @@ static void intel_setup_outputs(struct drm_device *dev)
* DDI_BUF_CTL_A or SFUSE_STRAP registers, find another way to
* detect the ports.
*/
- intel_ddi_init(dev, PORT_A);
- intel_ddi_init(dev, PORT_B);
- intel_ddi_init(dev, PORT_C);
+ intel_ddi_init(dev_priv, PORT_A);
+ intel_ddi_init(dev_priv, PORT_B);
+ intel_ddi_init(dev_priv, PORT_C);
- intel_dsi_init(dev);
+ intel_dsi_init(dev_priv);
} else if (HAS_DDI(dev_priv)) {
int found;
@@ -15494,18 +15486,18 @@ static void intel_setup_outputs(struct drm_device *dev)
found = I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED;
/* WaIgnoreDDIAStrap: skl */
if (found || IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
- intel_ddi_init(dev, PORT_A);
+ intel_ddi_init(dev_priv, PORT_A);
/* DDI B, C and D detection is indicated by the SFUSE_STRAP
* register */
found = I915_READ(SFUSE_STRAP);
if (found & SFUSE_STRAP_DDIB_DETECTED)
- intel_ddi_init(dev, PORT_B);
+ intel_ddi_init(dev_priv, PORT_B);
if (found & SFUSE_STRAP_DDIC_DETECTED)
- intel_ddi_init(dev, PORT_C);
+ intel_ddi_init(dev_priv, PORT_C);
if (found & SFUSE_STRAP_DDID_DETECTED)
- intel_ddi_init(dev, PORT_D);
+ intel_ddi_init(dev_priv, PORT_D);
/*
* On SKL we don't have a way to detect DDI-E so we rely on VBT.
*/
@@ -15513,35 +15505,35 @@ static void intel_setup_outputs(struct drm_device *dev)
(dev_priv->vbt.ddi_port_info[PORT_E].supports_dp ||
dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi ||
dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi))
- intel_ddi_init(dev, PORT_E);
+ intel_ddi_init(dev_priv, PORT_E);
} else if (HAS_PCH_SPLIT(dev_priv)) {
int found;
dpd_is_edp = intel_dp_is_edp(dev_priv, PORT_D);
if (has_edp_a(dev_priv))
- intel_dp_init(dev, DP_A, PORT_A);
+ intel_dp_init(dev_priv, DP_A, PORT_A);
if (I915_READ(PCH_HDMIB) & SDVO_DETECTED) {
/* PCH SDVOB multiplex with HDMIB */
- found = intel_sdvo_init(dev, PCH_SDVOB, PORT_B);
+ found = intel_sdvo_init(dev_priv, PCH_SDVOB, PORT_B);
if (!found)
- intel_hdmi_init(dev, PCH_HDMIB, PORT_B);
+ intel_hdmi_init(dev_priv, PCH_HDMIB, PORT_B);
if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED))
- intel_dp_init(dev, PCH_DP_B, PORT_B);
+ intel_dp_init(dev_priv, PCH_DP_B, PORT_B);
}
if (I915_READ(PCH_HDMIC) & SDVO_DETECTED)
- intel_hdmi_init(dev, PCH_HDMIC, PORT_C);
+ intel_hdmi_init(dev_priv, PCH_HDMIC, PORT_C);
if (!dpd_is_edp && I915_READ(PCH_HDMID) & SDVO_DETECTED)
- intel_hdmi_init(dev, PCH_HDMID, PORT_D);
+ intel_hdmi_init(dev_priv, PCH_HDMID, PORT_D);
if (I915_READ(PCH_DP_C) & DP_DETECTED)
- intel_dp_init(dev, PCH_DP_C, PORT_C);
+ intel_dp_init(dev_priv, PCH_DP_C, PORT_C);
if (I915_READ(PCH_DP_D) & DP_DETECTED)
- intel_dp_init(dev, PCH_DP_D, PORT_D);
+ intel_dp_init(dev_priv, PCH_DP_D, PORT_D);
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
bool has_edp, has_port;
@@ -15563,16 +15555,16 @@ static void intel_setup_outputs(struct drm_device *dev)
has_edp = intel_dp_is_edp(dev_priv, PORT_B);
has_port = intel_bios_is_port_present(dev_priv, PORT_B);
if (I915_READ(VLV_DP_B) & DP_DETECTED || has_port)
- has_edp &= intel_dp_init(dev, VLV_DP_B, PORT_B);
+ has_edp &= intel_dp_init(dev_priv, VLV_DP_B, PORT_B);
if ((I915_READ(VLV_HDMIB) & SDVO_DETECTED || has_port) && !has_edp)
- intel_hdmi_init(dev, VLV_HDMIB, PORT_B);
+ intel_hdmi_init(dev_priv, VLV_HDMIB, PORT_B);
has_edp = intel_dp_is_edp(dev_priv, PORT_C);
has_port = intel_bios_is_port_present(dev_priv, PORT_C);
if (I915_READ(VLV_DP_C) & DP_DETECTED || has_port)
- has_edp &= intel_dp_init(dev, VLV_DP_C, PORT_C);
+ has_edp &= intel_dp_init(dev_priv, VLV_DP_C, PORT_C);
if ((I915_READ(VLV_HDMIC) & SDVO_DETECTED || has_port) && !has_edp)
- intel_hdmi_init(dev, VLV_HDMIC, PORT_C);
+ intel_hdmi_init(dev_priv, VLV_HDMIC, PORT_C);
if (IS_CHERRYVIEW(dev_priv)) {
/*
@@ -15581,63 +15573,63 @@ static void intel_setup_outputs(struct drm_device *dev)
*/
has_port = intel_bios_is_port_present(dev_priv, PORT_D);
if (I915_READ(CHV_DP_D) & DP_DETECTED || has_port)
- intel_dp_init(dev, CHV_DP_D, PORT_D);
+ intel_dp_init(dev_priv, CHV_DP_D, PORT_D);
if (I915_READ(CHV_HDMID) & SDVO_DETECTED || has_port)
- intel_hdmi_init(dev, CHV_HDMID, PORT_D);
+ intel_hdmi_init(dev_priv, CHV_HDMID, PORT_D);
}
- intel_dsi_init(dev);
+ intel_dsi_init(dev_priv);
} else if (!IS_GEN2(dev_priv) && !IS_PINEVIEW(dev_priv)) {
bool found = false;
if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
DRM_DEBUG_KMS("probing SDVOB\n");
- found = intel_sdvo_init(dev, GEN3_SDVOB, PORT_B);
+ found = intel_sdvo_init(dev_priv, GEN3_SDVOB, PORT_B);
if (!found && IS_G4X(dev_priv)) {
DRM_DEBUG_KMS("probing HDMI on SDVOB\n");
- intel_hdmi_init(dev, GEN4_HDMIB, PORT_B);
+ intel_hdmi_init(dev_priv, GEN4_HDMIB, PORT_B);
}
if (!found && IS_G4X(dev_priv))
- intel_dp_init(dev, DP_B, PORT_B);
+ intel_dp_init(dev_priv, DP_B, PORT_B);
}
/* Before G4X SDVOC doesn't have its own detect register */
if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
DRM_DEBUG_KMS("probing SDVOC\n");
- found = intel_sdvo_init(dev, GEN3_SDVOC, PORT_C);
+ found = intel_sdvo_init(dev_priv, GEN3_SDVOC, PORT_C);
}
if (!found && (I915_READ(GEN3_SDVOC) & SDVO_DETECTED)) {
if (IS_G4X(dev_priv)) {
DRM_DEBUG_KMS("probing HDMI on SDVOC\n");
- intel_hdmi_init(dev, GEN4_HDMIC, PORT_C);
+ intel_hdmi_init(dev_priv, GEN4_HDMIC, PORT_C);
}
if (IS_G4X(dev_priv))
- intel_dp_init(dev, DP_C, PORT_C);
+ intel_dp_init(dev_priv, DP_C, PORT_C);
}
if (IS_G4X(dev_priv) && (I915_READ(DP_D) & DP_DETECTED))
- intel_dp_init(dev, DP_D, PORT_D);
+ intel_dp_init(dev_priv, DP_D, PORT_D);
} else if (IS_GEN2(dev_priv))
- intel_dvo_init(dev);
+ intel_dvo_init(dev_priv);
if (SUPPORTS_TV(dev_priv))
- intel_tv_init(dev);
+ intel_tv_init(dev_priv);
- intel_psr_init(dev);
+ intel_psr_init(dev_priv);
- for_each_intel_encoder(dev, encoder) {
+ for_each_intel_encoder(&dev_priv->drm, encoder) {
encoder->base.possible_crtcs = encoder->crtc_mask;
encoder->base.possible_clones =
intel_encoder_clones(encoder);
}
- intel_init_pch_refclk(dev);
+ intel_init_pch_refclk(dev_priv);
- drm_helper_move_panel_connectors_to_head(dev);
+ drm_helper_move_panel_connectors_to_head(&dev_priv->drm);
}
static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
@@ -16492,7 +16484,7 @@ int intel_modeset_init(struct drm_device *dev)
/* Just disable it once at startup */
i915_disable_vga(dev_priv);
- intel_setup_outputs(dev);
+ intel_setup_outputs(dev_priv);
drm_modeset_lock_all(dev);
intel_modeset_setup_hw_state(dev);
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 90283ed..7967fcc 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5766,11 +5766,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
return false;
}
-bool intel_dp_init(struct drm_device *dev,
+bool intel_dp_init(struct drm_i915_private *dev_priv,
i915_reg_t output_reg,
enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_port *intel_dig_port;
struct intel_encoder *intel_encoder;
struct drm_encoder *encoder;
@@ -5787,8 +5786,9 @@ bool intel_dp_init(struct drm_device *dev,
intel_encoder = &intel_dig_port->base;
encoder = &intel_encoder->base;
- if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
- DRM_MODE_ENCODER_TMDS, "DP %c", port_name(port)))
+ if (drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
+ &intel_dp_enc_funcs, DRM_MODE_ENCODER_TMDS,
+ "DP %c", port_name(port)))
goto err_encoder_init;
intel_encoder->compute_config = intel_dp_compute_config;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index cd132c2..43f6f4e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1141,7 +1141,7 @@ void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv);
void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv);
/* intel_crt.c */
-void intel_crt_init(struct drm_device *dev);
+void intel_crt_init(struct drm_i915_private *dev_priv);
void intel_crt_reset(struct drm_encoder *encoder);
/* intel_ddi.c */
@@ -1152,7 +1152,7 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,
struct drm_connector_state *old_conn_state);
void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder);
void hsw_fdi_link_train(struct drm_crtc *crtc);
-void intel_ddi_init(struct drm_device *dev, enum port port);
+void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port);
enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder);
bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);
void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc);
@@ -1377,7 +1377,8 @@ void intel_csr_ucode_suspend(struct drm_i915_private *);
void intel_csr_ucode_resume(struct drm_i915_private *);
/* intel_dp.c */
-bool intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
+bool intel_dp_init(struct drm_i915_private *dev_priv, i915_reg_t output_reg,
+ enum port port);
bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
struct intel_connector *intel_connector);
void intel_dp_set_link_params(struct intel_dp *intel_dp,
@@ -1452,13 +1453,13 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
/* intel_dsi.c */
-void intel_dsi_init(struct drm_device *dev);
+void intel_dsi_init(struct drm_i915_private *dev_priv);
/* intel_dsi_dcs_backlight.c */
int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
/* intel_dvo.c */
-void intel_dvo_init(struct drm_device *dev);
+void intel_dvo_init(struct drm_i915_private *dev_priv);
/* intel_hotplug.c */
void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
@@ -1522,7 +1523,8 @@ void intel_fbc_cleanup_cfb(struct drm_i915_private *dev_priv);
void intel_fbc_handle_fifo_underrun_irq(struct drm_i915_private *dev_priv);
/* intel_hdmi.c */
-void intel_hdmi_init(struct drm_device *dev, i915_reg_t hdmi_reg, enum port port);
+void intel_hdmi_init(struct drm_i915_private *dev_priv, i915_reg_t hdmi_reg,
+ enum port port);
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);
@@ -1533,7 +1535,7 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable);
/* intel_lvds.c */
-void intel_lvds_init(struct drm_device *dev);
+void intel_lvds_init(struct drm_i915_private *dev_priv);
struct intel_encoder *intel_get_lvds_encoder(struct drm_device *dev);
bool intel_is_dual_link_lvds(struct drm_device *dev);
@@ -1606,7 +1608,7 @@ void intel_psr_invalidate(struct drm_i915_private *dev_priv,
void intel_psr_flush(struct drm_i915_private *dev_priv,
unsigned frontbuffer_bits,
enum fb_op_origin origin);
-void intel_psr_init(struct drm_device *dev);
+void intel_psr_init(struct drm_i915_private *dev_priv);
void intel_psr_single_frame_update(struct drm_i915_private *dev_priv,
unsigned frontbuffer_bits);
@@ -1751,7 +1753,7 @@ static inline int intel_enable_rc6(void)
}
/* intel_sdvo.c */
-bool intel_sdvo_init(struct drm_device *dev,
+bool intel_sdvo_init(struct drm_i915_private *dev_priv,
i915_reg_t reg, enum port port);
@@ -1766,7 +1768,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc);
void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work);
/* intel_tv.c */
-void intel_tv_init(struct drm_device *dev);
+void intel_tv_init(struct drm_i915_private *dev_priv);
/* intel_atomic.c */
int intel_connector_atomic_get_property(struct drm_connector *connector,
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 4e0d025..fe9a359 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1431,15 +1431,15 @@ static void intel_dsi_add_properties(struct intel_connector *connector)
}
}
-void intel_dsi_init(struct drm_device *dev)
+void intel_dsi_init(struct drm_i915_private *dev_priv)
{
+ struct drm_device *dev = &dev_priv->drm;
struct intel_dsi *intel_dsi;
struct intel_encoder *intel_encoder;
struct drm_encoder *encoder;
struct intel_connector *intel_connector;
struct drm_connector *connector;
struct drm_display_mode *scan, *fixed_mode = NULL;
- struct drm_i915_private *dev_priv = to_i915(dev);
enum port port;
unsigned int i;
@@ -1474,8 +1474,8 @@ void intel_dsi_init(struct drm_device *dev)
connector = &intel_connector->base;
- drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,
- "DSI %c", port_name(port));
+ drm_encoder_init(&dev_priv->drm, encoder, &intel_dsi_funcs,
+ DRM_MODE_ENCODER_DSI, "DSI %c", port_name(port));
intel_encoder->compute_config = intel_dsi_compute_config;
intel_encoder->pre_enable = intel_dsi_pre_enable;
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 7086454..50da89d 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -422,9 +422,8 @@ static enum port intel_dvo_port(i915_reg_t dvo_reg)
return PORT_C;
}
-void intel_dvo_init(struct drm_device *dev)
+void intel_dvo_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *intel_encoder;
struct intel_dvo *intel_dvo;
struct intel_connector *intel_connector;
@@ -511,7 +510,7 @@ void intel_dvo_init(struct drm_device *dev)
continue;
port = intel_dvo_port(dvo->dvo_reg);
- drm_encoder_init(dev, &intel_encoder->base,
+ drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
&intel_dvo_enc_funcs, encoder_type,
"DVO %c", port_name(port));
@@ -523,14 +522,14 @@ void intel_dvo_init(struct drm_device *dev)
case INTEL_DVO_CHIP_TMDS:
intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |
(1 << INTEL_OUTPUT_DVO);
- drm_connector_init(dev, connector,
+ drm_connector_init(&dev_priv->drm, connector,
&intel_dvo_connector_funcs,
DRM_MODE_CONNECTOR_DVII);
encoder_type = DRM_MODE_ENCODER_TMDS;
break;
case INTEL_DVO_CHIP_LVDS:
intel_encoder->cloneable = 0;
- drm_connector_init(dev, connector,
+ drm_connector_init(&dev_priv->drm, connector,
&intel_dvo_connector_funcs,
DRM_MODE_CONNECTOR_LVDS);
encoder_type = DRM_MODE_ENCODER_LVDS;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index fb88e32..c0504c6 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1933,10 +1933,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
}
}
-void intel_hdmi_init(struct drm_device *dev,
+void intel_hdmi_init(struct drm_i915_private *dev_priv,
i915_reg_t hdmi_reg, enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_port *intel_dig_port;
struct intel_encoder *intel_encoder;
struct intel_connector *intel_connector;
@@ -1953,8 +1952,9 @@ void intel_hdmi_init(struct drm_device *dev,
intel_encoder = &intel_dig_port->base;
- drm_encoder_init(dev, &intel_encoder->base, &intel_hdmi_enc_funcs,
- DRM_MODE_ENCODER_TMDS, "HDMI %c", port_name(port));
+ drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
+ &intel_hdmi_enc_funcs, DRM_MODE_ENCODER_TMDS,
+ "HDMI %c", port_name(port));
intel_encoder->compute_config = intel_hdmi_compute_config;
if (HAS_PCH_SPLIT(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index d12ef00..ea1ce17 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -971,9 +971,9 @@ static bool intel_lvds_supported(struct drm_i915_private *dev_priv)
* Create the connector, register the LVDS DDC bus, and try to figure out what
* modes we can display on the LVDS panel (if present).
*/
-void intel_lvds_init(struct drm_device *dev)
+void intel_lvds_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_device *dev = &dev_priv->drm;
struct intel_lvds_encoder *lvds_encoder;
struct intel_encoder *intel_encoder;
struct intel_lvds_connector *lvds_connector;
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 7b488e2..5c3616e 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -818,10 +818,8 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,
* This function is called only once at driver load to initialize basic
* PSR stuff.
*/
-void intel_psr_init(struct drm_device *dev)
+void intel_psr_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
-
dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 27808e9..054acd9 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2342,9 +2342,9 @@ intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo, int device)
}
static u8
-intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo)
+intel_sdvo_get_slave_addr(struct drm_i915_private *dev_priv,
+ struct intel_sdvo *sdvo)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct sdvo_device_mapping *my_mapping, *other_mapping;
if (sdvo->port == PORT_B) {
@@ -2934,9 +2934,9 @@ static const struct i2c_algorithm intel_sdvo_ddc_proxy = {
static bool
intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo,
- struct drm_device *dev)
+ struct drm_i915_private *dev_priv)
{
- struct pci_dev *pdev = dev->pdev;
+ struct pci_dev *pdev = dev_priv->drm.pdev;
sdvo->ddc.owner = THIS_MODULE;
sdvo->ddc.class = I2C_CLASS_DDC;
@@ -2957,10 +2957,9 @@ static void assert_sdvo_port_valid(const struct drm_i915_private *dev_priv,
WARN_ON(port != PORT_B && port != PORT_C);
}
-bool intel_sdvo_init(struct drm_device *dev,
+bool intel_sdvo_init(struct drm_i915_private *dev_priv,
i915_reg_t sdvo_reg, enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *intel_encoder;
struct intel_sdvo *intel_sdvo;
int i;
@@ -2973,16 +2972,18 @@ bool intel_sdvo_init(struct drm_device *dev,
intel_sdvo->sdvo_reg = sdvo_reg;
intel_sdvo->port = port;
- intel_sdvo->slave_addr = intel_sdvo_get_slave_addr(dev, intel_sdvo) >> 1;
+ intel_sdvo->slave_addr =
+ intel_sdvo_get_slave_addr(dev_priv, intel_sdvo) >> 1;
intel_sdvo_select_i2c_bus(dev_priv, intel_sdvo);
- if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev))
+ if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev_priv))
goto err_i2c_bus;
/* encoder type will be decided later */
intel_encoder = &intel_sdvo->base;
intel_encoder->type = INTEL_OUTPUT_SDVO;
intel_encoder->port = port;
- drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0,
+ drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
+ &intel_sdvo_enc_funcs, 0,
"SDVO %c", port_name(port));
/* Read the regs to test if we can talk to the device */
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 78cdfc6..eb692e4 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1537,9 +1537,9 @@ static const struct drm_encoder_funcs intel_tv_enc_funcs = {
};
void
-intel_tv_init(struct drm_device *dev)
+intel_tv_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_device *dev = &dev_priv->drm;
struct drm_connector *connector;
struct intel_tv *intel_tv;
struct intel_encoder *intel_encoder;
--
2.5.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: Pass dev_priv to intel_setup_outputs()
2016-11-23 13:48 [PATCH] drm/i915: Pass dev_priv to intel_setup_outputs() Ander Conselvan de Oliveira
@ 2016-11-23 13:59 ` Ville Syrjälä
2016-11-23 14:21 ` [PATCH v2] " Ander Conselvan de Oliveira
2016-11-23 16:46 ` ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev2) Patchwork
2016-11-29 14:53 ` ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev3) Patchwork
2 siblings, 1 reply; 14+ messages in thread
From: Ville Syrjälä @ 2016-11-23 13:59 UTC (permalink / raw)
To: Ander Conselvan de Oliveira; +Cc: intel-gfx
On Wed, Nov 23, 2016 at 03:48:30PM +0200, Ander Conselvan de Oliveira wrote:
> Pass dev_priv to intel_setup_outputs() and functions called by it, since
> those are all intel i915 specific functions. Also, in the majority of
> the functions dev_priv is used more often than dev. In the rare cases
> where there are a few calls back into drm core, a local dev variable was
> added.
>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 4 +-
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/intel_crt.c | 7 +-
> drivers/gpu/drm/i915/intel_ddi.c | 5 +-
> drivers/gpu/drm/i915/intel_display.c | 120 ++++++++++++++++-------------------
> drivers/gpu/drm/i915/intel_dp.c | 8 +--
> drivers/gpu/drm/i915/intel_drv.h | 22 ++++---
> drivers/gpu/drm/i915/intel_dsi.c | 8 +--
> drivers/gpu/drm/i915/intel_dvo.c | 9 ++-
> drivers/gpu/drm/i915/intel_hdmi.c | 8 +--
> drivers/gpu/drm/i915/intel_lvds.c | 4 +-
> drivers/gpu/drm/i915/intel_psr.c | 4 +-
> drivers/gpu/drm/i915/intel_sdvo.c | 19 +++---
> drivers/gpu/drm/i915/intel_tv.c | 4 +-
> 14 files changed, 107 insertions(+), 117 deletions(-)
>
<snip>
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 4e0d025..fe9a359 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -1431,15 +1431,15 @@ static void intel_dsi_add_properties(struct intel_connector *connector)
> }
> }
>
> -void intel_dsi_init(struct drm_device *dev)
> +void intel_dsi_init(struct drm_i915_private *dev_priv)
> {
> + struct drm_device *dev = &dev_priv->drm;
> struct intel_dsi *intel_dsi;
> struct intel_encoder *intel_encoder;
> struct drm_encoder *encoder;
> struct intel_connector *intel_connector;
> struct drm_connector *connector;
> struct drm_display_mode *scan, *fixed_mode = NULL;
> - struct drm_i915_private *dev_priv = to_i915(dev);
> enum port port;
> unsigned int i;
>
> @@ -1474,8 +1474,8 @@ void intel_dsi_init(struct drm_device *dev)
>
> connector = &intel_connector->base;
>
> - drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,
> - "DSI %c", port_name(port));
> + drm_encoder_init(&dev_priv->drm, encoder, &intel_dsi_funcs,
> + DRM_MODE_ENCODER_DSI, "DSI %c", port_name(port));
Here you have introduced a local 'dev', so this hunk doesn't seem
necessary. But no biggie. Patch lgtm.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2] drm/i915: Pass dev_priv to intel_setup_outputs()
2016-11-23 13:59 ` Ville Syrjälä
@ 2016-11-23 14:21 ` Ander Conselvan de Oliveira
2016-11-24 3:44 ` kbuild test robot
0 siblings, 1 reply; 14+ messages in thread
From: Ander Conselvan de Oliveira @ 2016-11-23 14:21 UTC (permalink / raw)
To: intel-gfx; +Cc: Ander Conselvan de Oliveira
Pass dev_priv to intel_setup_outputs() and functions called by it, since
those are all intel i915 specific functions. Also, in the majority of
the functions dev_priv is used more often than dev. In the rare cases
where there are a few calls back into drm core, a local dev variable was
added.
v2: Don't convert dev to &dev_priv->drm in intel_dsi_init. (Ville)
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 4 +-
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/intel_crt.c | 7 +-
drivers/gpu/drm/i915/intel_ddi.c | 5 +-
drivers/gpu/drm/i915/intel_display.c | 120 ++++++++++++++++-------------------
drivers/gpu/drm/i915/intel_dp.c | 8 +--
drivers/gpu/drm/i915/intel_drv.h | 22 ++++---
drivers/gpu/drm/i915/intel_dsi.c | 4 +-
drivers/gpu/drm/i915/intel_dvo.c | 9 ++-
drivers/gpu/drm/i915/intel_hdmi.c | 8 +--
drivers/gpu/drm/i915/intel_lvds.c | 4 +-
drivers/gpu/drm/i915/intel_psr.c | 4 +-
drivers/gpu/drm/i915/intel_sdvo.c | 19 +++---
drivers/gpu/drm/i915/intel_tv.c | 4 +-
14 files changed, 105 insertions(+), 115 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 445fec9..5917af1 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1571,7 +1571,7 @@ static int i915_drm_resume(struct drm_device *dev)
intel_pps_unlock_regs_wa(dev_priv);
intel_opregion_setup(dev_priv);
- intel_init_pch_refclk(dev);
+ intel_init_pch_refclk(dev_priv);
drm_mode_config_reset(dev);
/*
@@ -2408,7 +2408,7 @@ static int intel_runtime_resume(struct device *kdev)
intel_guc_resume(dev);
if (IS_GEN6(dev_priv))
- intel_init_pch_refclk(dev);
+ intel_init_pch_refclk(dev_priv);
if (IS_BROXTON(dev_priv)) {
bxt_disable_dc9(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index be67aee..c0d0a0d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3487,7 +3487,7 @@ extern void intel_display_resume(struct drm_device *dev);
extern void i915_redisable_vga(struct drm_i915_private *dev_priv);
extern void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv);
extern bool ironlake_set_drps(struct drm_i915_private *dev_priv, u8 val);
-extern void intel_init_pch_refclk(struct drm_device *dev);
+extern void intel_init_pch_refclk(struct drm_i915_private *dev_priv);
extern void intel_set_rps(struct drm_i915_private *dev_priv, u8 val);
extern void intel_set_memory_cxsr(struct drm_i915_private *dev_priv,
bool enable);
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 86ecec5..385e29a 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -836,12 +836,11 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = {
.destroy = intel_encoder_destroy,
};
-void intel_crt_init(struct drm_device *dev)
+void intel_crt_init(struct drm_i915_private *dev_priv)
{
struct drm_connector *connector;
struct intel_crt *crt;
struct intel_connector *intel_connector;
- struct drm_i915_private *dev_priv = to_i915(dev);
i915_reg_t adpa_reg;
u32 adpa;
@@ -881,10 +880,10 @@ void intel_crt_init(struct drm_device *dev)
connector = &intel_connector->base;
crt->connector = intel_connector;
- drm_connector_init(dev, &intel_connector->base,
+ drm_connector_init(&dev_priv->drm, &intel_connector->base,
&intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
- drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs,
+ drm_encoder_init(&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs,
DRM_MODE_ENCODER_DAC, "CRT");
intel_connector_attach_encoder(intel_connector, &crt->base);
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 10ec9d4..a45dc37 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2154,9 +2154,8 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock)
return pll;
}
-void intel_ddi_init(struct drm_device *dev, enum port port)
+void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_port *intel_dig_port;
struct intel_encoder *intel_encoder;
struct drm_encoder *encoder;
@@ -2218,7 +2217,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
intel_encoder = &intel_dig_port->base;
encoder = &intel_encoder->base;
- drm_encoder_init(dev, encoder, &intel_ddi_funcs,
+ drm_encoder_init(&dev_priv->drm, encoder, &intel_ddi_funcs,
DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port));
intel_encoder->compute_config = intel_ddi_compute_config;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b7a7ed8..0f1b016 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8896,9 +8896,8 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
return ret;
}
-static void ironlake_init_pch_refclk(struct drm_device *dev)
+static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *encoder;
int i;
u32 val, final;
@@ -8910,7 +8909,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
bool using_ssc_source = false;
/* We need to take the global config into account */
- for_each_intel_encoder(dev, encoder) {
+ for_each_intel_encoder(&dev_priv->drm, encoder) {
switch (encoder->type) {
case INTEL_OUTPUT_LVDS:
has_panel = true;
@@ -9166,10 +9165,9 @@ static void lpt_program_fdi_mphy(struct drm_i915_private *dev_priv)
* - Sequence to enable CLKOUT_DP without spread
* - Sequence to enable CLKOUT_DP for FDI usage and configure PCH FDI I/O
*/
-static void lpt_enable_clkout_dp(struct drm_device *dev, bool with_spread,
- bool with_fdi)
+static void lpt_enable_clkout_dp(struct drm_i915_private *dev_priv,
+ bool with_spread, bool with_fdi)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
uint32_t reg, tmp;
if (WARN(with_fdi && !with_spread, "FDI requires downspread\n"))
@@ -9207,9 +9205,8 @@ static void lpt_enable_clkout_dp(struct drm_device *dev, bool with_spread,
}
/* Sequence to disable CLKOUT_DP */
-static void lpt_disable_clkout_dp(struct drm_device *dev)
+static void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
uint32_t reg, tmp;
mutex_lock(&dev_priv->sb_lock);
@@ -9294,12 +9291,12 @@ static void lpt_bend_clkout_dp(struct drm_i915_private *dev_priv, int steps)
#undef BEND_IDX
-static void lpt_init_pch_refclk(struct drm_device *dev)
+static void lpt_init_pch_refclk(struct drm_i915_private *dev_priv)
{
struct intel_encoder *encoder;
bool has_vga = false;
- for_each_intel_encoder(dev, encoder) {
+ for_each_intel_encoder(&dev_priv->drm, encoder) {
switch (encoder->type) {
case INTEL_OUTPUT_ANALOG:
has_vga = true;
@@ -9310,24 +9307,22 @@ static void lpt_init_pch_refclk(struct drm_device *dev)
}
if (has_vga) {
- lpt_bend_clkout_dp(to_i915(dev), 0);
- lpt_enable_clkout_dp(dev, true, true);
+ lpt_bend_clkout_dp(dev_priv, 0);
+ lpt_enable_clkout_dp(dev_priv, true, true);
} else {
- lpt_disable_clkout_dp(dev);
+ lpt_disable_clkout_dp(dev_priv);
}
}
/*
* Initialize reference clocks when the driver loads
*/
-void intel_init_pch_refclk(struct drm_device *dev)
+void intel_init_pch_refclk(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
-
if (HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))
- ironlake_init_pch_refclk(dev);
+ ironlake_init_pch_refclk(dev_priv);
else if (HAS_PCH_LPT(dev_priv))
- lpt_init_pch_refclk(dev);
+ lpt_init_pch_refclk(dev_priv);
}
static void ironlake_set_pipeconf(struct drm_crtc *crtc)
@@ -10174,7 +10169,6 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)
*/
void hsw_enable_pc8(struct drm_i915_private *dev_priv)
{
- struct drm_device *dev = &dev_priv->drm;
uint32_t val;
DRM_DEBUG_KMS("Enabling package C8+\n");
@@ -10185,19 +10179,18 @@ void hsw_enable_pc8(struct drm_i915_private *dev_priv)
I915_WRITE(SOUTH_DSPCLK_GATE_D, val);
}
- lpt_disable_clkout_dp(dev);
+ lpt_disable_clkout_dp(dev_priv);
hsw_disable_lcpll(dev_priv, true, true);
}
void hsw_disable_pc8(struct drm_i915_private *dev_priv)
{
- struct drm_device *dev = &dev_priv->drm;
uint32_t val;
DRM_DEBUG_KMS("Disabling package C8+\n");
hsw_restore_lcpll(dev_priv);
- lpt_init_pch_refclk(dev);
+ lpt_init_pch_refclk(dev_priv);
if (HAS_PCH_LPT_LP(dev_priv)) {
val = I915_READ(SOUTH_DSPCLK_GATE_D);
@@ -15454,9 +15447,8 @@ static void intel_pps_init(struct drm_i915_private *dev_priv)
intel_pps_unlock_regs_wa(dev_priv);
}
-static void intel_setup_outputs(struct drm_device *dev)
+static void intel_setup_outputs(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *encoder;
bool dpd_is_edp = false;
@@ -15467,10 +15459,10 @@ static void intel_setup_outputs(struct drm_device *dev)
* prevent the registeration of both eDP and LVDS and the incorrect
* sharing of the PPS.
*/
- intel_lvds_init(dev);
+ intel_lvds_init(dev_priv);
if (intel_crt_present(dev_priv))
- intel_crt_init(dev);
+ intel_crt_init(dev_priv);
if (IS_BROXTON(dev_priv)) {
/*
@@ -15478,11 +15470,11 @@ static void intel_setup_outputs(struct drm_device *dev)
* DDI_BUF_CTL_A or SFUSE_STRAP registers, find another way to
* detect the ports.
*/
- intel_ddi_init(dev, PORT_A);
- intel_ddi_init(dev, PORT_B);
- intel_ddi_init(dev, PORT_C);
+ intel_ddi_init(dev_priv, PORT_A);
+ intel_ddi_init(dev_priv, PORT_B);
+ intel_ddi_init(dev_priv, PORT_C);
- intel_dsi_init(dev);
+ intel_dsi_init(dev_priv);
} else if (HAS_DDI(dev_priv)) {
int found;
@@ -15494,18 +15486,18 @@ static void intel_setup_outputs(struct drm_device *dev)
found = I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED;
/* WaIgnoreDDIAStrap: skl */
if (found || IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
- intel_ddi_init(dev, PORT_A);
+ intel_ddi_init(dev_priv, PORT_A);
/* DDI B, C and D detection is indicated by the SFUSE_STRAP
* register */
found = I915_READ(SFUSE_STRAP);
if (found & SFUSE_STRAP_DDIB_DETECTED)
- intel_ddi_init(dev, PORT_B);
+ intel_ddi_init(dev_priv, PORT_B);
if (found & SFUSE_STRAP_DDIC_DETECTED)
- intel_ddi_init(dev, PORT_C);
+ intel_ddi_init(dev_priv, PORT_C);
if (found & SFUSE_STRAP_DDID_DETECTED)
- intel_ddi_init(dev, PORT_D);
+ intel_ddi_init(dev_priv, PORT_D);
/*
* On SKL we don't have a way to detect DDI-E so we rely on VBT.
*/
@@ -15513,35 +15505,35 @@ static void intel_setup_outputs(struct drm_device *dev)
(dev_priv->vbt.ddi_port_info[PORT_E].supports_dp ||
dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi ||
dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi))
- intel_ddi_init(dev, PORT_E);
+ intel_ddi_init(dev_priv, PORT_E);
} else if (HAS_PCH_SPLIT(dev_priv)) {
int found;
dpd_is_edp = intel_dp_is_edp(dev_priv, PORT_D);
if (has_edp_a(dev_priv))
- intel_dp_init(dev, DP_A, PORT_A);
+ intel_dp_init(dev_priv, DP_A, PORT_A);
if (I915_READ(PCH_HDMIB) & SDVO_DETECTED) {
/* PCH SDVOB multiplex with HDMIB */
- found = intel_sdvo_init(dev, PCH_SDVOB, PORT_B);
+ found = intel_sdvo_init(dev_priv, PCH_SDVOB, PORT_B);
if (!found)
- intel_hdmi_init(dev, PCH_HDMIB, PORT_B);
+ intel_hdmi_init(dev_priv, PCH_HDMIB, PORT_B);
if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED))
- intel_dp_init(dev, PCH_DP_B, PORT_B);
+ intel_dp_init(dev_priv, PCH_DP_B, PORT_B);
}
if (I915_READ(PCH_HDMIC) & SDVO_DETECTED)
- intel_hdmi_init(dev, PCH_HDMIC, PORT_C);
+ intel_hdmi_init(dev_priv, PCH_HDMIC, PORT_C);
if (!dpd_is_edp && I915_READ(PCH_HDMID) & SDVO_DETECTED)
- intel_hdmi_init(dev, PCH_HDMID, PORT_D);
+ intel_hdmi_init(dev_priv, PCH_HDMID, PORT_D);
if (I915_READ(PCH_DP_C) & DP_DETECTED)
- intel_dp_init(dev, PCH_DP_C, PORT_C);
+ intel_dp_init(dev_priv, PCH_DP_C, PORT_C);
if (I915_READ(PCH_DP_D) & DP_DETECTED)
- intel_dp_init(dev, PCH_DP_D, PORT_D);
+ intel_dp_init(dev_priv, PCH_DP_D, PORT_D);
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
bool has_edp, has_port;
@@ -15563,16 +15555,16 @@ static void intel_setup_outputs(struct drm_device *dev)
has_edp = intel_dp_is_edp(dev_priv, PORT_B);
has_port = intel_bios_is_port_present(dev_priv, PORT_B);
if (I915_READ(VLV_DP_B) & DP_DETECTED || has_port)
- has_edp &= intel_dp_init(dev, VLV_DP_B, PORT_B);
+ has_edp &= intel_dp_init(dev_priv, VLV_DP_B, PORT_B);
if ((I915_READ(VLV_HDMIB) & SDVO_DETECTED || has_port) && !has_edp)
- intel_hdmi_init(dev, VLV_HDMIB, PORT_B);
+ intel_hdmi_init(dev_priv, VLV_HDMIB, PORT_B);
has_edp = intel_dp_is_edp(dev_priv, PORT_C);
has_port = intel_bios_is_port_present(dev_priv, PORT_C);
if (I915_READ(VLV_DP_C) & DP_DETECTED || has_port)
- has_edp &= intel_dp_init(dev, VLV_DP_C, PORT_C);
+ has_edp &= intel_dp_init(dev_priv, VLV_DP_C, PORT_C);
if ((I915_READ(VLV_HDMIC) & SDVO_DETECTED || has_port) && !has_edp)
- intel_hdmi_init(dev, VLV_HDMIC, PORT_C);
+ intel_hdmi_init(dev_priv, VLV_HDMIC, PORT_C);
if (IS_CHERRYVIEW(dev_priv)) {
/*
@@ -15581,63 +15573,63 @@ static void intel_setup_outputs(struct drm_device *dev)
*/
has_port = intel_bios_is_port_present(dev_priv, PORT_D);
if (I915_READ(CHV_DP_D) & DP_DETECTED || has_port)
- intel_dp_init(dev, CHV_DP_D, PORT_D);
+ intel_dp_init(dev_priv, CHV_DP_D, PORT_D);
if (I915_READ(CHV_HDMID) & SDVO_DETECTED || has_port)
- intel_hdmi_init(dev, CHV_HDMID, PORT_D);
+ intel_hdmi_init(dev_priv, CHV_HDMID, PORT_D);
}
- intel_dsi_init(dev);
+ intel_dsi_init(dev_priv);
} else if (!IS_GEN2(dev_priv) && !IS_PINEVIEW(dev_priv)) {
bool found = false;
if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
DRM_DEBUG_KMS("probing SDVOB\n");
- found = intel_sdvo_init(dev, GEN3_SDVOB, PORT_B);
+ found = intel_sdvo_init(dev_priv, GEN3_SDVOB, PORT_B);
if (!found && IS_G4X(dev_priv)) {
DRM_DEBUG_KMS("probing HDMI on SDVOB\n");
- intel_hdmi_init(dev, GEN4_HDMIB, PORT_B);
+ intel_hdmi_init(dev_priv, GEN4_HDMIB, PORT_B);
}
if (!found && IS_G4X(dev_priv))
- intel_dp_init(dev, DP_B, PORT_B);
+ intel_dp_init(dev_priv, DP_B, PORT_B);
}
/* Before G4X SDVOC doesn't have its own detect register */
if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
DRM_DEBUG_KMS("probing SDVOC\n");
- found = intel_sdvo_init(dev, GEN3_SDVOC, PORT_C);
+ found = intel_sdvo_init(dev_priv, GEN3_SDVOC, PORT_C);
}
if (!found && (I915_READ(GEN3_SDVOC) & SDVO_DETECTED)) {
if (IS_G4X(dev_priv)) {
DRM_DEBUG_KMS("probing HDMI on SDVOC\n");
- intel_hdmi_init(dev, GEN4_HDMIC, PORT_C);
+ intel_hdmi_init(dev_priv, GEN4_HDMIC, PORT_C);
}
if (IS_G4X(dev_priv))
- intel_dp_init(dev, DP_C, PORT_C);
+ intel_dp_init(dev_priv, DP_C, PORT_C);
}
if (IS_G4X(dev_priv) && (I915_READ(DP_D) & DP_DETECTED))
- intel_dp_init(dev, DP_D, PORT_D);
+ intel_dp_init(dev_priv, DP_D, PORT_D);
} else if (IS_GEN2(dev_priv))
- intel_dvo_init(dev);
+ intel_dvo_init(dev_priv);
if (SUPPORTS_TV(dev_priv))
- intel_tv_init(dev);
+ intel_tv_init(dev_priv);
- intel_psr_init(dev);
+ intel_psr_init(dev_priv);
- for_each_intel_encoder(dev, encoder) {
+ for_each_intel_encoder(&dev_priv->drm, encoder) {
encoder->base.possible_crtcs = encoder->crtc_mask;
encoder->base.possible_clones =
intel_encoder_clones(encoder);
}
- intel_init_pch_refclk(dev);
+ intel_init_pch_refclk(dev_priv);
- drm_helper_move_panel_connectors_to_head(dev);
+ drm_helper_move_panel_connectors_to_head(&dev_priv->drm);
}
static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
@@ -16492,7 +16484,7 @@ int intel_modeset_init(struct drm_device *dev)
/* Just disable it once at startup */
i915_disable_vga(dev_priv);
- intel_setup_outputs(dev);
+ intel_setup_outputs(dev_priv);
drm_modeset_lock_all(dev);
intel_modeset_setup_hw_state(dev);
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 90283ed..7967fcc 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5766,11 +5766,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
return false;
}
-bool intel_dp_init(struct drm_device *dev,
+bool intel_dp_init(struct drm_i915_private *dev_priv,
i915_reg_t output_reg,
enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_port *intel_dig_port;
struct intel_encoder *intel_encoder;
struct drm_encoder *encoder;
@@ -5787,8 +5786,9 @@ bool intel_dp_init(struct drm_device *dev,
intel_encoder = &intel_dig_port->base;
encoder = &intel_encoder->base;
- if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
- DRM_MODE_ENCODER_TMDS, "DP %c", port_name(port)))
+ if (drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
+ &intel_dp_enc_funcs, DRM_MODE_ENCODER_TMDS,
+ "DP %c", port_name(port)))
goto err_encoder_init;
intel_encoder->compute_config = intel_dp_compute_config;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index cd132c2..43f6f4e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1141,7 +1141,7 @@ void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv);
void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv);
/* intel_crt.c */
-void intel_crt_init(struct drm_device *dev);
+void intel_crt_init(struct drm_i915_private *dev_priv);
void intel_crt_reset(struct drm_encoder *encoder);
/* intel_ddi.c */
@@ -1152,7 +1152,7 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,
struct drm_connector_state *old_conn_state);
void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder);
void hsw_fdi_link_train(struct drm_crtc *crtc);
-void intel_ddi_init(struct drm_device *dev, enum port port);
+void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port);
enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder);
bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);
void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc);
@@ -1377,7 +1377,8 @@ void intel_csr_ucode_suspend(struct drm_i915_private *);
void intel_csr_ucode_resume(struct drm_i915_private *);
/* intel_dp.c */
-bool intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
+bool intel_dp_init(struct drm_i915_private *dev_priv, i915_reg_t output_reg,
+ enum port port);
bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
struct intel_connector *intel_connector);
void intel_dp_set_link_params(struct intel_dp *intel_dp,
@@ -1452,13 +1453,13 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
/* intel_dsi.c */
-void intel_dsi_init(struct drm_device *dev);
+void intel_dsi_init(struct drm_i915_private *dev_priv);
/* intel_dsi_dcs_backlight.c */
int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
/* intel_dvo.c */
-void intel_dvo_init(struct drm_device *dev);
+void intel_dvo_init(struct drm_i915_private *dev_priv);
/* intel_hotplug.c */
void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
@@ -1522,7 +1523,8 @@ void intel_fbc_cleanup_cfb(struct drm_i915_private *dev_priv);
void intel_fbc_handle_fifo_underrun_irq(struct drm_i915_private *dev_priv);
/* intel_hdmi.c */
-void intel_hdmi_init(struct drm_device *dev, i915_reg_t hdmi_reg, enum port port);
+void intel_hdmi_init(struct drm_i915_private *dev_priv, i915_reg_t hdmi_reg,
+ enum port port);
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);
@@ -1533,7 +1535,7 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable);
/* intel_lvds.c */
-void intel_lvds_init(struct drm_device *dev);
+void intel_lvds_init(struct drm_i915_private *dev_priv);
struct intel_encoder *intel_get_lvds_encoder(struct drm_device *dev);
bool intel_is_dual_link_lvds(struct drm_device *dev);
@@ -1606,7 +1608,7 @@ void intel_psr_invalidate(struct drm_i915_private *dev_priv,
void intel_psr_flush(struct drm_i915_private *dev_priv,
unsigned frontbuffer_bits,
enum fb_op_origin origin);
-void intel_psr_init(struct drm_device *dev);
+void intel_psr_init(struct drm_i915_private *dev_priv);
void intel_psr_single_frame_update(struct drm_i915_private *dev_priv,
unsigned frontbuffer_bits);
@@ -1751,7 +1753,7 @@ static inline int intel_enable_rc6(void)
}
/* intel_sdvo.c */
-bool intel_sdvo_init(struct drm_device *dev,
+bool intel_sdvo_init(struct drm_i915_private *dev_priv,
i915_reg_t reg, enum port port);
@@ -1766,7 +1768,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc);
void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work);
/* intel_tv.c */
-void intel_tv_init(struct drm_device *dev);
+void intel_tv_init(struct drm_i915_private *dev_priv);
/* intel_atomic.c */
int intel_connector_atomic_get_property(struct drm_connector *connector,
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 4e0d025..e351f50 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1431,15 +1431,15 @@ static void intel_dsi_add_properties(struct intel_connector *connector)
}
}
-void intel_dsi_init(struct drm_device *dev)
+void intel_dsi_init(struct drm_i915_private *dev_priv)
{
+ struct drm_device *dev = &dev_priv->drm;
struct intel_dsi *intel_dsi;
struct intel_encoder *intel_encoder;
struct drm_encoder *encoder;
struct intel_connector *intel_connector;
struct drm_connector *connector;
struct drm_display_mode *scan, *fixed_mode = NULL;
- struct drm_i915_private *dev_priv = to_i915(dev);
enum port port;
unsigned int i;
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 7086454..50da89d 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -422,9 +422,8 @@ static enum port intel_dvo_port(i915_reg_t dvo_reg)
return PORT_C;
}
-void intel_dvo_init(struct drm_device *dev)
+void intel_dvo_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *intel_encoder;
struct intel_dvo *intel_dvo;
struct intel_connector *intel_connector;
@@ -511,7 +510,7 @@ void intel_dvo_init(struct drm_device *dev)
continue;
port = intel_dvo_port(dvo->dvo_reg);
- drm_encoder_init(dev, &intel_encoder->base,
+ drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
&intel_dvo_enc_funcs, encoder_type,
"DVO %c", port_name(port));
@@ -523,14 +522,14 @@ void intel_dvo_init(struct drm_device *dev)
case INTEL_DVO_CHIP_TMDS:
intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |
(1 << INTEL_OUTPUT_DVO);
- drm_connector_init(dev, connector,
+ drm_connector_init(&dev_priv->drm, connector,
&intel_dvo_connector_funcs,
DRM_MODE_CONNECTOR_DVII);
encoder_type = DRM_MODE_ENCODER_TMDS;
break;
case INTEL_DVO_CHIP_LVDS:
intel_encoder->cloneable = 0;
- drm_connector_init(dev, connector,
+ drm_connector_init(&dev_priv->drm, connector,
&intel_dvo_connector_funcs,
DRM_MODE_CONNECTOR_LVDS);
encoder_type = DRM_MODE_ENCODER_LVDS;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index fb88e32..c0504c6 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1933,10 +1933,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
}
}
-void intel_hdmi_init(struct drm_device *dev,
+void intel_hdmi_init(struct drm_i915_private *dev_priv,
i915_reg_t hdmi_reg, enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_digital_port *intel_dig_port;
struct intel_encoder *intel_encoder;
struct intel_connector *intel_connector;
@@ -1953,8 +1952,9 @@ void intel_hdmi_init(struct drm_device *dev,
intel_encoder = &intel_dig_port->base;
- drm_encoder_init(dev, &intel_encoder->base, &intel_hdmi_enc_funcs,
- DRM_MODE_ENCODER_TMDS, "HDMI %c", port_name(port));
+ drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
+ &intel_hdmi_enc_funcs, DRM_MODE_ENCODER_TMDS,
+ "HDMI %c", port_name(port));
intel_encoder->compute_config = intel_hdmi_compute_config;
if (HAS_PCH_SPLIT(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index d12ef00..ea1ce17 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -971,9 +971,9 @@ static bool intel_lvds_supported(struct drm_i915_private *dev_priv)
* Create the connector, register the LVDS DDC bus, and try to figure out what
* modes we can display on the LVDS panel (if present).
*/
-void intel_lvds_init(struct drm_device *dev)
+void intel_lvds_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_device *dev = &dev_priv->drm;
struct intel_lvds_encoder *lvds_encoder;
struct intel_encoder *intel_encoder;
struct intel_lvds_connector *lvds_connector;
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 7b488e2..5c3616e 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -818,10 +818,8 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,
* This function is called only once at driver load to initialize basic
* PSR stuff.
*/
-void intel_psr_init(struct drm_device *dev)
+void intel_psr_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
-
dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 27808e9..054acd9 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2342,9 +2342,9 @@ intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo, int device)
}
static u8
-intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo)
+intel_sdvo_get_slave_addr(struct drm_i915_private *dev_priv,
+ struct intel_sdvo *sdvo)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct sdvo_device_mapping *my_mapping, *other_mapping;
if (sdvo->port == PORT_B) {
@@ -2934,9 +2934,9 @@ static const struct i2c_algorithm intel_sdvo_ddc_proxy = {
static bool
intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo,
- struct drm_device *dev)
+ struct drm_i915_private *dev_priv)
{
- struct pci_dev *pdev = dev->pdev;
+ struct pci_dev *pdev = dev_priv->drm.pdev;
sdvo->ddc.owner = THIS_MODULE;
sdvo->ddc.class = I2C_CLASS_DDC;
@@ -2957,10 +2957,9 @@ static void assert_sdvo_port_valid(const struct drm_i915_private *dev_priv,
WARN_ON(port != PORT_B && port != PORT_C);
}
-bool intel_sdvo_init(struct drm_device *dev,
+bool intel_sdvo_init(struct drm_i915_private *dev_priv,
i915_reg_t sdvo_reg, enum port port)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_encoder *intel_encoder;
struct intel_sdvo *intel_sdvo;
int i;
@@ -2973,16 +2972,18 @@ bool intel_sdvo_init(struct drm_device *dev,
intel_sdvo->sdvo_reg = sdvo_reg;
intel_sdvo->port = port;
- intel_sdvo->slave_addr = intel_sdvo_get_slave_addr(dev, intel_sdvo) >> 1;
+ intel_sdvo->slave_addr =
+ intel_sdvo_get_slave_addr(dev_priv, intel_sdvo) >> 1;
intel_sdvo_select_i2c_bus(dev_priv, intel_sdvo);
- if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev))
+ if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev_priv))
goto err_i2c_bus;
/* encoder type will be decided later */
intel_encoder = &intel_sdvo->base;
intel_encoder->type = INTEL_OUTPUT_SDVO;
intel_encoder->port = port;
- drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0,
+ drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
+ &intel_sdvo_enc_funcs, 0,
"SDVO %c", port_name(port));
/* Read the regs to test if we can talk to the device */
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 78cdfc6..eb692e4 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1537,9 +1537,9 @@ static const struct drm_encoder_funcs intel_tv_enc_funcs = {
};
void
-intel_tv_init(struct drm_device *dev)
+intel_tv_init(struct drm_i915_private *dev_priv)
{
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_device *dev = &dev_priv->drm;
struct drm_connector *connector;
struct intel_tv *intel_tv;
struct intel_encoder *intel_encoder;
--
2.5.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev2)
2016-11-23 13:48 [PATCH] drm/i915: Pass dev_priv to intel_setup_outputs() Ander Conselvan de Oliveira
2016-11-23 13:59 ` Ville Syrjälä
@ 2016-11-23 16:46 ` Patchwork
2016-11-25 15:05 ` Ander Conselvan De Oliveira
2016-11-29 14:53 ` ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev3) Patchwork
2 siblings, 1 reply; 14+ messages in thread
From: Patchwork @ 2016-11-23 16:46 UTC (permalink / raw)
To: Ander Conselvan de Oliveira; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Pass dev_priv to intel_setup_outputs() (rev2)
URL : https://patchwork.freedesktop.org/series/15820/
State : success
== Summary ==
Series 15820v2 drm/i915: Pass dev_priv to intel_setup_outputs()
https://patchwork.freedesktop.org/api/1.0/series/15820/revisions/2/mbox/
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40
fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53
fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21
fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21
fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
01896e61d9cc0cad08e19990cd095cdf679f6142 drm-intel-nightly: 2016y-11m-23d-14h-45m-53s UTC integration manifest
0832b12 drm/i915: Pass dev_priv to intel_setup_outputs()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3094/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2] drm/i915: Pass dev_priv to intel_setup_outputs()
2016-11-23 14:21 ` [PATCH v2] " Ander Conselvan de Oliveira
@ 2016-11-24 3:44 ` kbuild test robot
2016-11-29 9:09 ` Daniel Vetter
0 siblings, 1 reply; 14+ messages in thread
From: kbuild test robot @ 2016-11-24 3:44 UTC (permalink / raw)
Cc: Ander Conselvan de Oliveira, intel-gfx, kbuild-all
[-- Attachment #1: Type: text/plain, Size: 10467 bytes --]
Hi Ander,
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on next-20161123]
[cannot apply to v4.9-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Oliveira/drm-i915-Pass-dev_priv-to-intel_setup_outputs/20161124-093455
base: git://anongit.freedesktop.org/drm-intel for-linux-next
reproduce: make htmldocs
All warnings (new ones prefixed by >>):
make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
include/linux/init.h:1: warning: no structured comments found
include/linux/workqueue.h:392: warning: No description found for parameter '...'
include/linux/workqueue.h:392: warning: Excess function parameter 'args' description in 'alloc_workqueue'
include/linux/workqueue.h:413: warning: No description found for parameter '...'
include/linux/workqueue.h:413: warning: Excess function parameter 'args' description in 'alloc_ordered_workqueue'
include/linux/kthread.h:26: warning: No description found for parameter '...'
kernel/sys.c:1: warning: no structured comments found
drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
include/sound/core.h:324: warning: No description found for parameter '...'
include/sound/core.h:335: warning: No description found for parameter '...'
include/sound/core.h:388: warning: No description found for parameter '...'
include/drm/drm_drv.h:295: warning: Incorrect use of kernel-doc format: * Hook for allocating the GEM object struct, for use by core
include/drm/drm_drv.h:407: warning: No description found for parameter 'load'
include/drm/drm_drv.h:407: warning: No description found for parameter 'firstopen'
include/drm/drm_drv.h:407: warning: No description found for parameter 'open'
include/drm/drm_drv.h:407: warning: No description found for parameter 'preclose'
include/drm/drm_drv.h:407: warning: No description found for parameter 'postclose'
include/drm/drm_drv.h:407: warning: No description found for parameter 'lastclose'
include/drm/drm_drv.h:407: warning: No description found for parameter 'unload'
include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_ioctl'
include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_quiescent'
include/drm/drm_drv.h:407: warning: No description found for parameter 'context_dtor'
include/drm/drm_drv.h:407: warning: No description found for parameter 'set_busid'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_handler'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_preinstall'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_postinstall'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_uninstall'
include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_init'
include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_cleanup'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_open_object'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_close_object'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_create_object'
include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_handle_to_fd'
include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_fd_to_handle'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_export'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_pin'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_unpin'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_res_obj'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_get_sg_table'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import_sg_table'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vmap'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vunmap'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_mmap'
include/drm/drm_drv.h:407: warning: No description found for parameter 'vgaarb_irq'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_vm_ops'
include/drm/drm_drv.h:407: warning: No description found for parameter 'major'
include/drm/drm_drv.h:407: warning: No description found for parameter 'minor'
include/drm/drm_drv.h:407: warning: No description found for parameter 'patchlevel'
include/drm/drm_drv.h:407: warning: No description found for parameter 'name'
include/drm/drm_drv.h:407: warning: No description found for parameter 'desc'
include/drm/drm_drv.h:407: warning: No description found for parameter 'date'
include/drm/drm_drv.h:407: warning: No description found for parameter 'driver_features'
include/drm/drm_drv.h:407: warning: No description found for parameter 'dev_priv_size'
include/drm/drm_drv.h:407: warning: No description found for parameter 'ioctls'
include/drm/drm_drv.h:407: warning: No description found for parameter 'num_ioctls'
include/drm/drm_drv.h:407: warning: No description found for parameter 'fops'
include/drm/drm_drv.h:407: warning: No description found for parameter 'legacy_dev_list'
>> drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev_priv'
>> drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev' description in 'intel_psr_init'
drivers/gpu/drm/i915/intel_psr.c:823: warning: No description found for parameter 'dev_priv'
drivers/gpu/drm/i915/intel_psr.c:823: warning: Excess function parameter 'dev' description in 'intel_psr_init'
include/media/media-entity.h:1054: warning: No description found for parameter '...'
include/net/mac80211.h:3207: ERROR: Unexpected indentation.
include/net/mac80211.h:3210: WARNING: Block quote ends without a blank line; unexpected unindent.
include/net/mac80211.h:3212: ERROR: Unexpected indentation.
include/net/mac80211.h:3213: WARNING: Block quote ends without a blank line; unexpected unindent.
include/net/mac80211.h:1772: ERROR: Unexpected indentation.
include/net/mac80211.h:1776: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/sched/fair.c:7259: WARNING: Inline emphasis start-string without end-string.
kernel/time/timer.c:1240: ERROR: Unexpected indentation.
kernel/time/timer.c:1242: ERROR: Unexpected indentation.
kernel/time/timer.c:1243: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:121: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:124: ERROR: Unexpected indentation.
include/linux/wait.h:126: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/time/hrtimer.c:1021: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/signal.c:317: WARNING: Inline literal start-string without end-string.
drivers/base/firmware_class.c:1348: WARNING: Bullet list ends without a blank line; unexpected unindent.
drivers/message/fusion/mptbase.c:5054: WARNING: Definition list ends without a blank line; unexpected unindent.
drivers/tty/serial/serial_core.c:1893: WARNING: Definition list ends without a blank line; unexpected unindent.
include/linux/spi/spi.h:369: ERROR: Unexpected indentation.
WARNING: dvipng command 'dvipng' cannot be run (needed for math display), check the imgmath_dvipng setting
vim +/dev_priv +822 drivers/gpu/drm/i915/intel_psr.c
995d3047 Rodrigo Vivi 2014-11-19 806
0bc12bcb Rodrigo Vivi 2014-11-14 807 if (!dev_priv->psr.active && !dev_priv->psr.busy_frontbuffer_bits)
d0ac896a Rodrigo Vivi 2015-11-11 808 if (!work_busy(&dev_priv->psr.work.work))
0bc12bcb Rodrigo Vivi 2014-11-14 809 schedule_delayed_work(&dev_priv->psr.work,
20bb97fe Rodrigo Vivi 2015-11-11 810 msecs_to_jiffies(100));
0bc12bcb Rodrigo Vivi 2014-11-14 811 mutex_unlock(&dev_priv->psr.lock);
0bc12bcb Rodrigo Vivi 2014-11-14 812 }
0bc12bcb Rodrigo Vivi 2014-11-14 813
b2b89f55 Rodrigo Vivi 2014-11-14 814 /**
b2b89f55 Rodrigo Vivi 2014-11-14 815 * intel_psr_init - Init basic PSR work and mutex.
b2b89f55 Rodrigo Vivi 2014-11-14 816 * @dev: DRM device
b2b89f55 Rodrigo Vivi 2014-11-14 817 *
b2b89f55 Rodrigo Vivi 2014-11-14 818 * This function is called only once at driver load to initialize basic
b2b89f55 Rodrigo Vivi 2014-11-14 819 * PSR stuff.
b2b89f55 Rodrigo Vivi 2014-11-14 820 */
91ed48bf Ander Conselvan de Oliveira 2016-11-23 821 void intel_psr_init(struct drm_i915_private *dev_priv)
0bc12bcb Rodrigo Vivi 2014-11-14 @822 {
443a389f Ville Syrjälä 2015-11-11 823 dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
443a389f Ville Syrjälä 2015-11-11 824 HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
443a389f Ville Syrjälä 2015-11-11 825
d94d6e87 Rodrigo Vivi 2016-02-12 826 /* Per platform default */
d94d6e87 Rodrigo Vivi 2016-02-12 827 if (i915.enable_psr == -1) {
8652744b Tvrtko Ursulin 2016-10-13 828 if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
a38c274f Rodrigo Vivi 2016-02-12 829 i915.enable_psr = 1;
a38c274f Rodrigo Vivi 2016-02-12 830 else
:::::: The code at line 822 was first introduced by commit
:::::: 0bc12bcb1b9686d7011f16410ba17ed0740167c3 drm/i915: Introduce intel_psr.c
:::::: TO: Rodrigo Vivi <rodrigo.vivi@intel.com>
:::::: CC: Daniel Vetter <daniel.vetter@ffwll.ch>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 6425 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev2)
2016-11-23 16:46 ` ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev2) Patchwork
@ 2016-11-25 15:05 ` Ander Conselvan De Oliveira
0 siblings, 0 replies; 14+ messages in thread
From: Ander Conselvan De Oliveira @ 2016-11-25 15:05 UTC (permalink / raw)
To: intel-gfx
On Wed, 2016-11-23 at 16:46 +0000, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915: Pass dev_priv to intel_setup_outputs() (rev2)
> URL : https://patchwork.freedesktop.org/series/15820/
> State : success
Pushed. Thanks for the review.
Ander
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2] drm/i915: Pass dev_priv to intel_setup_outputs()
2016-11-24 3:44 ` kbuild test robot
@ 2016-11-29 9:09 ` Daniel Vetter
2016-11-29 11:48 ` [PATCH] drm/i915: Fix intel_psr_init() kerneldoc Ander Conselvan de Oliveira
0 siblings, 1 reply; 14+ messages in thread
From: Daniel Vetter @ 2016-11-29 9:09 UTC (permalink / raw)
To: kbuild test robot; +Cc: Ander Conselvan de Oliveira, intel-gfx, kbuild-all
On Thu, Nov 24, 2016 at 11:44:37AM +0800, kbuild test robot wrote:
> Hi Ander,
>
> [auto build test WARNING on drm-intel/for-linux-next]
> [also build test WARNING on next-20161123]
> [cannot apply to v4.9-rc6]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Oliveira/drm-i915-Pass-dev_priv-to-intel_setup_outputs/20161124-093455
> base: git://anongit.freedesktop.org/drm-intel for-linux-next
> reproduce: make htmldocs
>
> All warnings (new ones prefixed by >>):
>
> make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
> include/linux/init.h:1: warning: no structured comments found
> include/linux/workqueue.h:392: warning: No description found for parameter '...'
> include/linux/workqueue.h:392: warning: Excess function parameter 'args' description in 'alloc_workqueue'
> include/linux/workqueue.h:413: warning: No description found for parameter '...'
> include/linux/workqueue.h:413: warning: Excess function parameter 'args' description in 'alloc_ordered_workqueue'
> include/linux/kthread.h:26: warning: No description found for parameter '...'
> kernel/sys.c:1: warning: no structured comments found
> drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
> include/sound/core.h:324: warning: No description found for parameter '...'
> include/sound/core.h:335: warning: No description found for parameter '...'
> include/sound/core.h:388: warning: No description found for parameter '...'
> include/drm/drm_drv.h:295: warning: Incorrect use of kernel-doc format: * Hook for allocating the GEM object struct, for use by core
> include/drm/drm_drv.h:407: warning: No description found for parameter 'load'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'firstopen'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'open'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'preclose'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'postclose'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'lastclose'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'unload'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_ioctl'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_quiescent'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'context_dtor'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'set_busid'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_handler'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_preinstall'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_postinstall'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_uninstall'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_init'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_cleanup'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_open_object'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_close_object'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_create_object'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_handle_to_fd'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_fd_to_handle'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_export'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_pin'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_unpin'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_res_obj'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_get_sg_table'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import_sg_table'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vmap'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vunmap'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_mmap'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'vgaarb_irq'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_vm_ops'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'major'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'minor'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'patchlevel'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'name'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'desc'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'date'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'driver_features'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'dev_priv_size'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'ioctls'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'num_ioctls'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'fops'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'legacy_dev_list'
> >> drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev_priv'
> >> drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev' description in 'intel_psr_init'
I also just spotted these. Please run
make DOCBOOKS="" htmldocs
and fix up the fallout.
Thanks, Daniel
> drivers/gpu/drm/i915/intel_psr.c:823: warning: No description found for parameter 'dev_priv'
> drivers/gpu/drm/i915/intel_psr.c:823: warning: Excess function parameter 'dev' description in 'intel_psr_init'
> include/media/media-entity.h:1054: warning: No description found for parameter '...'
> include/net/mac80211.h:3207: ERROR: Unexpected indentation.
> include/net/mac80211.h:3210: WARNING: Block quote ends without a blank line; unexpected unindent.
> include/net/mac80211.h:3212: ERROR: Unexpected indentation.
> include/net/mac80211.h:3213: WARNING: Block quote ends without a blank line; unexpected unindent.
> include/net/mac80211.h:1772: ERROR: Unexpected indentation.
> include/net/mac80211.h:1776: WARNING: Block quote ends without a blank line; unexpected unindent.
> kernel/sched/fair.c:7259: WARNING: Inline emphasis start-string without end-string.
> kernel/time/timer.c:1240: ERROR: Unexpected indentation.
> kernel/time/timer.c:1242: ERROR: Unexpected indentation.
> kernel/time/timer.c:1243: WARNING: Block quote ends without a blank line; unexpected unindent.
> include/linux/wait.h:121: WARNING: Block quote ends without a blank line; unexpected unindent.
> include/linux/wait.h:124: ERROR: Unexpected indentation.
> include/linux/wait.h:126: WARNING: Block quote ends without a blank line; unexpected unindent.
> kernel/time/hrtimer.c:1021: WARNING: Block quote ends without a blank line; unexpected unindent.
> kernel/signal.c:317: WARNING: Inline literal start-string without end-string.
> drivers/base/firmware_class.c:1348: WARNING: Bullet list ends without a blank line; unexpected unindent.
> drivers/message/fusion/mptbase.c:5054: WARNING: Definition list ends without a blank line; unexpected unindent.
> drivers/tty/serial/serial_core.c:1893: WARNING: Definition list ends without a blank line; unexpected unindent.
> include/linux/spi/spi.h:369: ERROR: Unexpected indentation.
> WARNING: dvipng command 'dvipng' cannot be run (needed for math display), check the imgmath_dvipng setting
>
> vim +/dev_priv +822 drivers/gpu/drm/i915/intel_psr.c
>
> 995d3047 Rodrigo Vivi 2014-11-19 806
> 0bc12bcb Rodrigo Vivi 2014-11-14 807 if (!dev_priv->psr.active && !dev_priv->psr.busy_frontbuffer_bits)
> d0ac896a Rodrigo Vivi 2015-11-11 808 if (!work_busy(&dev_priv->psr.work.work))
> 0bc12bcb Rodrigo Vivi 2014-11-14 809 schedule_delayed_work(&dev_priv->psr.work,
> 20bb97fe Rodrigo Vivi 2015-11-11 810 msecs_to_jiffies(100));
> 0bc12bcb Rodrigo Vivi 2014-11-14 811 mutex_unlock(&dev_priv->psr.lock);
> 0bc12bcb Rodrigo Vivi 2014-11-14 812 }
> 0bc12bcb Rodrigo Vivi 2014-11-14 813
> b2b89f55 Rodrigo Vivi 2014-11-14 814 /**
> b2b89f55 Rodrigo Vivi 2014-11-14 815 * intel_psr_init - Init basic PSR work and mutex.
> b2b89f55 Rodrigo Vivi 2014-11-14 816 * @dev: DRM device
> b2b89f55 Rodrigo Vivi 2014-11-14 817 *
> b2b89f55 Rodrigo Vivi 2014-11-14 818 * This function is called only once at driver load to initialize basic
> b2b89f55 Rodrigo Vivi 2014-11-14 819 * PSR stuff.
> b2b89f55 Rodrigo Vivi 2014-11-14 820 */
> 91ed48bf Ander Conselvan de Oliveira 2016-11-23 821 void intel_psr_init(struct drm_i915_private *dev_priv)
> 0bc12bcb Rodrigo Vivi 2014-11-14 @822 {
> 443a389f Ville Syrjälä 2015-11-11 823 dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
> 443a389f Ville Syrjälä 2015-11-11 824 HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
> 443a389f Ville Syrjälä 2015-11-11 825
> d94d6e87 Rodrigo Vivi 2016-02-12 826 /* Per platform default */
> d94d6e87 Rodrigo Vivi 2016-02-12 827 if (i915.enable_psr == -1) {
> 8652744b Tvrtko Ursulin 2016-10-13 828 if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> a38c274f Rodrigo Vivi 2016-02-12 829 i915.enable_psr = 1;
> a38c274f Rodrigo Vivi 2016-02-12 830 else
>
> :::::: The code at line 822 was first introduced by commit
> :::::: 0bc12bcb1b9686d7011f16410ba17ed0740167c3 drm/i915: Introduce intel_psr.c
>
> :::::: TO: Rodrigo Vivi <rodrigo.vivi@intel.com>
> :::::: CC: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> ---
> 0-DAY kernel test infrastructure Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all Intel Corporation
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] drm/i915: Fix intel_psr_init() kerneldoc
2016-11-29 9:09 ` Daniel Vetter
@ 2016-11-29 11:48 ` Ander Conselvan de Oliveira
2016-11-30 1:29 ` kbuild test robot
2016-12-02 7:57 ` Conselvan De Oliveira, Ander
0 siblings, 2 replies; 14+ messages in thread
From: Ander Conselvan de Oliveira @ 2016-11-29 11:48 UTC (permalink / raw)
To: intel-gfx; +Cc: Ander Conselvan de Oliveira, Daniel Vetter
In commit c39055b072f8 ("drm/i915: Pass dev_priv to
intel_setup_outputs()"), I forgot to update the kerneldoc for
intel_psr_init() init, leading to warnings when building the
documentation:
drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev_priv'
drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev' description in 'intel_psr_init'
Fixes: c39055b072f8 ("drm/i915: Pass dev_priv to intel_setup_outputs()")
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
drivers/gpu/drm/i915/intel_psr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 5c3616e..d5f8d03 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -813,7 +813,7 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,
/**
* intel_psr_init - Init basic PSR work and mutex.
- * @dev: DRM device
+ * @dev_priv: i915 device private
*
* This function is called only once at driver load to initialize basic
* PSR stuff.
--
2.5.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev3)
2016-11-23 13:48 [PATCH] drm/i915: Pass dev_priv to intel_setup_outputs() Ander Conselvan de Oliveira
2016-11-23 13:59 ` Ville Syrjälä
2016-11-23 16:46 ` ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev2) Patchwork
@ 2016-11-29 14:53 ` Patchwork
2 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2016-11-29 14:53 UTC (permalink / raw)
To: Ander Conselvan de Oliveira; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Pass dev_priv to intel_setup_outputs() (rev3)
URL : https://patchwork.freedesktop.org/series/15820/
State : success
== Summary ==
Series 15820v3 drm/i915: Pass dev_priv to intel_setup_outputs()
https://patchwork.freedesktop.org/api/1.0/series/15820/revisions/3/mbox/
fi-bdw-5557u total:245 pass:230 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:245 pass:205 dwarn:0 dfail:0 fail:0 skip:40
fi-bxt-t5700 total:245 pass:217 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-j1900 total:245 pass:217 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-n2820 total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32
fi-hsw-4770 total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20
fi-hsw-4770r total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20
fi-ilk-650 total:245 pass:192 dwarn:0 dfail:0 fail:0 skip:53
fi-ivb-3520m total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22
fi-ivb-3770 total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22
fi-kbl-7500u total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22
fi-skl-6260u total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:245 pass:224 dwarn:0 dfail:0 fail:0 skip:21
fi-skl-6700k total:245 pass:223 dwarn:1 dfail:0 fail:0 skip:21
fi-skl-6770hq total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14
fi-snb-2520m total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32
fi-snb-2600 total:245 pass:212 dwarn:0 dfail:0 fail:0 skip:33
676d4ee0b28bd4c5f9b7b3aee61b043c98ab9cc5 drm-tip: 2016y-11m-29d-12h-54m-36s UTC integration manifest
21afd5a drm/i915: Fix intel_psr_init() kerneldoc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3137/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: Fix intel_psr_init() kerneldoc
2016-11-29 11:48 ` [PATCH] drm/i915: Fix intel_psr_init() kerneldoc Ander Conselvan de Oliveira
@ 2016-11-30 1:29 ` kbuild test robot
2016-11-30 8:36 ` Ander Conselvan De Oliveira
2016-12-02 7:57 ` Conselvan De Oliveira, Ander
1 sibling, 1 reply; 14+ messages in thread
From: kbuild test robot @ 2016-11-30 1:29 UTC (permalink / raw)
Cc: Ander Conselvan de Oliveira, intel-gfx, kbuild-all, Daniel Vetter
[-- Attachment #1: Type: text/plain, Size: 10460 bytes --]
Hi Ander,
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on v4.9-rc7 next-20161129]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Oliveira/drm-i915-Fix-intel_psr_init-kerneldoc/20161130-081024
base: git://anongit.freedesktop.org/drm-intel for-linux-next
reproduce: make htmldocs
All warnings (new ones prefixed by >>):
make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
include/linux/init.h:1: warning: no structured comments found
include/linux/workqueue.h:392: warning: No description found for parameter '...'
include/linux/workqueue.h:392: warning: Excess function parameter 'args' description in 'alloc_workqueue'
include/linux/workqueue.h:413: warning: No description found for parameter '...'
include/linux/workqueue.h:413: warning: Excess function parameter 'args' description in 'alloc_ordered_workqueue'
include/linux/kthread.h:26: warning: No description found for parameter '...'
kernel/sys.c:1: warning: no structured comments found
drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
include/sound/core.h:324: warning: No description found for parameter '...'
include/sound/core.h:335: warning: No description found for parameter '...'
include/sound/core.h:388: warning: No description found for parameter '...'
include/drm/drm_drv.h:295: warning: Incorrect use of kernel-doc format: * Hook for allocating the GEM object struct, for use by core
include/drm/drm_drv.h:407: warning: No description found for parameter 'load'
include/drm/drm_drv.h:407: warning: No description found for parameter 'firstopen'
include/drm/drm_drv.h:407: warning: No description found for parameter 'open'
include/drm/drm_drv.h:407: warning: No description found for parameter 'preclose'
include/drm/drm_drv.h:407: warning: No description found for parameter 'postclose'
include/drm/drm_drv.h:407: warning: No description found for parameter 'lastclose'
include/drm/drm_drv.h:407: warning: No description found for parameter 'unload'
include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_ioctl'
include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_quiescent'
include/drm/drm_drv.h:407: warning: No description found for parameter 'context_dtor'
include/drm/drm_drv.h:407: warning: No description found for parameter 'set_busid'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_handler'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_preinstall'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_postinstall'
include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_uninstall'
include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_init'
include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_cleanup'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_open_object'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_close_object'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_create_object'
include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_handle_to_fd'
include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_fd_to_handle'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_export'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_pin'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_unpin'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_res_obj'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_get_sg_table'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import_sg_table'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vmap'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vunmap'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_mmap'
include/drm/drm_drv.h:407: warning: No description found for parameter 'vgaarb_irq'
include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_vm_ops'
include/drm/drm_drv.h:407: warning: No description found for parameter 'major'
include/drm/drm_drv.h:407: warning: No description found for parameter 'minor'
include/drm/drm_drv.h:407: warning: No description found for parameter 'patchlevel'
include/drm/drm_drv.h:407: warning: No description found for parameter 'name'
include/drm/drm_drv.h:407: warning: No description found for parameter 'desc'
include/drm/drm_drv.h:407: warning: No description found for parameter 'date'
include/drm/drm_drv.h:407: warning: No description found for parameter 'driver_features'
include/drm/drm_drv.h:407: warning: No description found for parameter 'dev_priv_size'
include/drm/drm_drv.h:407: warning: No description found for parameter 'ioctls'
include/drm/drm_drv.h:407: warning: No description found for parameter 'num_ioctls'
include/drm/drm_drv.h:407: warning: No description found for parameter 'fops'
include/drm/drm_drv.h:407: warning: No description found for parameter 'legacy_dev_list'
>> drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev'
>> drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev_priv' description in 'intel_psr_init'
drivers/gpu/drm/i915/intel_psr.c:823: warning: No description found for parameter 'dev'
drivers/gpu/drm/i915/intel_psr.c:823: warning: Excess function parameter 'dev_priv' description in 'intel_psr_init'
include/media/media-entity.h:1054: warning: No description found for parameter '...'
include/net/mac80211.h:3207: ERROR: Unexpected indentation.
include/net/mac80211.h:3210: WARNING: Block quote ends without a blank line; unexpected unindent.
include/net/mac80211.h:3212: ERROR: Unexpected indentation.
include/net/mac80211.h:3213: WARNING: Block quote ends without a blank line; unexpected unindent.
include/net/mac80211.h:1772: ERROR: Unexpected indentation.
include/net/mac80211.h:1776: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/sched/fair.c:7259: WARNING: Inline emphasis start-string without end-string.
kernel/time/timer.c:1240: ERROR: Unexpected indentation.
kernel/time/timer.c:1242: ERROR: Unexpected indentation.
kernel/time/timer.c:1243: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:121: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:124: ERROR: Unexpected indentation.
include/linux/wait.h:126: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/time/hrtimer.c:1021: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/signal.c:317: WARNING: Inline literal start-string without end-string.
drivers/base/firmware_class.c:1348: WARNING: Bullet list ends without a blank line; unexpected unindent.
drivers/message/fusion/mptbase.c:5054: WARNING: Definition list ends without a blank line; unexpected unindent.
drivers/tty/serial/serial_core.c:1893: WARNING: Definition list ends without a blank line; unexpected unindent.
include/linux/spi/spi.h:369: ERROR: Unexpected indentation.
WARNING: dvipng command 'dvipng' cannot be run (needed for math display), check the imgmath_dvipng setting
vim +/dev +822 drivers/gpu/drm/i915/intel_psr.c
995d3047 Rodrigo Vivi 2014-11-19 806
0bc12bcb Rodrigo Vivi 2014-11-14 807 if (!dev_priv->psr.active && !dev_priv->psr.busy_frontbuffer_bits)
d0ac896a Rodrigo Vivi 2015-11-11 808 if (!work_busy(&dev_priv->psr.work.work))
0bc12bcb Rodrigo Vivi 2014-11-14 809 schedule_delayed_work(&dev_priv->psr.work,
20bb97fe Rodrigo Vivi 2015-11-11 810 msecs_to_jiffies(100));
0bc12bcb Rodrigo Vivi 2014-11-14 811 mutex_unlock(&dev_priv->psr.lock);
0bc12bcb Rodrigo Vivi 2014-11-14 812 }
0bc12bcb Rodrigo Vivi 2014-11-14 813
b2b89f55 Rodrigo Vivi 2014-11-14 814 /**
b2b89f55 Rodrigo Vivi 2014-11-14 815 * intel_psr_init - Init basic PSR work and mutex.
acd19c01 Ander Conselvan de Oliveira 2016-11-29 816 * @dev_priv: i915 device private
b2b89f55 Rodrigo Vivi 2014-11-14 817 *
b2b89f55 Rodrigo Vivi 2014-11-14 818 * This function is called only once at driver load to initialize basic
b2b89f55 Rodrigo Vivi 2014-11-14 819 * PSR stuff.
b2b89f55 Rodrigo Vivi 2014-11-14 820 */
0bc12bcb Rodrigo Vivi 2014-11-14 821 void intel_psr_init(struct drm_device *dev)
0bc12bcb Rodrigo Vivi 2014-11-14 @822 {
fac5e23e Chris Wilson 2016-07-04 823 struct drm_i915_private *dev_priv = to_i915(dev);
0bc12bcb Rodrigo Vivi 2014-11-14 824
443a389f Ville Syrjälä 2015-11-11 825 dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ?
443a389f Ville Syrjälä 2015-11-11 826 HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE;
443a389f Ville Syrjälä 2015-11-11 827
d94d6e87 Rodrigo Vivi 2016-02-12 828 /* Per platform default */
d94d6e87 Rodrigo Vivi 2016-02-12 829 if (i915.enable_psr == -1) {
8652744b Tvrtko Ursulin 2016-10-13 830 if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
:::::: The code at line 822 was first introduced by commit
:::::: 0bc12bcb1b9686d7011f16410ba17ed0740167c3 drm/i915: Introduce intel_psr.c
:::::: TO: Rodrigo Vivi <rodrigo.vivi@intel.com>
:::::: CC: Daniel Vetter <daniel.vetter@ffwll.ch>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 6425 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: Fix intel_psr_init() kerneldoc
2016-11-30 1:29 ` kbuild test robot
@ 2016-11-30 8:36 ` Ander Conselvan De Oliveira
2016-12-05 18:01 ` [lkp] " Ye Xiaolong
0 siblings, 1 reply; 14+ messages in thread
From: Ander Conselvan De Oliveira @ 2016-11-30 8:36 UTC (permalink / raw)
To: kbuild test robot; +Cc: Daniel Vetter, intel-gfx, kbuild-all
On Wed, 2016-11-30 at 09:29 +0800, kbuild test robot wrote:
> Hi Ander,
>
> [auto build test WARNING on drm-intel/for-linux-next]
> [also build test WARNING on v4.9-rc7 next-20161129]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Oliveira/drm-i915-Fix-intel_psr_init-kerneldoc/20161130-081024
> base: git://anongit.freedesktop.org/drm-intel for-linux-next
> reproduce: make htmldocs
>
> All warnings (new ones prefixed by >>):
>
> make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
> include/linux/init.h:1: warning: no structured comments found
> include/linux/workqueue.h:392: warning: No description found for parameter '...'
> include/linux/workqueue.h:392: warning: Excess function parameter 'args' description in 'alloc_workqueue'
> include/linux/workqueue.h:413: warning: No description found for parameter '...'
> include/linux/workqueue.h:413: warning: Excess function parameter 'args' description in 'alloc_ordered_workqueue'
> include/linux/kthread.h:26: warning: No description found for parameter '...'
> kernel/sys.c:1: warning: no structured comments found
> drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
> include/sound/core.h:324: warning: No description found for parameter '...'
> include/sound/core.h:335: warning: No description found for parameter '...'
> include/sound/core.h:388: warning: No description found for parameter '...'
> include/drm/drm_drv.h:295: warning: Incorrect use of kernel-doc format: * Hook for allocating the GEM object struct, for use by core
> include/drm/drm_drv.h:407: warning: No description found for parameter 'load'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'firstopen'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'open'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'preclose'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'postclose'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'lastclose'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'unload'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_ioctl'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_quiescent'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'context_dtor'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'set_busid'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_handler'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_preinstall'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_postinstall'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_uninstall'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_init'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_cleanup'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_open_object'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_close_object'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_create_object'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_handle_to_fd'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_fd_to_handle'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_export'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_pin'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_unpin'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_res_obj'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_get_sg_table'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import_sg_table'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vmap'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vunmap'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_mmap'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'vgaarb_irq'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_vm_ops'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'major'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'minor'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'patchlevel'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'name'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'desc'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'date'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'driver_features'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'dev_priv_size'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'ioctls'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'num_ioctls'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'fops'
> include/drm/drm_drv.h:407: warning: No description found for parameter 'legacy_dev_list'
> >> drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev'
> >> drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev_priv' description in 'intel_psr_init'
> drivers/gpu/drm/i915/intel_psr.c:823: warning: No description found for parameter 'dev'
> drivers/gpu/drm/i915/intel_psr.c:823: warning: Excess function parameter 'dev_priv' description in 'intel_psr_init'
These warnings are for some wrong tree, which doesn't have the patch that
converts from dev to dev_priv in intel_psr_init()'s signature.
Ander
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: Fix intel_psr_init() kerneldoc
2016-11-29 11:48 ` [PATCH] drm/i915: Fix intel_psr_init() kerneldoc Ander Conselvan de Oliveira
2016-11-30 1:29 ` kbuild test robot
@ 2016-12-02 7:57 ` Conselvan De Oliveira, Ander
1 sibling, 0 replies; 14+ messages in thread
From: Conselvan De Oliveira, Ander @ 2016-12-02 7:57 UTC (permalink / raw)
To: intel-gfx; +Cc: Vetter, Daniel
On Tue, 2016-11-29 at 13:48 +0200, Ander Conselvan de Oliveira wrote:
> In commit c39055b072f8 ("drm/i915: Pass dev_priv to
> intel_setup_outputs()"), I forgot to update the kerneldoc for
> intel_psr_init() init, leading to warnings when building the
> documentation:
>
> drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev_priv'
> drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev' description in 'intel_psr_init'
>
> Fixes: c39055b072f8 ("drm/i915: Pass dev_priv to intel_setup_outputs()")
> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Pushed with Daniel's irc r-b.
Ander
> ---
> drivers/gpu/drm/i915/intel_psr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_psr.c
> b/drivers/gpu/drm/i915/intel_psr.c
> index 5c3616e..d5f8d03 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -813,7 +813,7 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,
>
> /**
> * intel_psr_init - Init basic PSR work and mutex.
> - * @dev: DRM device
> + * @dev_priv: i915 device private
> *
> * This function is called only once at driver load to initialize basic
> * PSR stuff.
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [lkp] [PATCH] drm/i915: Fix intel_psr_init() kerneldoc
2016-11-30 8:36 ` Ander Conselvan De Oliveira
@ 2016-12-05 18:01 ` Ye Xiaolong
2016-12-08 11:15 ` Ander Conselvan De Oliveira
0 siblings, 1 reply; 14+ messages in thread
From: Ye Xiaolong @ 2016-12-05 18:01 UTC (permalink / raw)
To: Ander Conselvan De Oliveira; +Cc: Daniel Vetter, intel-gfx, kbuild-all
On 11/30, Ander Conselvan De Oliveira wrote:
>On Wed, 2016-11-30 at 09:29 +0800, kbuild test robot wrote:
>> Hi Ander,
>>
>> [auto build test WARNING on drm-intel/for-linux-next]
>> [also build test WARNING on v4.9-rc7 next-20161129]
>> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>>
>> url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Oliveira/drm-i915-Fix-intel_psr_init-kerneldoc/20161130-081024
>> base: git://anongit.freedesktop.org/drm-intel for-linux-next
>> reproduce: make htmldocs
>>
>> All warnings (new ones prefixed by >>):
>>
>> make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
>> include/linux/init.h:1: warning: no structured comments found
>> include/linux/workqueue.h:392: warning: No description found for parameter '...'
>> include/linux/workqueue.h:392: warning: Excess function parameter 'args' description in 'alloc_workqueue'
>> include/linux/workqueue.h:413: warning: No description found for parameter '...'
>> include/linux/workqueue.h:413: warning: Excess function parameter 'args' description in 'alloc_ordered_workqueue'
>> include/linux/kthread.h:26: warning: No description found for parameter '...'
>> kernel/sys.c:1: warning: no structured comments found
>> drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
>> include/sound/core.h:324: warning: No description found for parameter '...'
>> include/sound/core.h:335: warning: No description found for parameter '...'
>> include/sound/core.h:388: warning: No description found for parameter '...'
>> include/drm/drm_drv.h:295: warning: Incorrect use of kernel-doc format: * Hook for allocating the GEM object struct, for use by core
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'load'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'firstopen'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'open'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'preclose'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'postclose'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'lastclose'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'unload'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_ioctl'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_quiescent'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'context_dtor'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'set_busid'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_handler'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_preinstall'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_postinstall'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_uninstall'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_init'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_cleanup'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_open_object'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_close_object'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_create_object'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_handle_to_fd'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_fd_to_handle'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_export'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_pin'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_unpin'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_res_obj'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_get_sg_table'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import_sg_table'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vmap'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vunmap'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_mmap'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'vgaarb_irq'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_vm_ops'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'major'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'minor'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'patchlevel'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'name'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'desc'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'date'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'driver_features'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'dev_priv_size'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'ioctls'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'num_ioctls'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'fops'
>> include/drm/drm_drv.h:407: warning: No description found for parameter 'legacy_dev_list'
>> >> drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev'
>> >> drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev_priv' description in 'intel_psr_init'
>> drivers/gpu/drm/i915/intel_psr.c:823: warning: No description found for parameter 'dev'
>> drivers/gpu/drm/i915/intel_psr.c:823: warning: Excess function parameter 'dev_priv' description in 'intel_psr_init'
>
>These warnings are for some wrong tree, which doesn't have the patch that
>converts from dev to dev_priv in intel_psr_init()'s signature.
Thanks for the note, could you tell us the correct tree to which this patch
should be applied?
Thanks,
Xiaolong
>
>Ander
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [lkp] [PATCH] drm/i915: Fix intel_psr_init() kerneldoc
2016-12-05 18:01 ` [lkp] " Ye Xiaolong
@ 2016-12-08 11:15 ` Ander Conselvan De Oliveira
0 siblings, 0 replies; 14+ messages in thread
From: Ander Conselvan De Oliveira @ 2016-12-08 11:15 UTC (permalink / raw)
To: Ye Xiaolong, Daniel Vetter; +Cc: intel-gfx, kbuild-all
On Tue, 2016-12-06 at 02:01 +0800, Ye Xiaolong wrote:
> On 11/30, Ander Conselvan De Oliveira wrote:
> >
> > On Wed, 2016-11-30 at 09:29 +0800, kbuild test robot wrote:
> > >
> > > Hi Ander,
> > >
> > > [auto build test WARNING on drm-intel/for-linux-next]
> > > [also build test WARNING on v4.9-rc7 next-20161129]
> > > [if your patch is applied to the wrong git tree, please drop us a note to
> > > help improve the system]
> > >
> > > url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Olivei
> > > ra/drm-i915-Fix-intel_psr_init-kerneldoc/20161130-081024
> > > base: git://anongit.freedesktop.org/drm-intel for-linux-next
> > > reproduce: make htmldocs
> > >
> > > All warnings (new ones prefixed by >>):
> > >
> > > make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent
> > > make rule.
> > > include/linux/init.h:1: warning: no structured comments found
> > > include/linux/workqueue.h:392: warning: No description found for
> > > parameter '...'
> > > include/linux/workqueue.h:392: warning: Excess function parameter
> > > 'args' description in 'alloc_workqueue'
> > > include/linux/workqueue.h:413: warning: No description found for
> > > parameter '...'
> > > include/linux/workqueue.h:413: warning: Excess function parameter
> > > 'args' description in 'alloc_ordered_workqueue'
> > > include/linux/kthread.h:26: warning: No description found for parameter
> > > '...'
> > > kernel/sys.c:1: warning: no structured comments found
> > > drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
> > > include/sound/core.h:324: warning: No description found for parameter
> > > '...'
> > > include/sound/core.h:335: warning: No description found for parameter
> > > '...'
> > > include/sound/core.h:388: warning: No description found for parameter
> > > '...'
> > > include/drm/drm_drv.h:295: warning: Incorrect use of kernel-doc
> > > format: * Hook for allocating the GEM object struct, for use by core
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'load'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'firstopen'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'open'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'preclose'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'postclose'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'lastclose'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'unload'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'dma_ioctl'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'dma_quiescent'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'context_dtor'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'set_busid'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'irq_handler'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'irq_preinstall'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'irq_postinstall'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'irq_uninstall'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'debugfs_init'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'debugfs_cleanup'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_open_object'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_close_object'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_create_object'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'prime_handle_to_fd'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'prime_fd_to_handle'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_export'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_import'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_pin'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_unpin'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_res_obj'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_get_sg_table'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_import_sg_table'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_vmap'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_vunmap'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_prime_mmap'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'vgaarb_irq'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'gem_vm_ops'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'major'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'minor'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'patchlevel'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'name'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'desc'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'date'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'driver_features'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'dev_priv_size'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'ioctls'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'num_ioctls'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'fops'
> > > include/drm/drm_drv.h:407: warning: No description found for parameter
> > > 'legacy_dev_list'
> > > >
> > > > >
> > > > > drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found
> > > > > for parameter 'dev'
> > > > > drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function
> > > > > parameter 'dev_priv' description in 'intel_psr_init'
> > > drivers/gpu/drm/i915/intel_psr.c:823: warning: No description found for
> > > parameter 'dev'
> > > drivers/gpu/drm/i915/intel_psr.c:823: warning: Excess function
> > > parameter 'dev_priv' description in 'intel_psr_init'
> > These warnings are for some wrong tree, which doesn't have the patch that
> > converts from dev to dev_priv in intel_psr_init()'s signature.
> Thanks for the note, could you tell us the correct tree to which this patch
> should be applied?
That would be drm-intel/drm-intel-next-queued.
Ander
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2016-12-08 11:15 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-23 13:48 [PATCH] drm/i915: Pass dev_priv to intel_setup_outputs() Ander Conselvan de Oliveira
2016-11-23 13:59 ` Ville Syrjälä
2016-11-23 14:21 ` [PATCH v2] " Ander Conselvan de Oliveira
2016-11-24 3:44 ` kbuild test robot
2016-11-29 9:09 ` Daniel Vetter
2016-11-29 11:48 ` [PATCH] drm/i915: Fix intel_psr_init() kerneldoc Ander Conselvan de Oliveira
2016-11-30 1:29 ` kbuild test robot
2016-11-30 8:36 ` Ander Conselvan De Oliveira
2016-12-05 18:01 ` [lkp] " Ye Xiaolong
2016-12-08 11:15 ` Ander Conselvan De Oliveira
2016-12-02 7:57 ` Conselvan De Oliveira, Ander
2016-11-23 16:46 ` ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev2) Patchwork
2016-11-25 15:05 ` Ander Conselvan De Oliveira
2016-11-29 14:53 ` ✓ Fi.CI.BAT: success for drm/i915: Pass dev_priv to intel_setup_outputs() (rev3) Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.