* [PATCH 0/2] Use intel_* types more consistently
@ 2018-12-07 0:53 Matt Roper
2018-12-07 0:54 ` [PATCH 1/2] drm/i915: Use intel_ types more consistently for watermark code Matt Roper
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Matt Roper @ 2018-12-07 0:53 UTC (permalink / raw)
To: intel-gfx
The i915 codebase usually tries to use intel_* types rather than drm_*
types as parameters for internal driver functions that are only called
by other i915 code. However I've noticed that the watermark code and
the color management code are two places where we haven't been as
careful about following that convention. Let's try to be more
consistent about using the intel_* types.
Matt Roper (2):
drm/i915: Use intel_ types more consistently for watermark code
drm/i915: Use intel_ types more consistently for color management code
drivers/gpu/drm/i915/i915_drv.h | 9 +-
drivers/gpu/drm/i915/intel_color.c | 207 ++++++++++++++---------------
drivers/gpu/drm/i915/intel_display.c | 52 ++++----
drivers/gpu/drm/i915/intel_drv.h | 18 +--
drivers/gpu/drm/i915/intel_pm.c | 250 ++++++++++++++++-------------------
5 files changed, 246 insertions(+), 290 deletions(-)
--
2.14.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/2] drm/i915: Use intel_ types more consistently for watermark code 2018-12-07 0:53 [PATCH 0/2] Use intel_* types more consistently Matt Roper @ 2018-12-07 0:54 ` Matt Roper 2018-12-10 19:27 ` Ville Syrjälä 2018-12-07 0:54 ` [PATCH 2/2] drm/i915: Use intel_ types more consistently for color management code Matt Roper ` (4 subsequent siblings) 5 siblings, 1 reply; 10+ messages in thread From: Matt Roper @ 2018-12-07 0:54 UTC (permalink / raw) To: intel-gfx Try to be more consistent about intel_* types rather than drm_* types for lower-level driver functions. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/intel_display.c | 32 ++--- drivers/gpu/drm/i915/intel_drv.h | 10 +- drivers/gpu/drm/i915/intel_pm.c | 250 ++++++++++++++++------------------- 4 files changed, 134 insertions(+), 163 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0689e67c966e..7469a7785253 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -281,8 +281,7 @@ struct drm_i915_display_funcs { int (*get_fifo_size)(struct drm_i915_private *dev_priv, enum i9xx_plane_id i9xx_plane); int (*compute_pipe_wm)(struct intel_crtc_state *cstate); - int (*compute_intermediate_wm)(struct drm_device *dev, - struct intel_crtc *intel_crtc, + int (*compute_intermediate_wm)(struct intel_crtc *intel_crtc, struct intel_crtc_state *newstate); void (*initial_watermarks)(struct intel_atomic_state *state, struct intel_crtc_state *cstate); @@ -290,7 +289,7 @@ struct drm_i915_display_funcs { struct intel_crtc_state *cstate); void (*optimize_watermarks)(struct intel_atomic_state *state, struct intel_crtc_state *cstate); - int (*compute_global_watermarks)(struct drm_atomic_state *state); + int (*compute_global_watermarks)(struct intel_atomic_state *state); void (*update_wm)(struct intel_crtc *crtc); int (*modeset_calc_cdclk)(struct drm_atomic_state *state); /* Returns the active state of the crtc, and if the crtc is active, diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 07c861884c70..db6004a883c7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10661,12 +10661,9 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) * * Returns true or false. */ -static bool intel_wm_need_update(struct drm_plane *plane, - struct drm_plane_state *state) +static bool intel_wm_need_update(struct intel_plane_state *cur, + struct intel_plane_state *new) { - struct intel_plane_state *new = to_intel_plane_state(state); - struct intel_plane_state *cur = to_intel_plane_state(plane->state); - /* Update watermarks on tiling or size changes. */ if (new->base.visible != cur->base.visible) return true; @@ -10775,7 +10772,8 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat /* must disable cxsr around plane enable/disable */ if (plane->id != PLANE_CURSOR) pipe_config->disable_cxsr = true; - } else if (intel_wm_need_update(&plane->base, plane_state)) { + } else if (intel_wm_need_update(to_intel_plane_state(plane->base.state), + to_intel_plane_state(plane_state))) { if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv)) { /* FIXME bollocks */ pipe_config->update_wm_pre = true; @@ -10954,8 +10952,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state) static int intel_crtc_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *crtc_state) { - struct drm_device *dev = crtc->dev; - struct drm_i915_private *dev_priv = to_i915(dev); + struct drm_i915_private *dev_priv = to_i915(crtc->dev); struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc_state *pipe_config = to_intel_crtc_state(crtc_state); @@ -11004,8 +11001,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, * old state and the new state. We can program these * immediately. */ - ret = dev_priv->display.compute_intermediate_wm(dev, - intel_crtc, + ret = dev_priv->display.compute_intermediate_wm(intel_crtc, pipe_config); if (ret) { DRM_DEBUG_KMS("No valid intermediate pipe watermarks are possible\n"); @@ -11964,7 +11960,7 @@ static void verify_wm_state(struct drm_crtc *crtc, if (INTEL_GEN(dev_priv) < 9 || !new_state->active) return; - skl_pipe_wm_get_hw_state(crtc, &hw_wm); + skl_pipe_wm_get_hw_state(intel_crtc, &hw_wm); sw_wm = &to_intel_crtc_state(new_state)->wm.skl.optimal; skl_pipe_ddb_get_hw_state(intel_crtc, hw_ddb_y, hw_ddb_uv); @@ -12619,9 +12615,9 @@ static int intel_modeset_checks(struct drm_atomic_state *state) * phase. The code here should be run after the per-crtc and per-plane 'check' * handlers to ensure that all derived state has been updated. */ -static int calc_watermark_data(struct drm_atomic_state *state) +static int calc_watermark_data(struct intel_atomic_state *state) { - struct drm_device *dev = state->dev; + struct drm_device *dev = state->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); /* Is there platform-specific watermark information to calculate? */ @@ -12713,7 +12709,7 @@ static int intel_atomic_check(struct drm_device *dev, return ret; intel_fbc_choose_crtc(dev_priv, intel_state); - return calc_watermark_data(state); + return calc_watermark_data(intel_state); } static int intel_atomic_prepare_commit(struct drm_device *dev, @@ -15843,15 +15839,15 @@ intel_modeset_setup_hw_state(struct drm_device *dev, } if (IS_G4X(dev_priv)) { - g4x_wm_get_hw_state(dev); + g4x_wm_get_hw_state(dev_priv); g4x_wm_sanitize(dev_priv); } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { - vlv_wm_get_hw_state(dev); + vlv_wm_get_hw_state(dev_priv); vlv_wm_sanitize(dev_priv); } else if (INTEL_GEN(dev_priv) >= 9) { - skl_wm_get_hw_state(dev); + skl_wm_get_hw_state(dev_priv); } else if (HAS_PCH_SPLIT(dev_priv)) { - ilk_wm_get_hw_state(dev); + ilk_wm_get_hw_state(dev_priv); } for_each_intel_crtc(dev, crtc) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index f94a04b4ad87..a8177ccf1d4f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -2200,16 +2200,16 @@ void gen6_rps_busy(struct drm_i915_private *dev_priv); void gen6_rps_reset_ei(struct drm_i915_private *dev_priv); void gen6_rps_idle(struct drm_i915_private *dev_priv); void gen6_rps_boost(struct i915_request *rq, struct intel_rps_client *rps); -void g4x_wm_get_hw_state(struct drm_device *dev); -void vlv_wm_get_hw_state(struct drm_device *dev); -void ilk_wm_get_hw_state(struct drm_device *dev); -void skl_wm_get_hw_state(struct drm_device *dev); +void g4x_wm_get_hw_state(struct drm_i915_private *dev_priv); +void vlv_wm_get_hw_state(struct drm_i915_private *dev_priv); +void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv); +void skl_wm_get_hw_state(struct drm_i915_private *dev_priv); void skl_pipe_ddb_get_hw_state(struct intel_crtc *crtc, struct skl_ddb_entry *ddb_y, struct skl_ddb_entry *ddb_uv); void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb /* out */); -void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, +void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out); void g4x_wm_sanitize(struct drm_i915_private *dev_priv); void vlv_wm_sanitize(struct drm_i915_private *dev_priv); diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index a26b4eddda25..efb8bcf77fb8 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1399,8 +1399,7 @@ static int g4x_compute_pipe_wm(struct intel_crtc_state *crtc_state) return 0; } -static int g4x_compute_intermediate_wm(struct drm_device *dev, - struct intel_crtc *crtc, +static int g4x_compute_intermediate_wm(struct intel_crtc *crtc, struct intel_crtc_state *new_crtc_state) { struct g4x_wm_state *intermediate = &new_crtc_state->wm.g4x.intermediate; @@ -2032,8 +2031,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, #undef VLV_FIFO -static int vlv_compute_intermediate_wm(struct drm_device *dev, - struct intel_crtc *crtc, +static int vlv_compute_intermediate_wm(struct intel_crtc *crtc, struct intel_crtc_state *new_crtc_state) { struct vlv_wm_state *intermediate = &new_crtc_state->wm.vlv.intermediate; @@ -2626,13 +2624,12 @@ static unsigned int ilk_fbc_wm_reg_max(const struct drm_i915_private *dev_priv) } /* Calculate the maximum primary/sprite plane watermark */ -static unsigned int ilk_plane_wm_max(const struct drm_device *dev, +static unsigned int ilk_plane_wm_max(const struct drm_i915_private *dev_priv, int level, const struct intel_wm_config *config, enum intel_ddb_partitioning ddb_partitioning, bool is_sprite) { - struct drm_i915_private *dev_priv = to_i915(dev); unsigned int fifo_size = ilk_display_fifo_size(dev_priv); /* if sprites aren't enabled, sprites get nothing */ @@ -2668,7 +2665,7 @@ static unsigned int ilk_plane_wm_max(const struct drm_device *dev, } /* Calculate the maximum cursor plane watermark */ -static unsigned int ilk_cursor_wm_max(const struct drm_device *dev, +static unsigned int ilk_cursor_wm_max(const struct drm_i915_private *dev_priv, int level, const struct intel_wm_config *config) { @@ -2677,19 +2674,19 @@ static unsigned int ilk_cursor_wm_max(const struct drm_device *dev, return 64; /* otherwise just report max that registers can hold */ - return ilk_cursor_wm_reg_max(to_i915(dev), level); + return ilk_cursor_wm_reg_max(dev_priv, level); } -static void ilk_compute_wm_maximums(const struct drm_device *dev, +static void ilk_compute_wm_maximums(const struct drm_i915_private *dev_priv, int level, const struct intel_wm_config *config, enum intel_ddb_partitioning ddb_partitioning, struct ilk_wm_maximums *max) { - max->pri = ilk_plane_wm_max(dev, level, config, ddb_partitioning, false); - max->spr = ilk_plane_wm_max(dev, level, config, ddb_partitioning, true); - max->cur = ilk_cursor_wm_max(dev, level, config); - max->fbc = ilk_fbc_wm_reg_max(to_i915(dev)); + max->pri = ilk_plane_wm_max(dev_priv, level, config, ddb_partitioning, false); + max->spr = ilk_plane_wm_max(dev_priv, level, config, ddb_partitioning, true); + max->cur = ilk_cursor_wm_max(dev_priv, level, config); + max->fbc = ilk_fbc_wm_reg_max(dev_priv); } static void ilk_compute_wm_reg_maximums(const struct drm_i915_private *dev_priv, @@ -3073,7 +3070,7 @@ static void skl_setup_wm_latency(struct drm_i915_private *dev_priv) intel_print_wm_latency(dev_priv, "Gen9 Plane", dev_priv->wm.skl_latency); } -static bool ilk_validate_pipe_wm(struct drm_device *dev, +static bool ilk_validate_pipe_wm(const struct drm_i915_private *dev_priv, struct intel_pipe_wm *pipe_wm) { /* LP0 watermark maximums depend on this pipe alone */ @@ -3085,7 +3082,7 @@ static bool ilk_validate_pipe_wm(struct drm_device *dev, struct ilk_wm_maximums max; /* LP0 watermarks always use 1/2 DDB partitioning */ - ilk_compute_wm_maximums(dev, 0, &config, INTEL_DDB_PART_1_2, &max); + ilk_compute_wm_maximums(dev_priv, 0, &config, INTEL_DDB_PART_1_2, &max); /* At least LP0 must be valid */ if (!ilk_validate_wm_level(0, &max, &pipe_wm->wm[0])) { @@ -3150,7 +3147,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) pipe_wm->linetime = hsw_compute_linetime_wm(cstate); - if (!ilk_validate_pipe_wm(dev, pipe_wm)) + if (!ilk_validate_pipe_wm(dev_priv, pipe_wm)) return -EINVAL; ilk_compute_wm_reg_maximums(dev_priv, 1, &max); @@ -3180,17 +3177,17 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) * state and the new state. These can be programmed to the hardware * immediately. */ -static int ilk_compute_intermediate_wm(struct drm_device *dev, - struct intel_crtc *intel_crtc, +static int ilk_compute_intermediate_wm(struct intel_crtc *intel_crtc, struct intel_crtc_state *newstate) { + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); struct intel_pipe_wm *a = &newstate->wm.ilk.intermediate; struct intel_atomic_state *intel_state = to_intel_atomic_state(newstate->base.state); const struct intel_crtc_state *oldstate = intel_atomic_get_old_crtc_state(intel_state, intel_crtc); const struct intel_pipe_wm *b = &oldstate->wm.ilk.optimal; - int level, max_level = ilk_wm_max_level(to_i915(dev)); + int level, max_level = ilk_wm_max_level(dev_priv); /* * Start with the final, target watermarks, then combine with the @@ -3223,7 +3220,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev, * there's no safe way to transition from the old state to * the new state, so we need to fail the atomic transaction. */ - if (!ilk_validate_pipe_wm(dev, a)) + if (!ilk_validate_pipe_wm(dev_priv, a)) return -EINVAL; /* @@ -3239,7 +3236,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev, /* * Merge the watermarks from all active pipes for a specific level. */ -static void ilk_merge_wm_level(struct drm_device *dev, +static void ilk_merge_wm_level(struct drm_i915_private *dev_priv, int level, struct intel_wm_level *ret_wm) { @@ -3247,7 +3244,7 @@ static void ilk_merge_wm_level(struct drm_device *dev, ret_wm->enable = true; - for_each_intel_crtc(dev, intel_crtc) { + for_each_intel_crtc(&dev_priv->drm, intel_crtc) { const struct intel_pipe_wm *active = &intel_crtc->wm.active.ilk; const struct intel_wm_level *wm = &active->wm[level]; @@ -3272,12 +3269,11 @@ static void ilk_merge_wm_level(struct drm_device *dev, /* * Merge all low power watermarks for all active pipes. */ -static void ilk_wm_merge(struct drm_device *dev, +static void ilk_wm_merge(struct drm_i915_private *dev_priv, const struct intel_wm_config *config, const struct ilk_wm_maximums *max, struct intel_pipe_wm *merged) { - struct drm_i915_private *dev_priv = to_i915(dev); int level, max_level = ilk_wm_max_level(dev_priv); int last_enabled_level = max_level; @@ -3293,7 +3289,7 @@ static void ilk_wm_merge(struct drm_device *dev, for (level = 1; level <= max_level; level++) { struct intel_wm_level *wm = &merged->wm[level]; - ilk_merge_wm_level(dev, level, wm); + ilk_merge_wm_level(dev_priv, level, wm); if (level > last_enabled_level) wm->enable = false; @@ -3335,22 +3331,20 @@ static int ilk_wm_lp_to_level(int wm_lp, const struct intel_pipe_wm *pipe_wm) } /* The value we need to program into the WM_LPx latency field */ -static unsigned int ilk_wm_lp_latency(struct drm_device *dev, int level) +static unsigned int ilk_wm_lp_latency(struct drm_i915_private *dev_priv, + int level) { - struct drm_i915_private *dev_priv = to_i915(dev); - if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) return 2 * level; else return dev_priv->wm.pri_latency[level]; } -static void ilk_compute_wm_results(struct drm_device *dev, +static void ilk_compute_wm_results(struct drm_i915_private *dev_priv, const struct intel_pipe_wm *merged, enum intel_ddb_partitioning partitioning, struct ilk_wm_values *results) { - struct drm_i915_private *dev_priv = to_i915(dev); struct intel_crtc *intel_crtc; int level, wm_lp; @@ -3370,7 +3364,7 @@ static void ilk_compute_wm_results(struct drm_device *dev, * disabled. Doing otherwise could cause underruns. */ results->wm_lp[wm_lp - 1] = - (ilk_wm_lp_latency(dev, level) << WM1_LP_LATENCY_SHIFT) | + (ilk_wm_lp_latency(dev_priv, level) << WM1_LP_LATENCY_SHIFT) | (r->pri_val << WM1_LP_SR_SHIFT) | r->cur_val; @@ -3396,7 +3390,7 @@ static void ilk_compute_wm_results(struct drm_device *dev, } /* LP0 register values */ - for_each_intel_crtc(dev, intel_crtc) { + for_each_intel_crtc(&dev_priv->drm, intel_crtc) { enum pipe pipe = intel_crtc->pipe; const struct intel_wm_level *r = &intel_crtc->wm.active.ilk.wm[0]; @@ -3415,11 +3409,12 @@ static void ilk_compute_wm_results(struct drm_device *dev, /* Find the result with the highest level enabled. Check for enable_fbc_wm in * case both are at the same level. Prefer r1 in case they're the same. */ -static struct intel_pipe_wm *ilk_find_best_result(struct drm_device *dev, - struct intel_pipe_wm *r1, - struct intel_pipe_wm *r2) +static struct intel_pipe_wm * +ilk_find_best_result(struct drm_i915_private *dev_priv, + struct intel_pipe_wm *r1, + struct intel_pipe_wm *r2) { - int level, max_level = ilk_wm_max_level(to_i915(dev)); + int level, max_level = ilk_wm_max_level(dev_priv); int level1 = 0, level2 = 0; for (level = 1; level <= max_level; level++) { @@ -4307,10 +4302,9 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *intel_cstate, } static uint16_t -skl_ddb_min_alloc(const struct drm_plane_state *pstate, const int plane) +skl_ddb_min_alloc(const struct intel_plane_state *plane_state, const int plane) { - struct drm_framebuffer *fb = pstate->fb; - struct intel_plane_state *intel_pstate = to_intel_plane_state(pstate); + struct drm_framebuffer *fb = plane_state->base.fb; uint32_t src_w, src_h; uint32_t min_scanlines = 8; uint8_t plane_bpp; @@ -4334,8 +4328,8 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, const int plane) * the 90/270 degree plane rotation cases (to match the * GTT mapping), hence no need to account for rotation here. */ - src_w = drm_rect_width(&intel_pstate->base.src) >> 16; - src_h = drm_rect_height(&intel_pstate->base.src) >> 16; + src_w = drm_rect_width(&plane_state->base.src) >> 16; + src_h = drm_rect_height(&plane_state->base.src) >> 16; /* Halve UV plane width and height for NV12 */ if (plane == 1) { @@ -4345,7 +4339,7 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, const int plane) plane_bpp = fb->format->cpp[plane]; - if (drm_rotation_90_or_270(pstate->rotation)) { + if (drm_rotation_90_or_270(plane_state->base.rotation)) { switch (plane_bpp) { case 1: min_scanlines = 32; @@ -4388,14 +4382,15 @@ skl_ddb_calc_min(const struct intel_crtc_state *cstate, int num_active, continue; if (!plane_state->linked_plane) { - minimum[plane_id] = skl_ddb_min_alloc(pstate, 0); - uv_minimum[plane_id] = skl_ddb_min_alloc(pstate, 1); + minimum[plane_id] = skl_ddb_min_alloc(plane_state, 0); + uv_minimum[plane_id] = + skl_ddb_min_alloc(plane_state, 1); } else { enum plane_id y_plane_id = plane_state->linked_plane->id; - minimum[y_plane_id] = skl_ddb_min_alloc(pstate, 0); - minimum[plane_id] = skl_ddb_min_alloc(pstate, 1); + minimum[y_plane_id] = skl_ddb_min_alloc(plane_state, 0); + minimum[plane_id] = skl_ddb_min_alloc(plane_state, 1); } } @@ -5251,15 +5246,14 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb, return false; } -static int skl_update_pipe_wm(struct drm_crtc_state *cstate, +static int skl_update_pipe_wm(struct intel_crtc_state *cstate, const struct skl_pipe_wm *old_pipe_wm, struct skl_pipe_wm *pipe_wm, /* out */ bool *changed /* out */) { - struct intel_crtc_state *intel_cstate = to_intel_crtc_state(cstate); int ret; - ret = skl_build_pipe_wm(intel_cstate, pipe_wm); + ret = skl_build_pipe_wm(cstate, pipe_wm); if (ret) return ret; @@ -5272,14 +5266,14 @@ static int skl_update_pipe_wm(struct drm_crtc_state *cstate, } static uint32_t -pipes_modified(struct drm_atomic_state *state) +pipes_modified(struct intel_atomic_state *state) { - struct drm_crtc *crtc; - struct drm_crtc_state *cstate; + struct intel_crtc *crtc; + struct intel_crtc_state *cstate; uint32_t i, ret = 0; - for_each_new_crtc_in_state(state, crtc, cstate, i) - ret |= drm_crtc_mask(crtc); + for_each_new_intel_crtc_in_state(state, crtc, cstate, i) + ret |= drm_crtc_mask(&crtc->base); return ret; } @@ -5314,11 +5308,10 @@ skl_ddb_add_affected_planes(const struct intel_crtc_state *old_crtc_state, } static int -skl_compute_ddb(struct drm_atomic_state *state) +skl_compute_ddb(struct intel_atomic_state *state) { - const struct drm_i915_private *dev_priv = to_i915(state->dev); - struct intel_atomic_state *intel_state = to_intel_atomic_state(state); - struct skl_ddb_allocation *ddb = &intel_state->wm_results.ddb; + const struct drm_i915_private *dev_priv = to_i915(state->base.dev); + struct skl_ddb_allocation *ddb = &state->wm_results.ddb; struct intel_crtc_state *old_crtc_state; struct intel_crtc_state *new_crtc_state; struct intel_crtc *crtc; @@ -5326,7 +5319,7 @@ skl_compute_ddb(struct drm_atomic_state *state) memcpy(ddb, &dev_priv->wm.skl_hw.ddb, sizeof(*ddb)); - for_each_oldnew_intel_crtc_in_state(intel_state, crtc, old_crtc_state, + for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { ret = skl_allocate_pipe_ddb(new_crtc_state, ddb); if (ret) @@ -5372,14 +5365,12 @@ skl_print_wm_changes(struct intel_atomic_state *state) } static int -skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) +skl_ddb_add_affected_pipes(struct intel_atomic_state *state, bool *changed) { - struct drm_device *dev = state->dev; + struct drm_device *dev = state->base.dev; const struct drm_i915_private *dev_priv = to_i915(dev); - const struct drm_crtc *crtc; - const struct drm_crtc_state *cstate; - struct intel_crtc *intel_crtc; - struct intel_atomic_state *intel_state = to_intel_atomic_state(state); + struct intel_crtc *crtc; + struct intel_crtc_state *crtc_state; uint32_t realloc_pipes = pipes_modified(state); int ret, i; @@ -5398,7 +5389,7 @@ skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) * since any racing commits that want to update them would need to * hold _all_ CRTC state mutexes. */ - for_each_new_crtc_in_state(state, crtc, cstate, i) + for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) (*changed) = true; if (!*changed) @@ -5412,20 +5403,20 @@ skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) */ if (dev_priv->wm.distrust_bios_wm) { ret = drm_modeset_lock(&dev->mode_config.connection_mutex, - state->acquire_ctx); + state->base.acquire_ctx); if (ret) return ret; - intel_state->active_pipe_changes = ~0; + state->active_pipe_changes = ~0; /* - * We usually only initialize intel_state->active_crtcs if we + * We usually only initialize state->active_crtcs if we * we're doing a modeset; make sure this field is always * initialized during the sanitization process that happens * on the first commit too. */ - if (!intel_state->modeset) - intel_state->active_crtcs = dev_priv->active_crtcs; + if (!state->modeset) + state->active_crtcs = dev_priv->active_crtcs; } /* @@ -5441,21 +5432,19 @@ skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) * any other display updates race with this transaction, so we need * to grab the lock on *all* CRTC's. */ - if (intel_state->active_pipe_changes || intel_state->modeset) { + if (state->active_pipe_changes || state->modeset) { realloc_pipes = ~0; - intel_state->wm_results.dirty_pipes = ~0; + state->wm_results.dirty_pipes = ~0; } /* * We're not recomputing for the pipes not included in the commit, so * make sure we start with the current state. */ - for_each_intel_crtc_mask(dev, intel_crtc, realloc_pipes) { - struct intel_crtc_state *cstate; - - cstate = intel_atomic_get_crtc_state(state, intel_crtc); - if (IS_ERR(cstate)) - return PTR_ERR(cstate); + for_each_intel_crtc_mask(dev, crtc, realloc_pipes) { + crtc_state = intel_atomic_get_crtc_state(&state->base, crtc); + if (IS_ERR(crtc_state)) + return PTR_ERR(crtc_state); } return 0; @@ -5522,12 +5511,11 @@ static int skl_wm_add_affected_planes(struct intel_atomic_state *state, } static int -skl_compute_wm(struct drm_atomic_state *state) +skl_compute_wm(struct intel_atomic_state *state) { - struct drm_crtc *crtc; - struct drm_crtc_state *cstate; - struct intel_atomic_state *intel_state = to_intel_atomic_state(state); - struct skl_ddb_values *results = &intel_state->wm_results; + struct intel_crtc *crtc; + struct intel_crtc_state *cstate; + struct skl_ddb_values *results = &state->wm_results; struct skl_pipe_wm *pipe_wm; bool changed = false; int ret, i; @@ -5553,33 +5541,30 @@ skl_compute_wm(struct drm_atomic_state *state) * should allow skl_update_pipe_wm() to return failure in cases where * no suitable watermark values can be found. */ - for_each_new_crtc_in_state(state, crtc, cstate, i) { - struct intel_crtc_state *intel_cstate = - to_intel_crtc_state(cstate); + for_each_new_intel_crtc_in_state(state, crtc, cstate, i) { const struct skl_pipe_wm *old_pipe_wm = - &to_intel_crtc_state(crtc->state)->wm.skl.optimal; + &to_intel_crtc_state(crtc->base.state)->wm.skl.optimal; - pipe_wm = &intel_cstate->wm.skl.optimal; + pipe_wm = &cstate->wm.skl.optimal; ret = skl_update_pipe_wm(cstate, old_pipe_wm, pipe_wm, &changed); if (ret) return ret; - ret = skl_wm_add_affected_planes(intel_state, - to_intel_crtc(crtc)); + ret = skl_wm_add_affected_planes(state, crtc); if (ret) return ret; if (changed) - results->dirty_pipes |= drm_crtc_mask(crtc); + results->dirty_pipes |= drm_crtc_mask(&crtc->base); - if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0) + if ((results->dirty_pipes & drm_crtc_mask(&crtc->base)) == 0) /* This pipe's WM's did not change */ continue; - intel_cstate->update_wm_pre = true; + cstate->update_wm_pre = true; } - skl_print_wm_changes(intel_state); + skl_print_wm_changes(state); return 0; } @@ -5617,13 +5602,13 @@ static void skl_initial_wm(struct intel_atomic_state *state, mutex_unlock(&dev_priv->wm.wm_mutex); } -static void ilk_compute_wm_config(struct drm_device *dev, +static void ilk_compute_wm_config(struct drm_i915_private *dev_priv, struct intel_wm_config *config) { struct intel_crtc *crtc; /* Compute the currently _active_ config */ - for_each_intel_crtc(dev, crtc) { + for_each_intel_crtc(&dev_priv->drm, crtc) { const struct intel_pipe_wm *wm = &crtc->wm.active.ilk; if (!wm->pipe_enabled) @@ -5637,25 +5622,24 @@ static void ilk_compute_wm_config(struct drm_device *dev, static void ilk_program_watermarks(struct drm_i915_private *dev_priv) { - struct drm_device *dev = &dev_priv->drm; struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm; struct ilk_wm_maximums max; struct intel_wm_config config = {}; struct ilk_wm_values results = {}; enum intel_ddb_partitioning partitioning; - ilk_compute_wm_config(dev, &config); + ilk_compute_wm_config(dev_priv, &config); - ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_1_2, &max); - ilk_wm_merge(dev, &config, &max, &lp_wm_1_2); + ilk_compute_wm_maximums(dev_priv, 1, &config, INTEL_DDB_PART_1_2, &max); + ilk_wm_merge(dev_priv, &config, &max, &lp_wm_1_2); /* 5/6 split only in single pipe config on IVB+ */ if (INTEL_GEN(dev_priv) >= 7 && config.num_pipes_active == 1 && config.sprites_enabled) { - ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max); - ilk_wm_merge(dev, &config, &max, &lp_wm_5_6); + ilk_compute_wm_maximums(dev_priv, 1, &config, INTEL_DDB_PART_5_6, &max); + ilk_wm_merge(dev_priv, &config, &max, &lp_wm_5_6); - best_lp_wm = ilk_find_best_result(dev, &lp_wm_1_2, &lp_wm_5_6); + best_lp_wm = ilk_find_best_result(dev_priv, &lp_wm_1_2, &lp_wm_5_6); } else { best_lp_wm = &lp_wm_1_2; } @@ -5663,7 +5647,7 @@ static void ilk_program_watermarks(struct drm_i915_private *dev_priv) partitioning = (best_lp_wm == &lp_wm_1_2) ? INTEL_DDB_PART_1_2 : INTEL_DDB_PART_5_6; - ilk_compute_wm_results(dev, best_lp_wm, partitioning, &results); + ilk_compute_wm_results(dev_priv, best_lp_wm, partitioning, &results); ilk_write_wm_values(dev_priv, &results); } @@ -5703,19 +5687,18 @@ static inline void skl_wm_level_from_reg_val(uint32_t val, PLANE_WM_LINES_MASK; } -void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, +void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, struct skl_pipe_wm *out) { - struct drm_i915_private *dev_priv = to_i915(crtc->dev); - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum pipe pipe = intel_crtc->pipe; + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); + enum pipe pipe = crtc->pipe; int level, max_level; enum plane_id plane_id; uint32_t val; max_level = ilk_wm_max_level(dev_priv); - for_each_plane_id_on_crtc(intel_crtc, plane_id) { + for_each_plane_id_on_crtc(crtc, plane_id) { struct skl_plane_wm *wm = &out->planes[plane_id]; for (level = 0; level <= max_level; level++) { @@ -5735,30 +5718,27 @@ void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, skl_wm_level_from_reg_val(val, &wm->trans_wm); } - if (!intel_crtc->active) + if (!crtc->active) return; out->linetime = I915_READ(PIPE_WM_LINETIME(pipe)); } -void skl_wm_get_hw_state(struct drm_device *dev) +void skl_wm_get_hw_state(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = to_i915(dev); struct skl_ddb_values *hw = &dev_priv->wm.skl_hw; struct skl_ddb_allocation *ddb = &dev_priv->wm.skl_hw.ddb; - struct drm_crtc *crtc; - struct intel_crtc *intel_crtc; + struct intel_crtc *crtc; struct intel_crtc_state *cstate; skl_ddb_get_hw_state(dev_priv, ddb); - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { - intel_crtc = to_intel_crtc(crtc); - cstate = to_intel_crtc_state(crtc->state); + for_each_intel_crtc(&dev_priv->drm, crtc) { + cstate = to_intel_crtc_state(crtc->base.state); skl_pipe_wm_get_hw_state(crtc, &cstate->wm.skl.optimal); - if (intel_crtc->active) - hw->dirty_pipes |= drm_crtc_mask(crtc); + if (crtc->active) + hw->dirty_pipes |= drm_crtc_mask(&crtc->base); } if (dev_priv->active_crtcs) { @@ -5767,15 +5747,14 @@ void skl_wm_get_hw_state(struct drm_device *dev) } } -static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) +static void ilk_pipe_wm_get_hw_state(struct intel_crtc *crtc) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); struct ilk_wm_values *hw = &dev_priv->wm.hw; - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state); + struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->base.state); struct intel_pipe_wm *active = &cstate->wm.ilk.optimal; - enum pipe pipe = intel_crtc->pipe; + enum pipe pipe = crtc->pipe; static const i915_reg_t wm0_pipe_reg[] = { [PIPE_A] = WM0_PIPEA_ILK, [PIPE_B] = WM0_PIPEB_ILK, @@ -5788,7 +5767,7 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) memset(active, 0, sizeof(*active)); - active->pipe_enabled = intel_crtc->active; + active->pipe_enabled = crtc->active; if (active->pipe_enabled) { u32 tmp = hw->wm_pipe[pipe]; @@ -5816,7 +5795,7 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) active->wm[level].enable = true; } - intel_crtc->wm.active.ilk = *active; + crtc->wm.active.ilk = *active; } #define _FW_WM(value, plane) \ @@ -5926,9 +5905,8 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, #undef _FW_WM #undef _FW_WM_VLV -void g4x_wm_get_hw_state(struct drm_device *dev) +void g4x_wm_get_hw_state(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = to_i915(dev); struct g4x_wm_values *wm = &dev_priv->wm.g4x; struct intel_crtc *crtc; @@ -5936,7 +5914,7 @@ void g4x_wm_get_hw_state(struct drm_device *dev) wm->cxsr = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN; - for_each_intel_crtc(dev, crtc) { + for_each_intel_crtc(&dev_priv->drm, crtc) { struct intel_crtc_state *crtc_state = to_intel_crtc_state(crtc->base.state); struct g4x_wm_state *active = &crtc->wm.active.g4x; @@ -6067,9 +6045,8 @@ void g4x_wm_sanitize(struct drm_i915_private *dev_priv) mutex_unlock(&dev_priv->wm.wm_mutex); } -void vlv_wm_get_hw_state(struct drm_device *dev) +void vlv_wm_get_hw_state(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = to_i915(dev); struct vlv_wm_values *wm = &dev_priv->wm.vlv; struct intel_crtc *crtc; u32 val; @@ -6113,7 +6090,7 @@ void vlv_wm_get_hw_state(struct drm_device *dev) mutex_unlock(&dev_priv->pcu_lock); } - for_each_intel_crtc(dev, crtc) { + for_each_intel_crtc(&dev_priv->drm, crtc) { struct intel_crtc_state *crtc_state = to_intel_crtc_state(crtc->base.state); struct vlv_wm_state *active = &crtc->wm.active.vlv; @@ -6230,15 +6207,14 @@ static void ilk_init_lp_watermarks(struct drm_i915_private *dev_priv) */ } -void ilk_wm_get_hw_state(struct drm_device *dev) +void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = to_i915(dev); struct ilk_wm_values *hw = &dev_priv->wm.hw; - struct drm_crtc *crtc; + struct intel_crtc *crtc; ilk_init_lp_watermarks(dev_priv); - for_each_crtc(dev, crtc) + for_each_intel_crtc(&dev_priv->drm, crtc) ilk_pipe_wm_get_hw_state(crtc); hw->wm_lp[0] = I915_READ(WM1_LP_ILK); -- 2.14.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] drm/i915: Use intel_ types more consistently for watermark code 2018-12-07 0:54 ` [PATCH 1/2] drm/i915: Use intel_ types more consistently for watermark code Matt Roper @ 2018-12-10 19:27 ` Ville Syrjälä 0 siblings, 0 replies; 10+ messages in thread From: Ville Syrjälä @ 2018-12-10 19:27 UTC (permalink / raw) To: Matt Roper; +Cc: intel-gfx On Thu, Dec 06, 2018 at 04:54:00PM -0800, Matt Roper wrote: > Try to be more consistent about intel_* types rather than drm_* types > for lower-level driver functions. > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 5 +- > drivers/gpu/drm/i915/intel_display.c | 32 ++--- > drivers/gpu/drm/i915/intel_drv.h | 10 +- > drivers/gpu/drm/i915/intel_pm.c | 250 ++++++++++++++++------------------- > 4 files changed, 134 insertions(+), 163 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 0689e67c966e..7469a7785253 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -281,8 +281,7 @@ struct drm_i915_display_funcs { > int (*get_fifo_size)(struct drm_i915_private *dev_priv, > enum i9xx_plane_id i9xx_plane); > int (*compute_pipe_wm)(struct intel_crtc_state *cstate); > - int (*compute_intermediate_wm)(struct drm_device *dev, > - struct intel_crtc *intel_crtc, > + int (*compute_intermediate_wm)(struct intel_crtc *intel_crtc, We could omit this argument too since it can be derived from the crtc state. Anyways, patch is Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > struct intel_crtc_state *newstate); > void (*initial_watermarks)(struct intel_atomic_state *state, > struct intel_crtc_state *cstate); > @@ -290,7 +289,7 @@ struct drm_i915_display_funcs { > struct intel_crtc_state *cstate); > void (*optimize_watermarks)(struct intel_atomic_state *state, > struct intel_crtc_state *cstate); > - int (*compute_global_watermarks)(struct drm_atomic_state *state); > + int (*compute_global_watermarks)(struct intel_atomic_state *state); > void (*update_wm)(struct intel_crtc *crtc); > int (*modeset_calc_cdclk)(struct drm_atomic_state *state); > /* Returns the active state of the crtc, and if the crtc is active, > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 07c861884c70..db6004a883c7 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10661,12 +10661,9 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) > * > * Returns true or false. > */ > -static bool intel_wm_need_update(struct drm_plane *plane, > - struct drm_plane_state *state) > +static bool intel_wm_need_update(struct intel_plane_state *cur, > + struct intel_plane_state *new) > { > - struct intel_plane_state *new = to_intel_plane_state(state); > - struct intel_plane_state *cur = to_intel_plane_state(plane->state); > - > /* Update watermarks on tiling or size changes. */ > if (new->base.visible != cur->base.visible) > return true; > @@ -10775,7 +10772,8 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat > /* must disable cxsr around plane enable/disable */ > if (plane->id != PLANE_CURSOR) > pipe_config->disable_cxsr = true; > - } else if (intel_wm_need_update(&plane->base, plane_state)) { > + } else if (intel_wm_need_update(to_intel_plane_state(plane->base.state), > + to_intel_plane_state(plane_state))) { > if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv)) { > /* FIXME bollocks */ > pipe_config->update_wm_pre = true; > @@ -10954,8 +10952,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state) > static int intel_crtc_atomic_check(struct drm_crtc *crtc, > struct drm_crtc_state *crtc_state) > { > - struct drm_device *dev = crtc->dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct drm_i915_private *dev_priv = to_i915(crtc->dev); > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > struct intel_crtc_state *pipe_config = > to_intel_crtc_state(crtc_state); > @@ -11004,8 +11001,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, > * old state and the new state. We can program these > * immediately. > */ > - ret = dev_priv->display.compute_intermediate_wm(dev, > - intel_crtc, > + ret = dev_priv->display.compute_intermediate_wm(intel_crtc, > pipe_config); > if (ret) { > DRM_DEBUG_KMS("No valid intermediate pipe watermarks are possible\n"); > @@ -11964,7 +11960,7 @@ static void verify_wm_state(struct drm_crtc *crtc, > if (INTEL_GEN(dev_priv) < 9 || !new_state->active) > return; > > - skl_pipe_wm_get_hw_state(crtc, &hw_wm); > + skl_pipe_wm_get_hw_state(intel_crtc, &hw_wm); > sw_wm = &to_intel_crtc_state(new_state)->wm.skl.optimal; > > skl_pipe_ddb_get_hw_state(intel_crtc, hw_ddb_y, hw_ddb_uv); > @@ -12619,9 +12615,9 @@ static int intel_modeset_checks(struct drm_atomic_state *state) > * phase. The code here should be run after the per-crtc and per-plane 'check' > * handlers to ensure that all derived state has been updated. > */ > -static int calc_watermark_data(struct drm_atomic_state *state) > +static int calc_watermark_data(struct intel_atomic_state *state) > { > - struct drm_device *dev = state->dev; > + struct drm_device *dev = state->base.dev; > struct drm_i915_private *dev_priv = to_i915(dev); > > /* Is there platform-specific watermark information to calculate? */ > @@ -12713,7 +12709,7 @@ static int intel_atomic_check(struct drm_device *dev, > return ret; > > intel_fbc_choose_crtc(dev_priv, intel_state); > - return calc_watermark_data(state); > + return calc_watermark_data(intel_state); > } > > static int intel_atomic_prepare_commit(struct drm_device *dev, > @@ -15843,15 +15839,15 @@ intel_modeset_setup_hw_state(struct drm_device *dev, > } > > if (IS_G4X(dev_priv)) { > - g4x_wm_get_hw_state(dev); > + g4x_wm_get_hw_state(dev_priv); > g4x_wm_sanitize(dev_priv); > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > - vlv_wm_get_hw_state(dev); > + vlv_wm_get_hw_state(dev_priv); > vlv_wm_sanitize(dev_priv); > } else if (INTEL_GEN(dev_priv) >= 9) { > - skl_wm_get_hw_state(dev); > + skl_wm_get_hw_state(dev_priv); > } else if (HAS_PCH_SPLIT(dev_priv)) { > - ilk_wm_get_hw_state(dev); > + ilk_wm_get_hw_state(dev_priv); > } > > for_each_intel_crtc(dev, crtc) { > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index f94a04b4ad87..a8177ccf1d4f 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -2200,16 +2200,16 @@ void gen6_rps_busy(struct drm_i915_private *dev_priv); > void gen6_rps_reset_ei(struct drm_i915_private *dev_priv); > void gen6_rps_idle(struct drm_i915_private *dev_priv); > void gen6_rps_boost(struct i915_request *rq, struct intel_rps_client *rps); > -void g4x_wm_get_hw_state(struct drm_device *dev); > -void vlv_wm_get_hw_state(struct drm_device *dev); > -void ilk_wm_get_hw_state(struct drm_device *dev); > -void skl_wm_get_hw_state(struct drm_device *dev); > +void g4x_wm_get_hw_state(struct drm_i915_private *dev_priv); > +void vlv_wm_get_hw_state(struct drm_i915_private *dev_priv); > +void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv); > +void skl_wm_get_hw_state(struct drm_i915_private *dev_priv); > void skl_pipe_ddb_get_hw_state(struct intel_crtc *crtc, > struct skl_ddb_entry *ddb_y, > struct skl_ddb_entry *ddb_uv); > void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, > struct skl_ddb_allocation *ddb /* out */); > -void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, > +void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, > struct skl_pipe_wm *out); > void g4x_wm_sanitize(struct drm_i915_private *dev_priv); > void vlv_wm_sanitize(struct drm_i915_private *dev_priv); > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index a26b4eddda25..efb8bcf77fb8 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -1399,8 +1399,7 @@ static int g4x_compute_pipe_wm(struct intel_crtc_state *crtc_state) > return 0; > } > > -static int g4x_compute_intermediate_wm(struct drm_device *dev, > - struct intel_crtc *crtc, > +static int g4x_compute_intermediate_wm(struct intel_crtc *crtc, > struct intel_crtc_state *new_crtc_state) > { > struct g4x_wm_state *intermediate = &new_crtc_state->wm.g4x.intermediate; > @@ -2032,8 +2031,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, > > #undef VLV_FIFO > > -static int vlv_compute_intermediate_wm(struct drm_device *dev, > - struct intel_crtc *crtc, > +static int vlv_compute_intermediate_wm(struct intel_crtc *crtc, > struct intel_crtc_state *new_crtc_state) > { > struct vlv_wm_state *intermediate = &new_crtc_state->wm.vlv.intermediate; > @@ -2626,13 +2624,12 @@ static unsigned int ilk_fbc_wm_reg_max(const struct drm_i915_private *dev_priv) > } > > /* Calculate the maximum primary/sprite plane watermark */ > -static unsigned int ilk_plane_wm_max(const struct drm_device *dev, > +static unsigned int ilk_plane_wm_max(const struct drm_i915_private *dev_priv, > int level, > const struct intel_wm_config *config, > enum intel_ddb_partitioning ddb_partitioning, > bool is_sprite) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > unsigned int fifo_size = ilk_display_fifo_size(dev_priv); > > /* if sprites aren't enabled, sprites get nothing */ > @@ -2668,7 +2665,7 @@ static unsigned int ilk_plane_wm_max(const struct drm_device *dev, > } > > /* Calculate the maximum cursor plane watermark */ > -static unsigned int ilk_cursor_wm_max(const struct drm_device *dev, > +static unsigned int ilk_cursor_wm_max(const struct drm_i915_private *dev_priv, > int level, > const struct intel_wm_config *config) > { > @@ -2677,19 +2674,19 @@ static unsigned int ilk_cursor_wm_max(const struct drm_device *dev, > return 64; > > /* otherwise just report max that registers can hold */ > - return ilk_cursor_wm_reg_max(to_i915(dev), level); > + return ilk_cursor_wm_reg_max(dev_priv, level); > } > > -static void ilk_compute_wm_maximums(const struct drm_device *dev, > +static void ilk_compute_wm_maximums(const struct drm_i915_private *dev_priv, > int level, > const struct intel_wm_config *config, > enum intel_ddb_partitioning ddb_partitioning, > struct ilk_wm_maximums *max) > { > - max->pri = ilk_plane_wm_max(dev, level, config, ddb_partitioning, false); > - max->spr = ilk_plane_wm_max(dev, level, config, ddb_partitioning, true); > - max->cur = ilk_cursor_wm_max(dev, level, config); > - max->fbc = ilk_fbc_wm_reg_max(to_i915(dev)); > + max->pri = ilk_plane_wm_max(dev_priv, level, config, ddb_partitioning, false); > + max->spr = ilk_plane_wm_max(dev_priv, level, config, ddb_partitioning, true); > + max->cur = ilk_cursor_wm_max(dev_priv, level, config); > + max->fbc = ilk_fbc_wm_reg_max(dev_priv); > } > > static void ilk_compute_wm_reg_maximums(const struct drm_i915_private *dev_priv, > @@ -3073,7 +3070,7 @@ static void skl_setup_wm_latency(struct drm_i915_private *dev_priv) > intel_print_wm_latency(dev_priv, "Gen9 Plane", dev_priv->wm.skl_latency); > } > > -static bool ilk_validate_pipe_wm(struct drm_device *dev, > +static bool ilk_validate_pipe_wm(const struct drm_i915_private *dev_priv, > struct intel_pipe_wm *pipe_wm) > { > /* LP0 watermark maximums depend on this pipe alone */ > @@ -3085,7 +3082,7 @@ static bool ilk_validate_pipe_wm(struct drm_device *dev, > struct ilk_wm_maximums max; > > /* LP0 watermarks always use 1/2 DDB partitioning */ > - ilk_compute_wm_maximums(dev, 0, &config, INTEL_DDB_PART_1_2, &max); > + ilk_compute_wm_maximums(dev_priv, 0, &config, INTEL_DDB_PART_1_2, &max); > > /* At least LP0 must be valid */ > if (!ilk_validate_wm_level(0, &max, &pipe_wm->wm[0])) { > @@ -3150,7 +3147,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) > if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > pipe_wm->linetime = hsw_compute_linetime_wm(cstate); > > - if (!ilk_validate_pipe_wm(dev, pipe_wm)) > + if (!ilk_validate_pipe_wm(dev_priv, pipe_wm)) > return -EINVAL; > > ilk_compute_wm_reg_maximums(dev_priv, 1, &max); > @@ -3180,17 +3177,17 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) > * state and the new state. These can be programmed to the hardware > * immediately. > */ > -static int ilk_compute_intermediate_wm(struct drm_device *dev, > - struct intel_crtc *intel_crtc, > +static int ilk_compute_intermediate_wm(struct intel_crtc *intel_crtc, > struct intel_crtc_state *newstate) > { > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > struct intel_pipe_wm *a = &newstate->wm.ilk.intermediate; > struct intel_atomic_state *intel_state = > to_intel_atomic_state(newstate->base.state); > const struct intel_crtc_state *oldstate = > intel_atomic_get_old_crtc_state(intel_state, intel_crtc); > const struct intel_pipe_wm *b = &oldstate->wm.ilk.optimal; > - int level, max_level = ilk_wm_max_level(to_i915(dev)); > + int level, max_level = ilk_wm_max_level(dev_priv); > > /* > * Start with the final, target watermarks, then combine with the > @@ -3223,7 +3220,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev, > * there's no safe way to transition from the old state to > * the new state, so we need to fail the atomic transaction. > */ > - if (!ilk_validate_pipe_wm(dev, a)) > + if (!ilk_validate_pipe_wm(dev_priv, a)) > return -EINVAL; > > /* > @@ -3239,7 +3236,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev, > /* > * Merge the watermarks from all active pipes for a specific level. > */ > -static void ilk_merge_wm_level(struct drm_device *dev, > +static void ilk_merge_wm_level(struct drm_i915_private *dev_priv, > int level, > struct intel_wm_level *ret_wm) > { > @@ -3247,7 +3244,7 @@ static void ilk_merge_wm_level(struct drm_device *dev, > > ret_wm->enable = true; > > - for_each_intel_crtc(dev, intel_crtc) { > + for_each_intel_crtc(&dev_priv->drm, intel_crtc) { > const struct intel_pipe_wm *active = &intel_crtc->wm.active.ilk; > const struct intel_wm_level *wm = &active->wm[level]; > > @@ -3272,12 +3269,11 @@ static void ilk_merge_wm_level(struct drm_device *dev, > /* > * Merge all low power watermarks for all active pipes. > */ > -static void ilk_wm_merge(struct drm_device *dev, > +static void ilk_wm_merge(struct drm_i915_private *dev_priv, > const struct intel_wm_config *config, > const struct ilk_wm_maximums *max, > struct intel_pipe_wm *merged) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > int level, max_level = ilk_wm_max_level(dev_priv); > int last_enabled_level = max_level; > > @@ -3293,7 +3289,7 @@ static void ilk_wm_merge(struct drm_device *dev, > for (level = 1; level <= max_level; level++) { > struct intel_wm_level *wm = &merged->wm[level]; > > - ilk_merge_wm_level(dev, level, wm); > + ilk_merge_wm_level(dev_priv, level, wm); > > if (level > last_enabled_level) > wm->enable = false; > @@ -3335,22 +3331,20 @@ static int ilk_wm_lp_to_level(int wm_lp, const struct intel_pipe_wm *pipe_wm) > } > > /* The value we need to program into the WM_LPx latency field */ > -static unsigned int ilk_wm_lp_latency(struct drm_device *dev, int level) > +static unsigned int ilk_wm_lp_latency(struct drm_i915_private *dev_priv, > + int level) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > - > if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > return 2 * level; > else > return dev_priv->wm.pri_latency[level]; > } > > -static void ilk_compute_wm_results(struct drm_device *dev, > +static void ilk_compute_wm_results(struct drm_i915_private *dev_priv, > const struct intel_pipe_wm *merged, > enum intel_ddb_partitioning partitioning, > struct ilk_wm_values *results) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > struct intel_crtc *intel_crtc; > int level, wm_lp; > > @@ -3370,7 +3364,7 @@ static void ilk_compute_wm_results(struct drm_device *dev, > * disabled. Doing otherwise could cause underruns. > */ > results->wm_lp[wm_lp - 1] = > - (ilk_wm_lp_latency(dev, level) << WM1_LP_LATENCY_SHIFT) | > + (ilk_wm_lp_latency(dev_priv, level) << WM1_LP_LATENCY_SHIFT) | > (r->pri_val << WM1_LP_SR_SHIFT) | > r->cur_val; > > @@ -3396,7 +3390,7 @@ static void ilk_compute_wm_results(struct drm_device *dev, > } > > /* LP0 register values */ > - for_each_intel_crtc(dev, intel_crtc) { > + for_each_intel_crtc(&dev_priv->drm, intel_crtc) { > enum pipe pipe = intel_crtc->pipe; > const struct intel_wm_level *r = > &intel_crtc->wm.active.ilk.wm[0]; > @@ -3415,11 +3409,12 @@ static void ilk_compute_wm_results(struct drm_device *dev, > > /* Find the result with the highest level enabled. Check for enable_fbc_wm in > * case both are at the same level. Prefer r1 in case they're the same. */ > -static struct intel_pipe_wm *ilk_find_best_result(struct drm_device *dev, > - struct intel_pipe_wm *r1, > - struct intel_pipe_wm *r2) > +static struct intel_pipe_wm * > +ilk_find_best_result(struct drm_i915_private *dev_priv, > + struct intel_pipe_wm *r1, > + struct intel_pipe_wm *r2) > { > - int level, max_level = ilk_wm_max_level(to_i915(dev)); > + int level, max_level = ilk_wm_max_level(dev_priv); > int level1 = 0, level2 = 0; > > for (level = 1; level <= max_level; level++) { > @@ -4307,10 +4302,9 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *intel_cstate, > } > > static uint16_t > -skl_ddb_min_alloc(const struct drm_plane_state *pstate, const int plane) > +skl_ddb_min_alloc(const struct intel_plane_state *plane_state, const int plane) > { > - struct drm_framebuffer *fb = pstate->fb; > - struct intel_plane_state *intel_pstate = to_intel_plane_state(pstate); > + struct drm_framebuffer *fb = plane_state->base.fb; > uint32_t src_w, src_h; > uint32_t min_scanlines = 8; > uint8_t plane_bpp; > @@ -4334,8 +4328,8 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, const int plane) > * the 90/270 degree plane rotation cases (to match the > * GTT mapping), hence no need to account for rotation here. > */ > - src_w = drm_rect_width(&intel_pstate->base.src) >> 16; > - src_h = drm_rect_height(&intel_pstate->base.src) >> 16; > + src_w = drm_rect_width(&plane_state->base.src) >> 16; > + src_h = drm_rect_height(&plane_state->base.src) >> 16; > > /* Halve UV plane width and height for NV12 */ > if (plane == 1) { > @@ -4345,7 +4339,7 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, const int plane) > > plane_bpp = fb->format->cpp[plane]; > > - if (drm_rotation_90_or_270(pstate->rotation)) { > + if (drm_rotation_90_or_270(plane_state->base.rotation)) { > switch (plane_bpp) { > case 1: > min_scanlines = 32; > @@ -4388,14 +4382,15 @@ skl_ddb_calc_min(const struct intel_crtc_state *cstate, int num_active, > continue; > > if (!plane_state->linked_plane) { > - minimum[plane_id] = skl_ddb_min_alloc(pstate, 0); > - uv_minimum[plane_id] = skl_ddb_min_alloc(pstate, 1); > + minimum[plane_id] = skl_ddb_min_alloc(plane_state, 0); > + uv_minimum[plane_id] = > + skl_ddb_min_alloc(plane_state, 1); > } else { > enum plane_id y_plane_id = > plane_state->linked_plane->id; > > - minimum[y_plane_id] = skl_ddb_min_alloc(pstate, 0); > - minimum[plane_id] = skl_ddb_min_alloc(pstate, 1); > + minimum[y_plane_id] = skl_ddb_min_alloc(plane_state, 0); > + minimum[plane_id] = skl_ddb_min_alloc(plane_state, 1); > } > } > > @@ -5251,15 +5246,14 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb, > return false; > } > > -static int skl_update_pipe_wm(struct drm_crtc_state *cstate, > +static int skl_update_pipe_wm(struct intel_crtc_state *cstate, > const struct skl_pipe_wm *old_pipe_wm, > struct skl_pipe_wm *pipe_wm, /* out */ > bool *changed /* out */) > { > - struct intel_crtc_state *intel_cstate = to_intel_crtc_state(cstate); > int ret; > > - ret = skl_build_pipe_wm(intel_cstate, pipe_wm); > + ret = skl_build_pipe_wm(cstate, pipe_wm); > if (ret) > return ret; > > @@ -5272,14 +5266,14 @@ static int skl_update_pipe_wm(struct drm_crtc_state *cstate, > } > > static uint32_t > -pipes_modified(struct drm_atomic_state *state) > +pipes_modified(struct intel_atomic_state *state) > { > - struct drm_crtc *crtc; > - struct drm_crtc_state *cstate; > + struct intel_crtc *crtc; > + struct intel_crtc_state *cstate; > uint32_t i, ret = 0; > > - for_each_new_crtc_in_state(state, crtc, cstate, i) > - ret |= drm_crtc_mask(crtc); > + for_each_new_intel_crtc_in_state(state, crtc, cstate, i) > + ret |= drm_crtc_mask(&crtc->base); > > return ret; > } > @@ -5314,11 +5308,10 @@ skl_ddb_add_affected_planes(const struct intel_crtc_state *old_crtc_state, > } > > static int > -skl_compute_ddb(struct drm_atomic_state *state) > +skl_compute_ddb(struct intel_atomic_state *state) > { > - const struct drm_i915_private *dev_priv = to_i915(state->dev); > - struct intel_atomic_state *intel_state = to_intel_atomic_state(state); > - struct skl_ddb_allocation *ddb = &intel_state->wm_results.ddb; > + const struct drm_i915_private *dev_priv = to_i915(state->base.dev); > + struct skl_ddb_allocation *ddb = &state->wm_results.ddb; > struct intel_crtc_state *old_crtc_state; > struct intel_crtc_state *new_crtc_state; > struct intel_crtc *crtc; > @@ -5326,7 +5319,7 @@ skl_compute_ddb(struct drm_atomic_state *state) > > memcpy(ddb, &dev_priv->wm.skl_hw.ddb, sizeof(*ddb)); > > - for_each_oldnew_intel_crtc_in_state(intel_state, crtc, old_crtc_state, > + for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, > new_crtc_state, i) { > ret = skl_allocate_pipe_ddb(new_crtc_state, ddb); > if (ret) > @@ -5372,14 +5365,12 @@ skl_print_wm_changes(struct intel_atomic_state *state) > } > > static int > -skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) > +skl_ddb_add_affected_pipes(struct intel_atomic_state *state, bool *changed) > { > - struct drm_device *dev = state->dev; > + struct drm_device *dev = state->base.dev; > const struct drm_i915_private *dev_priv = to_i915(dev); > - const struct drm_crtc *crtc; > - const struct drm_crtc_state *cstate; > - struct intel_crtc *intel_crtc; > - struct intel_atomic_state *intel_state = to_intel_atomic_state(state); > + struct intel_crtc *crtc; > + struct intel_crtc_state *crtc_state; > uint32_t realloc_pipes = pipes_modified(state); > int ret, i; > > @@ -5398,7 +5389,7 @@ skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) > * since any racing commits that want to update them would need to > * hold _all_ CRTC state mutexes. > */ > - for_each_new_crtc_in_state(state, crtc, cstate, i) > + for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) > (*changed) = true; > > if (!*changed) > @@ -5412,20 +5403,20 @@ skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) > */ > if (dev_priv->wm.distrust_bios_wm) { > ret = drm_modeset_lock(&dev->mode_config.connection_mutex, > - state->acquire_ctx); > + state->base.acquire_ctx); > if (ret) > return ret; > > - intel_state->active_pipe_changes = ~0; > + state->active_pipe_changes = ~0; > > /* > - * We usually only initialize intel_state->active_crtcs if we > + * We usually only initialize state->active_crtcs if we > * we're doing a modeset; make sure this field is always > * initialized during the sanitization process that happens > * on the first commit too. > */ > - if (!intel_state->modeset) > - intel_state->active_crtcs = dev_priv->active_crtcs; > + if (!state->modeset) > + state->active_crtcs = dev_priv->active_crtcs; > } > > /* > @@ -5441,21 +5432,19 @@ skl_ddb_add_affected_pipes(struct drm_atomic_state *state, bool *changed) > * any other display updates race with this transaction, so we need > * to grab the lock on *all* CRTC's. > */ > - if (intel_state->active_pipe_changes || intel_state->modeset) { > + if (state->active_pipe_changes || state->modeset) { > realloc_pipes = ~0; > - intel_state->wm_results.dirty_pipes = ~0; > + state->wm_results.dirty_pipes = ~0; > } > > /* > * We're not recomputing for the pipes not included in the commit, so > * make sure we start with the current state. > */ > - for_each_intel_crtc_mask(dev, intel_crtc, realloc_pipes) { > - struct intel_crtc_state *cstate; > - > - cstate = intel_atomic_get_crtc_state(state, intel_crtc); > - if (IS_ERR(cstate)) > - return PTR_ERR(cstate); > + for_each_intel_crtc_mask(dev, crtc, realloc_pipes) { > + crtc_state = intel_atomic_get_crtc_state(&state->base, crtc); > + if (IS_ERR(crtc_state)) > + return PTR_ERR(crtc_state); > } > > return 0; > @@ -5522,12 +5511,11 @@ static int skl_wm_add_affected_planes(struct intel_atomic_state *state, > } > > static int > -skl_compute_wm(struct drm_atomic_state *state) > +skl_compute_wm(struct intel_atomic_state *state) > { > - struct drm_crtc *crtc; > - struct drm_crtc_state *cstate; > - struct intel_atomic_state *intel_state = to_intel_atomic_state(state); > - struct skl_ddb_values *results = &intel_state->wm_results; > + struct intel_crtc *crtc; > + struct intel_crtc_state *cstate; > + struct skl_ddb_values *results = &state->wm_results; > struct skl_pipe_wm *pipe_wm; > bool changed = false; > int ret, i; > @@ -5553,33 +5541,30 @@ skl_compute_wm(struct drm_atomic_state *state) > * should allow skl_update_pipe_wm() to return failure in cases where > * no suitable watermark values can be found. > */ > - for_each_new_crtc_in_state(state, crtc, cstate, i) { > - struct intel_crtc_state *intel_cstate = > - to_intel_crtc_state(cstate); > + for_each_new_intel_crtc_in_state(state, crtc, cstate, i) { > const struct skl_pipe_wm *old_pipe_wm = > - &to_intel_crtc_state(crtc->state)->wm.skl.optimal; > + &to_intel_crtc_state(crtc->base.state)->wm.skl.optimal; > > - pipe_wm = &intel_cstate->wm.skl.optimal; > + pipe_wm = &cstate->wm.skl.optimal; > ret = skl_update_pipe_wm(cstate, old_pipe_wm, pipe_wm, &changed); > if (ret) > return ret; > > - ret = skl_wm_add_affected_planes(intel_state, > - to_intel_crtc(crtc)); > + ret = skl_wm_add_affected_planes(state, crtc); > if (ret) > return ret; > > if (changed) > - results->dirty_pipes |= drm_crtc_mask(crtc); > + results->dirty_pipes |= drm_crtc_mask(&crtc->base); > > - if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0) > + if ((results->dirty_pipes & drm_crtc_mask(&crtc->base)) == 0) > /* This pipe's WM's did not change */ > continue; > > - intel_cstate->update_wm_pre = true; > + cstate->update_wm_pre = true; > } > > - skl_print_wm_changes(intel_state); > + skl_print_wm_changes(state); > > return 0; > } > @@ -5617,13 +5602,13 @@ static void skl_initial_wm(struct intel_atomic_state *state, > mutex_unlock(&dev_priv->wm.wm_mutex); > } > > -static void ilk_compute_wm_config(struct drm_device *dev, > +static void ilk_compute_wm_config(struct drm_i915_private *dev_priv, > struct intel_wm_config *config) > { > struct intel_crtc *crtc; > > /* Compute the currently _active_ config */ > - for_each_intel_crtc(dev, crtc) { > + for_each_intel_crtc(&dev_priv->drm, crtc) { > const struct intel_pipe_wm *wm = &crtc->wm.active.ilk; > > if (!wm->pipe_enabled) > @@ -5637,25 +5622,24 @@ static void ilk_compute_wm_config(struct drm_device *dev, > > static void ilk_program_watermarks(struct drm_i915_private *dev_priv) > { > - struct drm_device *dev = &dev_priv->drm; > struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm; > struct ilk_wm_maximums max; > struct intel_wm_config config = {}; > struct ilk_wm_values results = {}; > enum intel_ddb_partitioning partitioning; > > - ilk_compute_wm_config(dev, &config); > + ilk_compute_wm_config(dev_priv, &config); > > - ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_1_2, &max); > - ilk_wm_merge(dev, &config, &max, &lp_wm_1_2); > + ilk_compute_wm_maximums(dev_priv, 1, &config, INTEL_DDB_PART_1_2, &max); > + ilk_wm_merge(dev_priv, &config, &max, &lp_wm_1_2); > > /* 5/6 split only in single pipe config on IVB+ */ > if (INTEL_GEN(dev_priv) >= 7 && > config.num_pipes_active == 1 && config.sprites_enabled) { > - ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max); > - ilk_wm_merge(dev, &config, &max, &lp_wm_5_6); > + ilk_compute_wm_maximums(dev_priv, 1, &config, INTEL_DDB_PART_5_6, &max); > + ilk_wm_merge(dev_priv, &config, &max, &lp_wm_5_6); > > - best_lp_wm = ilk_find_best_result(dev, &lp_wm_1_2, &lp_wm_5_6); > + best_lp_wm = ilk_find_best_result(dev_priv, &lp_wm_1_2, &lp_wm_5_6); > } else { > best_lp_wm = &lp_wm_1_2; > } > @@ -5663,7 +5647,7 @@ static void ilk_program_watermarks(struct drm_i915_private *dev_priv) > partitioning = (best_lp_wm == &lp_wm_1_2) ? > INTEL_DDB_PART_1_2 : INTEL_DDB_PART_5_6; > > - ilk_compute_wm_results(dev, best_lp_wm, partitioning, &results); > + ilk_compute_wm_results(dev_priv, best_lp_wm, partitioning, &results); > > ilk_write_wm_values(dev_priv, &results); > } > @@ -5703,19 +5687,18 @@ static inline void skl_wm_level_from_reg_val(uint32_t val, > PLANE_WM_LINES_MASK; > } > > -void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, > +void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc, > struct skl_pipe_wm *out) > { > - struct drm_i915_private *dev_priv = to_i915(crtc->dev); > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - enum pipe pipe = intel_crtc->pipe; > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > + enum pipe pipe = crtc->pipe; > int level, max_level; > enum plane_id plane_id; > uint32_t val; > > max_level = ilk_wm_max_level(dev_priv); > > - for_each_plane_id_on_crtc(intel_crtc, plane_id) { > + for_each_plane_id_on_crtc(crtc, plane_id) { > struct skl_plane_wm *wm = &out->planes[plane_id]; > > for (level = 0; level <= max_level; level++) { > @@ -5735,30 +5718,27 @@ void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, > skl_wm_level_from_reg_val(val, &wm->trans_wm); > } > > - if (!intel_crtc->active) > + if (!crtc->active) > return; > > out->linetime = I915_READ(PIPE_WM_LINETIME(pipe)); > } > > -void skl_wm_get_hw_state(struct drm_device *dev) > +void skl_wm_get_hw_state(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > struct skl_ddb_values *hw = &dev_priv->wm.skl_hw; > struct skl_ddb_allocation *ddb = &dev_priv->wm.skl_hw.ddb; > - struct drm_crtc *crtc; > - struct intel_crtc *intel_crtc; > + struct intel_crtc *crtc; > struct intel_crtc_state *cstate; > > skl_ddb_get_hw_state(dev_priv, ddb); > - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { > - intel_crtc = to_intel_crtc(crtc); > - cstate = to_intel_crtc_state(crtc->state); > + for_each_intel_crtc(&dev_priv->drm, crtc) { > + cstate = to_intel_crtc_state(crtc->base.state); > > skl_pipe_wm_get_hw_state(crtc, &cstate->wm.skl.optimal); > > - if (intel_crtc->active) > - hw->dirty_pipes |= drm_crtc_mask(crtc); > + if (crtc->active) > + hw->dirty_pipes |= drm_crtc_mask(&crtc->base); > } > > if (dev_priv->active_crtcs) { > @@ -5767,15 +5747,14 @@ void skl_wm_get_hw_state(struct drm_device *dev) > } > } > > -static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) > +static void ilk_pipe_wm_get_hw_state(struct intel_crtc *crtc) > { > - struct drm_device *dev = crtc->dev; > + struct drm_device *dev = crtc->base.dev; > struct drm_i915_private *dev_priv = to_i915(dev); > struct ilk_wm_values *hw = &dev_priv->wm.hw; > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state); > + struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->base.state); > struct intel_pipe_wm *active = &cstate->wm.ilk.optimal; > - enum pipe pipe = intel_crtc->pipe; > + enum pipe pipe = crtc->pipe; > static const i915_reg_t wm0_pipe_reg[] = { > [PIPE_A] = WM0_PIPEA_ILK, > [PIPE_B] = WM0_PIPEB_ILK, > @@ -5788,7 +5767,7 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) > > memset(active, 0, sizeof(*active)); > > - active->pipe_enabled = intel_crtc->active; > + active->pipe_enabled = crtc->active; > > if (active->pipe_enabled) { > u32 tmp = hw->wm_pipe[pipe]; > @@ -5816,7 +5795,7 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) > active->wm[level].enable = true; > } > > - intel_crtc->wm.active.ilk = *active; > + crtc->wm.active.ilk = *active; > } > > #define _FW_WM(value, plane) \ > @@ -5926,9 +5905,8 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, > #undef _FW_WM > #undef _FW_WM_VLV > > -void g4x_wm_get_hw_state(struct drm_device *dev) > +void g4x_wm_get_hw_state(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > struct g4x_wm_values *wm = &dev_priv->wm.g4x; > struct intel_crtc *crtc; > > @@ -5936,7 +5914,7 @@ void g4x_wm_get_hw_state(struct drm_device *dev) > > wm->cxsr = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN; > > - for_each_intel_crtc(dev, crtc) { > + for_each_intel_crtc(&dev_priv->drm, crtc) { > struct intel_crtc_state *crtc_state = > to_intel_crtc_state(crtc->base.state); > struct g4x_wm_state *active = &crtc->wm.active.g4x; > @@ -6067,9 +6045,8 @@ void g4x_wm_sanitize(struct drm_i915_private *dev_priv) > mutex_unlock(&dev_priv->wm.wm_mutex); > } > > -void vlv_wm_get_hw_state(struct drm_device *dev) > +void vlv_wm_get_hw_state(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > struct vlv_wm_values *wm = &dev_priv->wm.vlv; > struct intel_crtc *crtc; > u32 val; > @@ -6113,7 +6090,7 @@ void vlv_wm_get_hw_state(struct drm_device *dev) > mutex_unlock(&dev_priv->pcu_lock); > } > > - for_each_intel_crtc(dev, crtc) { > + for_each_intel_crtc(&dev_priv->drm, crtc) { > struct intel_crtc_state *crtc_state = > to_intel_crtc_state(crtc->base.state); > struct vlv_wm_state *active = &crtc->wm.active.vlv; > @@ -6230,15 +6207,14 @@ static void ilk_init_lp_watermarks(struct drm_i915_private *dev_priv) > */ > } > > -void ilk_wm_get_hw_state(struct drm_device *dev) > +void ilk_wm_get_hw_state(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > struct ilk_wm_values *hw = &dev_priv->wm.hw; > - struct drm_crtc *crtc; > + struct intel_crtc *crtc; > > ilk_init_lp_watermarks(dev_priv); > > - for_each_crtc(dev, crtc) > + for_each_intel_crtc(&dev_priv->drm, crtc) > ilk_pipe_wm_get_hw_state(crtc); > > hw->wm_lp[0] = I915_READ(WM1_LP_ILK); > -- > 2.14.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/2] drm/i915: Use intel_ types more consistently for color management code 2018-12-07 0:53 [PATCH 0/2] Use intel_* types more consistently Matt Roper 2018-12-07 0:54 ` [PATCH 1/2] drm/i915: Use intel_ types more consistently for watermark code Matt Roper @ 2018-12-07 0:54 ` Matt Roper 2018-12-10 19:31 ` Ville Syrjälä 2018-12-07 1:09 ` ✗ Fi.CI.CHECKPATCH: warning for Use intel_* types more consistently Patchwork ` (3 subsequent siblings) 5 siblings, 1 reply; 10+ messages in thread From: Matt Roper @ 2018-12-07 0:54 UTC (permalink / raw) To: intel-gfx Try to be more consistent about intel_* types rather than drm_* types for lower-level driver functions. While we're at it, let's also be more consistent with state variable naming (half of the platforms use the name 'state' whereas the other half used 'crtc_state'). Signed-off-by: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/intel_color.c | 207 ++++++++++++++++------------------- drivers/gpu/drm/i915/intel_display.c | 20 ++-- drivers/gpu/drm/i915/intel_drv.h | 8 +- 4 files changed, 112 insertions(+), 127 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7469a7785253..48fb5e9bd08b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -321,8 +321,8 @@ struct drm_i915_display_funcs { /* display clock increase/decrease */ /* pll clock increase/decrease */ - void (*load_csc_matrix)(struct drm_crtc_state *crtc_state); - void (*load_luts)(struct drm_crtc_state *crtc_state); + void (*load_csc_matrix)(struct intel_crtc_state *state); + void (*load_luts)(struct intel_crtc_state *state); }; #define CSR_VERSION(major, minor) ((major) << 16 | (minor)) diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c index 5127da286a2b..335c4702fcfb 100644 --- a/drivers/gpu/drm/i915/intel_color.c +++ b/drivers/gpu/drm/i915/intel_color.c @@ -74,12 +74,12 @@ #define ILK_CSC_COEFF_1_0 \ ((7 << 12) | ILK_CSC_COEFF_FP(CTM_COEFF_1_0, 8)) -static bool crtc_state_is_legacy_gamma(struct drm_crtc_state *state) +static bool crtc_state_is_legacy_gamma(struct intel_crtc_state *state) { - return !state->degamma_lut && - !state->ctm && - state->gamma_lut && - drm_color_lut_size(state->gamma_lut) == LEGACY_LUT_LENGTH; + return !state->base.degamma_lut && + !state->base.ctm && + state->base.gamma_lut && + drm_color_lut_size(state->base.gamma_lut) == LEGACY_LUT_LENGTH; } /* @@ -108,10 +108,10 @@ static u64 *ctm_mult_by_limited(u64 *result, const u64 *input) return result; } -static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *intel_crtc) +static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *crtc) { - int pipe = intel_crtc->pipe; - struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + int pipe = crtc->pipe; + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); I915_WRITE(PIPE_CSC_PREOFF_HI(pipe), 0); I915_WRITE(PIPE_CSC_PREOFF_ME(pipe), 0); @@ -132,14 +132,12 @@ static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *intel_crtc) I915_WRITE(PIPE_CSC_MODE(pipe), 0); } -static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) +static void ilk_load_csc_matrix(struct intel_crtc_state *state) { - struct drm_crtc *crtc = crtc_state->crtc; - struct drm_i915_private *dev_priv = to_i915(crtc->dev); - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - int i, pipe = intel_crtc->pipe; + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); + int i, pipe = crtc->pipe; uint16_t coeffs[9] = { 0, }; - struct intel_crtc_state *intel_crtc_state = to_intel_crtc_state(crtc_state); bool limited_color_range = false; /* @@ -147,14 +145,14 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) * do the range compression using the gamma LUT instead. */ if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) - limited_color_range = intel_crtc_state->limited_color_range; + limited_color_range = state->limited_color_range; - if (intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || - intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) { - ilk_load_ycbcr_conversion_matrix(intel_crtc); + if (state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || + state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) { + ilk_load_ycbcr_conversion_matrix(crtc); return; - } else if (crtc_state->ctm) { - struct drm_color_ctm *ctm = crtc_state->ctm->data; + } else if (state->base.ctm) { + struct drm_color_ctm *ctm = state->base.ctm->data; const u64 *input; u64 temp[9]; @@ -253,16 +251,15 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) /* * Set up the pipe CSC unit on CherryView. */ -static void cherryview_load_csc_matrix(struct drm_crtc_state *state) +static void cherryview_load_csc_matrix(struct intel_crtc_state *state) { - struct drm_crtc *crtc = state->crtc; - struct drm_device *dev = crtc->dev; + struct drm_device *dev = state->base.crtc->dev; struct drm_i915_private *dev_priv = to_i915(dev); - int pipe = to_intel_crtc(crtc)->pipe; + int pipe = to_intel_crtc(state->base.crtc)->pipe; uint32_t mode; - if (state->ctm) { - struct drm_color_ctm *ctm = state->ctm->data; + if (state->base.ctm) { + struct drm_color_ctm *ctm = state->base.ctm->data; uint16_t coeffs[9] = { 0, }; int i; @@ -293,36 +290,34 @@ static void cherryview_load_csc_matrix(struct drm_crtc_state *state) I915_WRITE(CGM_PIPE_CSC_COEFF8(pipe), coeffs[8]); } - mode = (state->ctm ? CGM_PIPE_MODE_CSC : 0); + mode = (state->base.ctm ? CGM_PIPE_MODE_CSC : 0); if (!crtc_state_is_legacy_gamma(state)) { - mode |= (state->degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | - (state->gamma_lut ? CGM_PIPE_MODE_GAMMA : 0); + mode |= (state->base.degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | + (state->base.gamma_lut ? CGM_PIPE_MODE_GAMMA : 0); } I915_WRITE(CGM_PIPE_MODE(pipe), mode); } -void intel_color_set_csc(struct drm_crtc_state *crtc_state) +void intel_color_set_csc(struct intel_crtc_state *state) { - struct drm_device *dev = crtc_state->crtc->dev; + struct drm_device *dev = state->base.crtc->dev; struct drm_i915_private *dev_priv = to_i915(dev); if (dev_priv->display.load_csc_matrix) - dev_priv->display.load_csc_matrix(crtc_state); + dev_priv->display.load_csc_matrix(state); } /* Loads the legacy palette/gamma unit for the CRTC. */ -static void i9xx_load_luts_internal(struct drm_crtc *crtc, - struct drm_property_blob *blob, - struct intel_crtc_state *crtc_state) +static void i9xx_load_luts_internal(struct intel_crtc_state *state, + struct drm_property_blob *blob) { - struct drm_device *dev = crtc->dev; - struct drm_i915_private *dev_priv = to_i915(dev); - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum pipe pipe = intel_crtc->pipe; + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); + enum pipe pipe = crtc->pipe; int i; if (HAS_GMCH_DISPLAY(dev_priv)) { - if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) + if (intel_crtc_has_type(state, INTEL_OUTPUT_DSI)) assert_dsi_pll_enabled(dev_priv); else assert_pll_enabled(dev_priv, pipe); @@ -353,53 +348,48 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc, } } -static void i9xx_load_luts(struct drm_crtc_state *crtc_state) +static void i9xx_load_luts(struct intel_crtc_state *state) { - i9xx_load_luts_internal(crtc_state->crtc, crtc_state->gamma_lut, - to_intel_crtc_state(crtc_state)); + i9xx_load_luts_internal(state, state->base.gamma_lut); } /* Loads the legacy palette/gamma unit for the CRTC on Haswell. */ -static void haswell_load_luts(struct drm_crtc_state *crtc_state) +static void haswell_load_luts(struct intel_crtc_state *state) { - struct drm_crtc *crtc = crtc_state->crtc; - struct drm_device *dev = crtc->dev; - struct drm_i915_private *dev_priv = to_i915(dev); - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct intel_crtc_state *intel_crtc_state = - to_intel_crtc_state(crtc_state); + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); bool reenable_ips = false; /* * Workaround : Do not read or write the pipe palette/gamma data while * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled. */ - if (IS_HASWELL(dev_priv) && intel_crtc_state->ips_enabled && - (intel_crtc_state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) { - hsw_disable_ips(intel_crtc_state); + if (IS_HASWELL(dev_priv) && state->ips_enabled && + (state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) { + hsw_disable_ips(state); reenable_ips = true; } - intel_crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT; - I915_WRITE(GAMMA_MODE(intel_crtc->pipe), GAMMA_MODE_MODE_8BIT); + state->gamma_mode = GAMMA_MODE_MODE_8BIT; + I915_WRITE(GAMMA_MODE(crtc->pipe), GAMMA_MODE_MODE_8BIT); - i9xx_load_luts(crtc_state); + i9xx_load_luts(state); if (reenable_ips) - hsw_enable_ips(intel_crtc_state); + hsw_enable_ips(state); } -static void bdw_load_degamma_lut(struct drm_crtc_state *state) +static void bdw_load_degamma_lut(struct intel_crtc_state *state) { - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; uint32_t i, lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size; I915_WRITE(PREC_PAL_INDEX(pipe), PAL_PREC_SPLIT_MODE | PAL_PREC_AUTO_INCREMENT); - if (state->degamma_lut) { - struct drm_color_lut *lut = state->degamma_lut->data; + if (state->base.degamma_lut) { + struct drm_color_lut *lut = state->base.degamma_lut->data; for (i = 0; i < lut_size; i++) { uint32_t word = @@ -419,10 +409,10 @@ static void bdw_load_degamma_lut(struct drm_crtc_state *state) } } -static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) +static void bdw_load_gamma_lut(struct intel_crtc_state *state, u32 offset) { - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; uint32_t i, lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size; WARN_ON(offset & ~PAL_PREC_INDEX_VALUE_MASK); @@ -432,8 +422,8 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) PAL_PREC_AUTO_INCREMENT | offset); - if (state->gamma_lut) { - struct drm_color_lut *lut = state->gamma_lut->data; + if (state->base.gamma_lut) { + struct drm_color_lut *lut = state->base.gamma_lut->data; for (i = 0; i < lut_size; i++) { uint32_t word = @@ -467,11 +457,10 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) } /* Loads the palette/gamma unit for the CRTC on Broadwell+. */ -static void broadwell_load_luts(struct drm_crtc_state *state) +static void broadwell_load_luts(struct intel_crtc_state *state) { - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); - struct intel_crtc_state *intel_state = to_intel_crtc_state(state); - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; if (crtc_state_is_legacy_gamma(state)) { haswell_load_luts(state); @@ -479,10 +468,9 @@ static void broadwell_load_luts(struct drm_crtc_state *state) } bdw_load_degamma_lut(state); - bdw_load_gamma_lut(state, - INTEL_INFO(dev_priv)->color.degamma_lut_size); + bdw_load_gamma_lut(state, INTEL_INFO(dev_priv)->color.degamma_lut_size); - intel_state->gamma_mode = GAMMA_MODE_MODE_SPLIT; + state->gamma_mode = GAMMA_MODE_MODE_SPLIT; I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_SPLIT); POSTING_READ(GAMMA_MODE(pipe)); @@ -493,10 +481,10 @@ static void broadwell_load_luts(struct drm_crtc_state *state) I915_WRITE(PREC_PAL_INDEX(pipe), 0); } -static void glk_load_degamma_lut(struct drm_crtc_state *state) +static void glk_load_degamma_lut(struct intel_crtc_state *state) { - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; const uint32_t lut_size = 33; uint32_t i; @@ -523,13 +511,11 @@ static void glk_load_degamma_lut(struct drm_crtc_state *state) I915_WRITE(PRE_CSC_GAMC_DATA(pipe), (1 << 16)); } -static void glk_load_luts(struct drm_crtc_state *state) +static void glk_load_luts(struct intel_crtc_state *state) { - struct drm_crtc *crtc = state->crtc; - struct drm_device *dev = crtc->dev; + struct drm_device *dev = state->base.crtc->dev; struct drm_i915_private *dev_priv = to_i915(dev); - struct intel_crtc_state *intel_state = to_intel_crtc_state(state); - enum pipe pipe = to_intel_crtc(crtc)->pipe; + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; glk_load_degamma_lut(state); @@ -540,15 +526,15 @@ static void glk_load_luts(struct drm_crtc_state *state) bdw_load_gamma_lut(state, 0); - intel_state->gamma_mode = GAMMA_MODE_MODE_10BIT; + state->gamma_mode = GAMMA_MODE_MODE_10BIT; I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_10BIT); POSTING_READ(GAMMA_MODE(pipe)); } /* Loads the palette/gamma unit for the CRTC on CherryView. */ -static void cherryview_load_luts(struct drm_crtc_state *state) +static void cherryview_load_luts(struct intel_crtc_state *state) { - struct drm_crtc *crtc = state->crtc; + struct drm_crtc *crtc = state->base.crtc; struct drm_i915_private *dev_priv = to_i915(crtc->dev); enum pipe pipe = to_intel_crtc(crtc)->pipe; struct drm_color_lut *lut; @@ -558,14 +544,13 @@ static void cherryview_load_luts(struct drm_crtc_state *state) if (crtc_state_is_legacy_gamma(state)) { /* Turn off degamma/gamma on CGM block. */ I915_WRITE(CGM_PIPE_MODE(pipe), - (state->ctm ? CGM_PIPE_MODE_CSC : 0)); - i9xx_load_luts_internal(crtc, state->gamma_lut, - to_intel_crtc_state(state)); + (state->base.ctm ? CGM_PIPE_MODE_CSC : 0)); + i9xx_load_luts_internal(state, state->base.gamma_lut); return; } - if (state->degamma_lut) { - lut = state->degamma_lut->data; + if (state->base.degamma_lut) { + lut = state->base.degamma_lut->data; lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size; for (i = 0; i < lut_size; i++) { /* Write LUT in U0.14 format. */ @@ -579,8 +564,8 @@ static void cherryview_load_luts(struct drm_crtc_state *state) } } - if (state->gamma_lut) { - lut = state->gamma_lut->data; + if (state->base.gamma_lut) { + lut = state->base.gamma_lut->data; lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size; for (i = 0; i < lut_size; i++) { /* Write LUT in U0.10 format. */ @@ -595,29 +580,29 @@ static void cherryview_load_luts(struct drm_crtc_state *state) } I915_WRITE(CGM_PIPE_MODE(pipe), - (state->ctm ? CGM_PIPE_MODE_CSC : 0) | - (state->degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | - (state->gamma_lut ? CGM_PIPE_MODE_GAMMA : 0)); + (state->base.ctm ? CGM_PIPE_MODE_CSC : 0) | + (state->base.degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | + (state->base.gamma_lut ? CGM_PIPE_MODE_GAMMA : 0)); /* * Also program a linear LUT in the legacy block (behind the * CGM block). */ - i9xx_load_luts_internal(crtc, NULL, to_intel_crtc_state(state)); + i9xx_load_luts_internal(state, NULL); } -void intel_color_load_luts(struct drm_crtc_state *crtc_state) +void intel_color_load_luts(struct intel_crtc_state *state) { - struct drm_device *dev = crtc_state->crtc->dev; + struct drm_device *dev = state->base.crtc->dev; struct drm_i915_private *dev_priv = to_i915(dev); - dev_priv->display.load_luts(crtc_state); + dev_priv->display.load_luts(state); } -int intel_color_check(struct drm_crtc *crtc, - struct drm_crtc_state *crtc_state) +int intel_color_check(struct intel_crtc *crtc, + struct intel_crtc_state *state) { - struct drm_i915_private *dev_priv = to_i915(crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); size_t gamma_length, degamma_length; degamma_length = INTEL_INFO(dev_priv)->color.degamma_lut_size; @@ -627,27 +612,27 @@ int intel_color_check(struct drm_crtc *crtc, * We allow both degamma & gamma luts at the right size or * NULL. */ - if ((!crtc_state->degamma_lut || - drm_color_lut_size(crtc_state->degamma_lut) == degamma_length) && - (!crtc_state->gamma_lut || - drm_color_lut_size(crtc_state->gamma_lut) == gamma_length)) + if ((!state->base.degamma_lut || + drm_color_lut_size(state->base.degamma_lut) == degamma_length) && + (!state->base.gamma_lut || + drm_color_lut_size(state->base.gamma_lut) == gamma_length)) return 0; /* * We also allow no degamma lut/ctm and a gamma lut at the legacy * size (256 entries). */ - if (crtc_state_is_legacy_gamma(crtc_state)) + if (crtc_state_is_legacy_gamma(state)) return 0; return -EINVAL; } -void intel_color_init(struct drm_crtc *crtc) +void intel_color_init(struct intel_crtc *crtc) { - struct drm_i915_private *dev_priv = to_i915(crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); - drm_mode_crtc_set_gamma_size(crtc, 256); + drm_mode_crtc_set_gamma_size(&crtc->base, 256); if (IS_CHERRYVIEW(dev_priv)) { dev_priv->display.load_csc_matrix = cherryview_load_csc_matrix; @@ -669,7 +654,7 @@ void intel_color_init(struct drm_crtc *crtc) /* Enable color management support when we have degamma & gamma LUTs. */ if (INTEL_INFO(dev_priv)->color.degamma_lut_size != 0 && INTEL_INFO(dev_priv)->color.gamma_lut_size != 0) - drm_crtc_enable_color_mgmt(crtc, + drm_crtc_enable_color_mgmt(&crtc->base, INTEL_INFO(dev_priv)->color.degamma_lut_size, true, INTEL_INFO(dev_priv)->color.gamma_lut_size); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index db6004a883c7..5b965797df4e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5641,7 +5641,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config, * On ILK+ LUT must be loaded before the pipe is running but with * clocks enabled */ - intel_color_load_luts(&pipe_config->base); + intel_color_load_luts(pipe_config); if (dev_priv->display.initial_watermarks != NULL) dev_priv->display.initial_watermarks(old_intel_state, pipe_config); @@ -5752,7 +5752,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, haswell_set_pipemisc(pipe_config); - intel_color_set_csc(&pipe_config->base); + intel_color_set_csc(pipe_config); intel_crtc->active = true; @@ -5771,7 +5771,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, * On ILK+ LUT must be loaded before the pipe is running but with * clocks enabled */ - intel_color_load_luts(&pipe_config->base); + intel_color_load_luts(pipe_config); /* * Display WA #1153: enable hardware to bypass the alpha math @@ -6117,7 +6117,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config, i9xx_set_pipeconf(pipe_config); - intel_color_set_csc(&pipe_config->base); + intel_color_set_csc(pipe_config); intel_crtc->active = true; @@ -6137,7 +6137,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config, i9xx_pfit_enable(pipe_config); - intel_color_load_luts(&pipe_config->base); + intel_color_load_luts(pipe_config); dev_priv->display.initial_watermarks(old_intel_state, pipe_config); @@ -6193,7 +6193,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config, i9xx_pfit_enable(pipe_config); - intel_color_load_luts(&pipe_config->base); + intel_color_load_luts(pipe_config); if (dev_priv->display.initial_watermarks != NULL) dev_priv->display.initial_watermarks(old_intel_state, @@ -10972,7 +10972,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, } if (crtc_state->color_mgmt_changed) { - ret = intel_color_check(crtc, crtc_state); + ret = intel_color_check(intel_crtc, pipe_config); if (ret) return ret; @@ -13548,8 +13548,8 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc, if (!modeset && (intel_cstate->base.color_mgmt_changed || intel_cstate->update_pipe)) { - intel_color_set_csc(&intel_cstate->base); - intel_color_load_luts(&intel_cstate->base); + intel_color_set_csc(intel_cstate); + intel_color_load_luts(intel_cstate); } /* Perform vblank evasion around commit operation */ @@ -14122,7 +14122,7 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); - intel_color_init(&intel_crtc->base); + intel_color_init(intel_crtc); WARN_ON(drm_crtc_index(&intel_crtc->base) != intel_crtc->pipe); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index a8177ccf1d4f..ba1d97991d5a 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -2327,10 +2327,10 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ struct intel_plane_state *intel_state); /* intel_color.c */ -void intel_color_init(struct drm_crtc *crtc); -int intel_color_check(struct drm_crtc *crtc, struct drm_crtc_state *state); -void intel_color_set_csc(struct drm_crtc_state *crtc_state); -void intel_color_load_luts(struct drm_crtc_state *crtc_state); +void intel_color_init(struct intel_crtc *crtc); +int intel_color_check(struct intel_crtc *crtc, struct intel_crtc_state *state); +void intel_color_set_csc(struct intel_crtc_state *state); +void intel_color_load_luts(struct intel_crtc_state *state); /* intel_lspcon.c */ bool lspcon_init(struct intel_digital_port *intel_dig_port); -- 2.14.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use intel_ types more consistently for color management code 2018-12-07 0:54 ` [PATCH 2/2] drm/i915: Use intel_ types more consistently for color management code Matt Roper @ 2018-12-10 19:31 ` Ville Syrjälä 2018-12-10 23:07 ` Matt Roper 0 siblings, 1 reply; 10+ messages in thread From: Ville Syrjälä @ 2018-12-10 19:31 UTC (permalink / raw) To: Matt Roper; +Cc: intel-gfx On Thu, Dec 06, 2018 at 04:54:01PM -0800, Matt Roper wrote: > Try to be more consistent about intel_* types rather than drm_* types > for lower-level driver functions. While we're at it, let's also be more > consistent with state variable naming (half of the platforms use the > name 'state' whereas the other half used 'crtc_state'). > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 4 +- > drivers/gpu/drm/i915/intel_color.c | 207 ++++++++++++++++------------------- > drivers/gpu/drm/i915/intel_display.c | 20 ++-- > drivers/gpu/drm/i915/intel_drv.h | 8 +- > 4 files changed, 112 insertions(+), 127 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 7469a7785253..48fb5e9bd08b 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -321,8 +321,8 @@ struct drm_i915_display_funcs { > /* display clock increase/decrease */ > /* pll clock increase/decrease */ > > - void (*load_csc_matrix)(struct drm_crtc_state *crtc_state); > - void (*load_luts)(struct drm_crtc_state *crtc_state); > + void (*load_csc_matrix)(struct intel_crtc_state *state); > + void (*load_luts)(struct intel_crtc_state *state); > }; > > #define CSR_VERSION(major, minor) ((major) << 16 | (minor)) > diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c > index 5127da286a2b..335c4702fcfb 100644 > --- a/drivers/gpu/drm/i915/intel_color.c > +++ b/drivers/gpu/drm/i915/intel_color.c > @@ -74,12 +74,12 @@ > #define ILK_CSC_COEFF_1_0 \ > ((7 << 12) | ILK_CSC_COEFF_FP(CTM_COEFF_1_0, 8)) > > -static bool crtc_state_is_legacy_gamma(struct drm_crtc_state *state) > +static bool crtc_state_is_legacy_gamma(struct intel_crtc_state *state) I'd lkike s/state/crtc_state/, at least in the cases where it doesn't make the diff too noisy. Or maybe even follow up with a wholesale sed/cocci job to just rename everything in the file? Patch is Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > { > - return !state->degamma_lut && > - !state->ctm && > - state->gamma_lut && > - drm_color_lut_size(state->gamma_lut) == LEGACY_LUT_LENGTH; > + return !state->base.degamma_lut && > + !state->base.ctm && > + state->base.gamma_lut && > + drm_color_lut_size(state->base.gamma_lut) == LEGACY_LUT_LENGTH; > } > > /* > @@ -108,10 +108,10 @@ static u64 *ctm_mult_by_limited(u64 *result, const u64 *input) > return result; > } > > -static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *intel_crtc) > +static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *crtc) > { > - int pipe = intel_crtc->pipe; > - struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > + int pipe = crtc->pipe; > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > I915_WRITE(PIPE_CSC_PREOFF_HI(pipe), 0); > I915_WRITE(PIPE_CSC_PREOFF_ME(pipe), 0); > @@ -132,14 +132,12 @@ static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *intel_crtc) > I915_WRITE(PIPE_CSC_MODE(pipe), 0); > } > > -static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) > +static void ilk_load_csc_matrix(struct intel_crtc_state *state) > { > - struct drm_crtc *crtc = crtc_state->crtc; > - struct drm_i915_private *dev_priv = to_i915(crtc->dev); > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - int i, pipe = intel_crtc->pipe; > + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > + int i, pipe = crtc->pipe; > uint16_t coeffs[9] = { 0, }; > - struct intel_crtc_state *intel_crtc_state = to_intel_crtc_state(crtc_state); > bool limited_color_range = false; > > /* > @@ -147,14 +145,14 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) > * do the range compression using the gamma LUT instead. > */ > if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) > - limited_color_range = intel_crtc_state->limited_color_range; > + limited_color_range = state->limited_color_range; > > - if (intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || > - intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) { > - ilk_load_ycbcr_conversion_matrix(intel_crtc); > + if (state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || > + state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) { > + ilk_load_ycbcr_conversion_matrix(crtc); > return; > - } else if (crtc_state->ctm) { > - struct drm_color_ctm *ctm = crtc_state->ctm->data; > + } else if (state->base.ctm) { > + struct drm_color_ctm *ctm = state->base.ctm->data; > const u64 *input; > u64 temp[9]; > > @@ -253,16 +251,15 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) > /* > * Set up the pipe CSC unit on CherryView. > */ > -static void cherryview_load_csc_matrix(struct drm_crtc_state *state) > +static void cherryview_load_csc_matrix(struct intel_crtc_state *state) > { > - struct drm_crtc *crtc = state->crtc; > - struct drm_device *dev = crtc->dev; > + struct drm_device *dev = state->base.crtc->dev; > struct drm_i915_private *dev_priv = to_i915(dev); > - int pipe = to_intel_crtc(crtc)->pipe; > + int pipe = to_intel_crtc(state->base.crtc)->pipe; > uint32_t mode; > > - if (state->ctm) { > - struct drm_color_ctm *ctm = state->ctm->data; > + if (state->base.ctm) { > + struct drm_color_ctm *ctm = state->base.ctm->data; > uint16_t coeffs[9] = { 0, }; > int i; > > @@ -293,36 +290,34 @@ static void cherryview_load_csc_matrix(struct drm_crtc_state *state) > I915_WRITE(CGM_PIPE_CSC_COEFF8(pipe), coeffs[8]); > } > > - mode = (state->ctm ? CGM_PIPE_MODE_CSC : 0); > + mode = (state->base.ctm ? CGM_PIPE_MODE_CSC : 0); > if (!crtc_state_is_legacy_gamma(state)) { > - mode |= (state->degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > - (state->gamma_lut ? CGM_PIPE_MODE_GAMMA : 0); > + mode |= (state->base.degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > + (state->base.gamma_lut ? CGM_PIPE_MODE_GAMMA : 0); > } > I915_WRITE(CGM_PIPE_MODE(pipe), mode); > } > > -void intel_color_set_csc(struct drm_crtc_state *crtc_state) > +void intel_color_set_csc(struct intel_crtc_state *state) > { > - struct drm_device *dev = crtc_state->crtc->dev; > + struct drm_device *dev = state->base.crtc->dev; > struct drm_i915_private *dev_priv = to_i915(dev); > > if (dev_priv->display.load_csc_matrix) > - dev_priv->display.load_csc_matrix(crtc_state); > + dev_priv->display.load_csc_matrix(state); > } > > /* Loads the legacy palette/gamma unit for the CRTC. */ > -static void i9xx_load_luts_internal(struct drm_crtc *crtc, > - struct drm_property_blob *blob, > - struct intel_crtc_state *crtc_state) > +static void i9xx_load_luts_internal(struct intel_crtc_state *state, > + struct drm_property_blob *blob) > { > - struct drm_device *dev = crtc->dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - enum pipe pipe = intel_crtc->pipe; > + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > + enum pipe pipe = crtc->pipe; > int i; > > if (HAS_GMCH_DISPLAY(dev_priv)) { > - if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > + if (intel_crtc_has_type(state, INTEL_OUTPUT_DSI)) > assert_dsi_pll_enabled(dev_priv); > else > assert_pll_enabled(dev_priv, pipe); > @@ -353,53 +348,48 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc, > } > } > > -static void i9xx_load_luts(struct drm_crtc_state *crtc_state) > +static void i9xx_load_luts(struct intel_crtc_state *state) > { > - i9xx_load_luts_internal(crtc_state->crtc, crtc_state->gamma_lut, > - to_intel_crtc_state(crtc_state)); > + i9xx_load_luts_internal(state, state->base.gamma_lut); > } > > /* Loads the legacy palette/gamma unit for the CRTC on Haswell. */ > -static void haswell_load_luts(struct drm_crtc_state *crtc_state) > +static void haswell_load_luts(struct intel_crtc_state *state) > { > - struct drm_crtc *crtc = crtc_state->crtc; > - struct drm_device *dev = crtc->dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - struct intel_crtc_state *intel_crtc_state = > - to_intel_crtc_state(crtc_state); > + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > bool reenable_ips = false; > > /* > * Workaround : Do not read or write the pipe palette/gamma data while > * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled. > */ > - if (IS_HASWELL(dev_priv) && intel_crtc_state->ips_enabled && > - (intel_crtc_state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) { > - hsw_disable_ips(intel_crtc_state); > + if (IS_HASWELL(dev_priv) && state->ips_enabled && > + (state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) { > + hsw_disable_ips(state); > reenable_ips = true; > } > > - intel_crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT; > - I915_WRITE(GAMMA_MODE(intel_crtc->pipe), GAMMA_MODE_MODE_8BIT); > + state->gamma_mode = GAMMA_MODE_MODE_8BIT; > + I915_WRITE(GAMMA_MODE(crtc->pipe), GAMMA_MODE_MODE_8BIT); > > - i9xx_load_luts(crtc_state); > + i9xx_load_luts(state); > > if (reenable_ips) > - hsw_enable_ips(intel_crtc_state); > + hsw_enable_ips(state); > } > > -static void bdw_load_degamma_lut(struct drm_crtc_state *state) > +static void bdw_load_degamma_lut(struct intel_crtc_state *state) > { > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > uint32_t i, lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size; > > I915_WRITE(PREC_PAL_INDEX(pipe), > PAL_PREC_SPLIT_MODE | PAL_PREC_AUTO_INCREMENT); > > - if (state->degamma_lut) { > - struct drm_color_lut *lut = state->degamma_lut->data; > + if (state->base.degamma_lut) { > + struct drm_color_lut *lut = state->base.degamma_lut->data; > > for (i = 0; i < lut_size; i++) { > uint32_t word = > @@ -419,10 +409,10 @@ static void bdw_load_degamma_lut(struct drm_crtc_state *state) > } > } > > -static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) > +static void bdw_load_gamma_lut(struct intel_crtc_state *state, u32 offset) > { > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > uint32_t i, lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size; > > WARN_ON(offset & ~PAL_PREC_INDEX_VALUE_MASK); > @@ -432,8 +422,8 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) > PAL_PREC_AUTO_INCREMENT | > offset); > > - if (state->gamma_lut) { > - struct drm_color_lut *lut = state->gamma_lut->data; > + if (state->base.gamma_lut) { > + struct drm_color_lut *lut = state->base.gamma_lut->data; > > for (i = 0; i < lut_size; i++) { > uint32_t word = > @@ -467,11 +457,10 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) > } > > /* Loads the palette/gamma unit for the CRTC on Broadwell+. */ > -static void broadwell_load_luts(struct drm_crtc_state *state) > +static void broadwell_load_luts(struct intel_crtc_state *state) > { > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > - struct intel_crtc_state *intel_state = to_intel_crtc_state(state); > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > > if (crtc_state_is_legacy_gamma(state)) { > haswell_load_luts(state); > @@ -479,10 +468,9 @@ static void broadwell_load_luts(struct drm_crtc_state *state) > } > > bdw_load_degamma_lut(state); > - bdw_load_gamma_lut(state, > - INTEL_INFO(dev_priv)->color.degamma_lut_size); > + bdw_load_gamma_lut(state, INTEL_INFO(dev_priv)->color.degamma_lut_size); > > - intel_state->gamma_mode = GAMMA_MODE_MODE_SPLIT; > + state->gamma_mode = GAMMA_MODE_MODE_SPLIT; > I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_SPLIT); > POSTING_READ(GAMMA_MODE(pipe)); > > @@ -493,10 +481,10 @@ static void broadwell_load_luts(struct drm_crtc_state *state) > I915_WRITE(PREC_PAL_INDEX(pipe), 0); > } > > -static void glk_load_degamma_lut(struct drm_crtc_state *state) > +static void glk_load_degamma_lut(struct intel_crtc_state *state) > { > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > const uint32_t lut_size = 33; > uint32_t i; > > @@ -523,13 +511,11 @@ static void glk_load_degamma_lut(struct drm_crtc_state *state) > I915_WRITE(PRE_CSC_GAMC_DATA(pipe), (1 << 16)); > } > > -static void glk_load_luts(struct drm_crtc_state *state) > +static void glk_load_luts(struct intel_crtc_state *state) > { > - struct drm_crtc *crtc = state->crtc; > - struct drm_device *dev = crtc->dev; > + struct drm_device *dev = state->base.crtc->dev; > struct drm_i915_private *dev_priv = to_i915(dev); > - struct intel_crtc_state *intel_state = to_intel_crtc_state(state); > - enum pipe pipe = to_intel_crtc(crtc)->pipe; > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > > glk_load_degamma_lut(state); > > @@ -540,15 +526,15 @@ static void glk_load_luts(struct drm_crtc_state *state) > > bdw_load_gamma_lut(state, 0); > > - intel_state->gamma_mode = GAMMA_MODE_MODE_10BIT; > + state->gamma_mode = GAMMA_MODE_MODE_10BIT; > I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_10BIT); > POSTING_READ(GAMMA_MODE(pipe)); > } > > /* Loads the palette/gamma unit for the CRTC on CherryView. */ > -static void cherryview_load_luts(struct drm_crtc_state *state) > +static void cherryview_load_luts(struct intel_crtc_state *state) > { > - struct drm_crtc *crtc = state->crtc; > + struct drm_crtc *crtc = state->base.crtc; > struct drm_i915_private *dev_priv = to_i915(crtc->dev); > enum pipe pipe = to_intel_crtc(crtc)->pipe; > struct drm_color_lut *lut; > @@ -558,14 +544,13 @@ static void cherryview_load_luts(struct drm_crtc_state *state) > if (crtc_state_is_legacy_gamma(state)) { > /* Turn off degamma/gamma on CGM block. */ > I915_WRITE(CGM_PIPE_MODE(pipe), > - (state->ctm ? CGM_PIPE_MODE_CSC : 0)); > - i9xx_load_luts_internal(crtc, state->gamma_lut, > - to_intel_crtc_state(state)); > + (state->base.ctm ? CGM_PIPE_MODE_CSC : 0)); > + i9xx_load_luts_internal(state, state->base.gamma_lut); > return; > } > > - if (state->degamma_lut) { > - lut = state->degamma_lut->data; > + if (state->base.degamma_lut) { > + lut = state->base.degamma_lut->data; > lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size; > for (i = 0; i < lut_size; i++) { > /* Write LUT in U0.14 format. */ > @@ -579,8 +564,8 @@ static void cherryview_load_luts(struct drm_crtc_state *state) > } > } > > - if (state->gamma_lut) { > - lut = state->gamma_lut->data; > + if (state->base.gamma_lut) { > + lut = state->base.gamma_lut->data; > lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size; > for (i = 0; i < lut_size; i++) { > /* Write LUT in U0.10 format. */ > @@ -595,29 +580,29 @@ static void cherryview_load_luts(struct drm_crtc_state *state) > } > > I915_WRITE(CGM_PIPE_MODE(pipe), > - (state->ctm ? CGM_PIPE_MODE_CSC : 0) | > - (state->degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > - (state->gamma_lut ? CGM_PIPE_MODE_GAMMA : 0)); > + (state->base.ctm ? CGM_PIPE_MODE_CSC : 0) | > + (state->base.degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > + (state->base.gamma_lut ? CGM_PIPE_MODE_GAMMA : 0)); > > /* > * Also program a linear LUT in the legacy block (behind the > * CGM block). > */ > - i9xx_load_luts_internal(crtc, NULL, to_intel_crtc_state(state)); > + i9xx_load_luts_internal(state, NULL); > } > > -void intel_color_load_luts(struct drm_crtc_state *crtc_state) > +void intel_color_load_luts(struct intel_crtc_state *state) > { > - struct drm_device *dev = crtc_state->crtc->dev; > + struct drm_device *dev = state->base.crtc->dev; > struct drm_i915_private *dev_priv = to_i915(dev); > > - dev_priv->display.load_luts(crtc_state); > + dev_priv->display.load_luts(state); > } > > -int intel_color_check(struct drm_crtc *crtc, > - struct drm_crtc_state *crtc_state) > +int intel_color_check(struct intel_crtc *crtc, > + struct intel_crtc_state *state) > { > - struct drm_i915_private *dev_priv = to_i915(crtc->dev); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > size_t gamma_length, degamma_length; > > degamma_length = INTEL_INFO(dev_priv)->color.degamma_lut_size; > @@ -627,27 +612,27 @@ int intel_color_check(struct drm_crtc *crtc, > * We allow both degamma & gamma luts at the right size or > * NULL. > */ > - if ((!crtc_state->degamma_lut || > - drm_color_lut_size(crtc_state->degamma_lut) == degamma_length) && > - (!crtc_state->gamma_lut || > - drm_color_lut_size(crtc_state->gamma_lut) == gamma_length)) > + if ((!state->base.degamma_lut || > + drm_color_lut_size(state->base.degamma_lut) == degamma_length) && > + (!state->base.gamma_lut || > + drm_color_lut_size(state->base.gamma_lut) == gamma_length)) > return 0; > > /* > * We also allow no degamma lut/ctm and a gamma lut at the legacy > * size (256 entries). > */ > - if (crtc_state_is_legacy_gamma(crtc_state)) > + if (crtc_state_is_legacy_gamma(state)) > return 0; > > return -EINVAL; > } > > -void intel_color_init(struct drm_crtc *crtc) > +void intel_color_init(struct intel_crtc *crtc) > { > - struct drm_i915_private *dev_priv = to_i915(crtc->dev); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > - drm_mode_crtc_set_gamma_size(crtc, 256); > + drm_mode_crtc_set_gamma_size(&crtc->base, 256); > > if (IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.load_csc_matrix = cherryview_load_csc_matrix; > @@ -669,7 +654,7 @@ void intel_color_init(struct drm_crtc *crtc) > /* Enable color management support when we have degamma & gamma LUTs. */ > if (INTEL_INFO(dev_priv)->color.degamma_lut_size != 0 && > INTEL_INFO(dev_priv)->color.gamma_lut_size != 0) > - drm_crtc_enable_color_mgmt(crtc, > + drm_crtc_enable_color_mgmt(&crtc->base, > INTEL_INFO(dev_priv)->color.degamma_lut_size, > true, > INTEL_INFO(dev_priv)->color.gamma_lut_size); > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index db6004a883c7..5b965797df4e 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -5641,7 +5641,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config, > * On ILK+ LUT must be loaded before the pipe is running but with > * clocks enabled > */ > - intel_color_load_luts(&pipe_config->base); > + intel_color_load_luts(pipe_config); > > if (dev_priv->display.initial_watermarks != NULL) > dev_priv->display.initial_watermarks(old_intel_state, pipe_config); > @@ -5752,7 +5752,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, > > haswell_set_pipemisc(pipe_config); > > - intel_color_set_csc(&pipe_config->base); > + intel_color_set_csc(pipe_config); > > intel_crtc->active = true; > > @@ -5771,7 +5771,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, > * On ILK+ LUT must be loaded before the pipe is running but with > * clocks enabled > */ > - intel_color_load_luts(&pipe_config->base); > + intel_color_load_luts(pipe_config); > > /* > * Display WA #1153: enable hardware to bypass the alpha math > @@ -6117,7 +6117,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config, > > i9xx_set_pipeconf(pipe_config); > > - intel_color_set_csc(&pipe_config->base); > + intel_color_set_csc(pipe_config); > > intel_crtc->active = true; > > @@ -6137,7 +6137,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config, > > i9xx_pfit_enable(pipe_config); > > - intel_color_load_luts(&pipe_config->base); > + intel_color_load_luts(pipe_config); > > dev_priv->display.initial_watermarks(old_intel_state, > pipe_config); > @@ -6193,7 +6193,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config, > > i9xx_pfit_enable(pipe_config); > > - intel_color_load_luts(&pipe_config->base); > + intel_color_load_luts(pipe_config); > > if (dev_priv->display.initial_watermarks != NULL) > dev_priv->display.initial_watermarks(old_intel_state, > @@ -10972,7 +10972,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, > } > > if (crtc_state->color_mgmt_changed) { > - ret = intel_color_check(crtc, crtc_state); > + ret = intel_color_check(intel_crtc, pipe_config); > if (ret) > return ret; > > @@ -13548,8 +13548,8 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc, > if (!modeset && > (intel_cstate->base.color_mgmt_changed || > intel_cstate->update_pipe)) { > - intel_color_set_csc(&intel_cstate->base); > - intel_color_load_luts(&intel_cstate->base); > + intel_color_set_csc(intel_cstate); > + intel_color_load_luts(intel_cstate); > } > > /* Perform vblank evasion around commit operation */ > @@ -14122,7 +14122,7 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) > > drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); > > - intel_color_init(&intel_crtc->base); > + intel_color_init(intel_crtc); > > WARN_ON(drm_crtc_index(&intel_crtc->base) != intel_crtc->pipe); > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index a8177ccf1d4f..ba1d97991d5a 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -2327,10 +2327,10 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ > struct intel_plane_state *intel_state); > > /* intel_color.c */ > -void intel_color_init(struct drm_crtc *crtc); > -int intel_color_check(struct drm_crtc *crtc, struct drm_crtc_state *state); > -void intel_color_set_csc(struct drm_crtc_state *crtc_state); > -void intel_color_load_luts(struct drm_crtc_state *crtc_state); > +void intel_color_init(struct intel_crtc *crtc); > +int intel_color_check(struct intel_crtc *crtc, struct intel_crtc_state *state); > +void intel_color_set_csc(struct intel_crtc_state *state); > +void intel_color_load_luts(struct intel_crtc_state *state); > > /* intel_lspcon.c */ > bool lspcon_init(struct intel_digital_port *intel_dig_port); > -- > 2.14.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use intel_ types more consistently for color management code 2018-12-10 19:31 ` Ville Syrjälä @ 2018-12-10 23:07 ` Matt Roper 0 siblings, 0 replies; 10+ messages in thread From: Matt Roper @ 2018-12-10 23:07 UTC (permalink / raw) To: Ville Syrjälä; +Cc: intel-gfx On Mon, Dec 10, 2018 at 09:31:55PM +0200, Ville Syrjälä wrote: > On Thu, Dec 06, 2018 at 04:54:01PM -0800, Matt Roper wrote: > > Try to be more consistent about intel_* types rather than drm_* types > > for lower-level driver functions. While we're at it, let's also be more > > consistent with state variable naming (half of the platforms use the > > name 'state' whereas the other half used 'crtc_state'). > > > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > > --- > > drivers/gpu/drm/i915/i915_drv.h | 4 +- > > drivers/gpu/drm/i915/intel_color.c | 207 ++++++++++++++++------------------- > > drivers/gpu/drm/i915/intel_display.c | 20 ++-- > > drivers/gpu/drm/i915/intel_drv.h | 8 +- > > 4 files changed, 112 insertions(+), 127 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index 7469a7785253..48fb5e9bd08b 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -321,8 +321,8 @@ struct drm_i915_display_funcs { > > /* display clock increase/decrease */ > > /* pll clock increase/decrease */ > > > > - void (*load_csc_matrix)(struct drm_crtc_state *crtc_state); > > - void (*load_luts)(struct drm_crtc_state *crtc_state); > > + void (*load_csc_matrix)(struct intel_crtc_state *state); > > + void (*load_luts)(struct intel_crtc_state *state); > > }; > > > > #define CSR_VERSION(major, minor) ((major) << 16 | (minor)) > > diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c > > index 5127da286a2b..335c4702fcfb 100644 > > --- a/drivers/gpu/drm/i915/intel_color.c > > +++ b/drivers/gpu/drm/i915/intel_color.c > > @@ -74,12 +74,12 @@ > > #define ILK_CSC_COEFF_1_0 \ > > ((7 << 12) | ILK_CSC_COEFF_FP(CTM_COEFF_1_0, 8)) > > > > -static bool crtc_state_is_legacy_gamma(struct drm_crtc_state *state) > > +static bool crtc_state_is_legacy_gamma(struct intel_crtc_state *state) > > I'd lkike s/state/crtc_state/, at least in the cases where it doesn't > make the diff too noisy. > > Or maybe even follow up with a wholesale sed/cocci job to just rename > everything in the file? > > Patch is > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Applied the minor tweaks you suggested and BAT still looks clean. Pushed to dinq; thanks for the review. Matt > > > { > > - return !state->degamma_lut && > > - !state->ctm && > > - state->gamma_lut && > > - drm_color_lut_size(state->gamma_lut) == LEGACY_LUT_LENGTH; > > + return !state->base.degamma_lut && > > + !state->base.ctm && > > + state->base.gamma_lut && > > + drm_color_lut_size(state->base.gamma_lut) == LEGACY_LUT_LENGTH; > > } > > > > /* > > @@ -108,10 +108,10 @@ static u64 *ctm_mult_by_limited(u64 *result, const u64 *input) > > return result; > > } > > > > -static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *intel_crtc) > > +static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *crtc) > > { > > - int pipe = intel_crtc->pipe; > > - struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > > + int pipe = crtc->pipe; > > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > > > I915_WRITE(PIPE_CSC_PREOFF_HI(pipe), 0); > > I915_WRITE(PIPE_CSC_PREOFF_ME(pipe), 0); > > @@ -132,14 +132,12 @@ static void ilk_load_ycbcr_conversion_matrix(struct intel_crtc *intel_crtc) > > I915_WRITE(PIPE_CSC_MODE(pipe), 0); > > } > > > > -static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) > > +static void ilk_load_csc_matrix(struct intel_crtc_state *state) > > { > > - struct drm_crtc *crtc = crtc_state->crtc; > > - struct drm_i915_private *dev_priv = to_i915(crtc->dev); > > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > > - int i, pipe = intel_crtc->pipe; > > + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); > > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > + int i, pipe = crtc->pipe; > > uint16_t coeffs[9] = { 0, }; > > - struct intel_crtc_state *intel_crtc_state = to_intel_crtc_state(crtc_state); > > bool limited_color_range = false; > > > > /* > > @@ -147,14 +145,14 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) > > * do the range compression using the gamma LUT instead. > > */ > > if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) > > - limited_color_range = intel_crtc_state->limited_color_range; > > + limited_color_range = state->limited_color_range; > > > > - if (intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || > > - intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) { > > - ilk_load_ycbcr_conversion_matrix(intel_crtc); > > + if (state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 || > > + state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) { > > + ilk_load_ycbcr_conversion_matrix(crtc); > > return; > > - } else if (crtc_state->ctm) { > > - struct drm_color_ctm *ctm = crtc_state->ctm->data; > > + } else if (state->base.ctm) { > > + struct drm_color_ctm *ctm = state->base.ctm->data; > > const u64 *input; > > u64 temp[9]; > > > > @@ -253,16 +251,15 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) > > /* > > * Set up the pipe CSC unit on CherryView. > > */ > > -static void cherryview_load_csc_matrix(struct drm_crtc_state *state) > > +static void cherryview_load_csc_matrix(struct intel_crtc_state *state) > > { > > - struct drm_crtc *crtc = state->crtc; > > - struct drm_device *dev = crtc->dev; > > + struct drm_device *dev = state->base.crtc->dev; > > struct drm_i915_private *dev_priv = to_i915(dev); > > - int pipe = to_intel_crtc(crtc)->pipe; > > + int pipe = to_intel_crtc(state->base.crtc)->pipe; > > uint32_t mode; > > > > - if (state->ctm) { > > - struct drm_color_ctm *ctm = state->ctm->data; > > + if (state->base.ctm) { > > + struct drm_color_ctm *ctm = state->base.ctm->data; > > uint16_t coeffs[9] = { 0, }; > > int i; > > > > @@ -293,36 +290,34 @@ static void cherryview_load_csc_matrix(struct drm_crtc_state *state) > > I915_WRITE(CGM_PIPE_CSC_COEFF8(pipe), coeffs[8]); > > } > > > > - mode = (state->ctm ? CGM_PIPE_MODE_CSC : 0); > > + mode = (state->base.ctm ? CGM_PIPE_MODE_CSC : 0); > > if (!crtc_state_is_legacy_gamma(state)) { > > - mode |= (state->degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > > - (state->gamma_lut ? CGM_PIPE_MODE_GAMMA : 0); > > + mode |= (state->base.degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > > + (state->base.gamma_lut ? CGM_PIPE_MODE_GAMMA : 0); > > } > > I915_WRITE(CGM_PIPE_MODE(pipe), mode); > > } > > > > -void intel_color_set_csc(struct drm_crtc_state *crtc_state) > > +void intel_color_set_csc(struct intel_crtc_state *state) > > { > > - struct drm_device *dev = crtc_state->crtc->dev; > > + struct drm_device *dev = state->base.crtc->dev; > > struct drm_i915_private *dev_priv = to_i915(dev); > > > > if (dev_priv->display.load_csc_matrix) > > - dev_priv->display.load_csc_matrix(crtc_state); > > + dev_priv->display.load_csc_matrix(state); > > } > > > > /* Loads the legacy palette/gamma unit for the CRTC. */ > > -static void i9xx_load_luts_internal(struct drm_crtc *crtc, > > - struct drm_property_blob *blob, > > - struct intel_crtc_state *crtc_state) > > +static void i9xx_load_luts_internal(struct intel_crtc_state *state, > > + struct drm_property_blob *blob) > > { > > - struct drm_device *dev = crtc->dev; > > - struct drm_i915_private *dev_priv = to_i915(dev); > > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > > - enum pipe pipe = intel_crtc->pipe; > > + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); > > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > + enum pipe pipe = crtc->pipe; > > int i; > > > > if (HAS_GMCH_DISPLAY(dev_priv)) { > > - if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > > + if (intel_crtc_has_type(state, INTEL_OUTPUT_DSI)) > > assert_dsi_pll_enabled(dev_priv); > > else > > assert_pll_enabled(dev_priv, pipe); > > @@ -353,53 +348,48 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc, > > } > > } > > > > -static void i9xx_load_luts(struct drm_crtc_state *crtc_state) > > +static void i9xx_load_luts(struct intel_crtc_state *state) > > { > > - i9xx_load_luts_internal(crtc_state->crtc, crtc_state->gamma_lut, > > - to_intel_crtc_state(crtc_state)); > > + i9xx_load_luts_internal(state, state->base.gamma_lut); > > } > > > > /* Loads the legacy palette/gamma unit for the CRTC on Haswell. */ > > -static void haswell_load_luts(struct drm_crtc_state *crtc_state) > > +static void haswell_load_luts(struct intel_crtc_state *state) > > { > > - struct drm_crtc *crtc = crtc_state->crtc; > > - struct drm_device *dev = crtc->dev; > > - struct drm_i915_private *dev_priv = to_i915(dev); > > - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > > - struct intel_crtc_state *intel_crtc_state = > > - to_intel_crtc_state(crtc_state); > > + struct intel_crtc *crtc = to_intel_crtc(state->base.crtc); > > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > bool reenable_ips = false; > > > > /* > > * Workaround : Do not read or write the pipe palette/gamma data while > > * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled. > > */ > > - if (IS_HASWELL(dev_priv) && intel_crtc_state->ips_enabled && > > - (intel_crtc_state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) { > > - hsw_disable_ips(intel_crtc_state); > > + if (IS_HASWELL(dev_priv) && state->ips_enabled && > > + (state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) { > > + hsw_disable_ips(state); > > reenable_ips = true; > > } > > > > - intel_crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT; > > - I915_WRITE(GAMMA_MODE(intel_crtc->pipe), GAMMA_MODE_MODE_8BIT); > > + state->gamma_mode = GAMMA_MODE_MODE_8BIT; > > + I915_WRITE(GAMMA_MODE(crtc->pipe), GAMMA_MODE_MODE_8BIT); > > > > - i9xx_load_luts(crtc_state); > > + i9xx_load_luts(state); > > > > if (reenable_ips) > > - hsw_enable_ips(intel_crtc_state); > > + hsw_enable_ips(state); > > } > > > > -static void bdw_load_degamma_lut(struct drm_crtc_state *state) > > +static void bdw_load_degamma_lut(struct intel_crtc_state *state) > > { > > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > > uint32_t i, lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size; > > > > I915_WRITE(PREC_PAL_INDEX(pipe), > > PAL_PREC_SPLIT_MODE | PAL_PREC_AUTO_INCREMENT); > > > > - if (state->degamma_lut) { > > - struct drm_color_lut *lut = state->degamma_lut->data; > > + if (state->base.degamma_lut) { > > + struct drm_color_lut *lut = state->base.degamma_lut->data; > > > > for (i = 0; i < lut_size; i++) { > > uint32_t word = > > @@ -419,10 +409,10 @@ static void bdw_load_degamma_lut(struct drm_crtc_state *state) > > } > > } > > > > -static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) > > +static void bdw_load_gamma_lut(struct intel_crtc_state *state, u32 offset) > > { > > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > > uint32_t i, lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size; > > > > WARN_ON(offset & ~PAL_PREC_INDEX_VALUE_MASK); > > @@ -432,8 +422,8 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) > > PAL_PREC_AUTO_INCREMENT | > > offset); > > > > - if (state->gamma_lut) { > > - struct drm_color_lut *lut = state->gamma_lut->data; > > + if (state->base.gamma_lut) { > > + struct drm_color_lut *lut = state->base.gamma_lut->data; > > > > for (i = 0; i < lut_size; i++) { > > uint32_t word = > > @@ -467,11 +457,10 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset) > > } > > > > /* Loads the palette/gamma unit for the CRTC on Broadwell+. */ > > -static void broadwell_load_luts(struct drm_crtc_state *state) > > +static void broadwell_load_luts(struct intel_crtc_state *state) > > { > > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > > - struct intel_crtc_state *intel_state = to_intel_crtc_state(state); > > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > > > > if (crtc_state_is_legacy_gamma(state)) { > > haswell_load_luts(state); > > @@ -479,10 +468,9 @@ static void broadwell_load_luts(struct drm_crtc_state *state) > > } > > > > bdw_load_degamma_lut(state); > > - bdw_load_gamma_lut(state, > > - INTEL_INFO(dev_priv)->color.degamma_lut_size); > > + bdw_load_gamma_lut(state, INTEL_INFO(dev_priv)->color.degamma_lut_size); > > > > - intel_state->gamma_mode = GAMMA_MODE_MODE_SPLIT; > > + state->gamma_mode = GAMMA_MODE_MODE_SPLIT; > > I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_SPLIT); > > POSTING_READ(GAMMA_MODE(pipe)); > > > > @@ -493,10 +481,10 @@ static void broadwell_load_luts(struct drm_crtc_state *state) > > I915_WRITE(PREC_PAL_INDEX(pipe), 0); > > } > > > > -static void glk_load_degamma_lut(struct drm_crtc_state *state) > > +static void glk_load_degamma_lut(struct intel_crtc_state *state) > > { > > - struct drm_i915_private *dev_priv = to_i915(state->crtc->dev); > > - enum pipe pipe = to_intel_crtc(state->crtc)->pipe; > > + struct drm_i915_private *dev_priv = to_i915(state->base.crtc->dev); > > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > > const uint32_t lut_size = 33; > > uint32_t i; > > > > @@ -523,13 +511,11 @@ static void glk_load_degamma_lut(struct drm_crtc_state *state) > > I915_WRITE(PRE_CSC_GAMC_DATA(pipe), (1 << 16)); > > } > > > > -static void glk_load_luts(struct drm_crtc_state *state) > > +static void glk_load_luts(struct intel_crtc_state *state) > > { > > - struct drm_crtc *crtc = state->crtc; > > - struct drm_device *dev = crtc->dev; > > + struct drm_device *dev = state->base.crtc->dev; > > struct drm_i915_private *dev_priv = to_i915(dev); > > - struct intel_crtc_state *intel_state = to_intel_crtc_state(state); > > - enum pipe pipe = to_intel_crtc(crtc)->pipe; > > + enum pipe pipe = to_intel_crtc(state->base.crtc)->pipe; > > > > glk_load_degamma_lut(state); > > > > @@ -540,15 +526,15 @@ static void glk_load_luts(struct drm_crtc_state *state) > > > > bdw_load_gamma_lut(state, 0); > > > > - intel_state->gamma_mode = GAMMA_MODE_MODE_10BIT; > > + state->gamma_mode = GAMMA_MODE_MODE_10BIT; > > I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_10BIT); > > POSTING_READ(GAMMA_MODE(pipe)); > > } > > > > /* Loads the palette/gamma unit for the CRTC on CherryView. */ > > -static void cherryview_load_luts(struct drm_crtc_state *state) > > +static void cherryview_load_luts(struct intel_crtc_state *state) > > { > > - struct drm_crtc *crtc = state->crtc; > > + struct drm_crtc *crtc = state->base.crtc; > > struct drm_i915_private *dev_priv = to_i915(crtc->dev); > > enum pipe pipe = to_intel_crtc(crtc)->pipe; > > struct drm_color_lut *lut; > > @@ -558,14 +544,13 @@ static void cherryview_load_luts(struct drm_crtc_state *state) > > if (crtc_state_is_legacy_gamma(state)) { > > /* Turn off degamma/gamma on CGM block. */ > > I915_WRITE(CGM_PIPE_MODE(pipe), > > - (state->ctm ? CGM_PIPE_MODE_CSC : 0)); > > - i9xx_load_luts_internal(crtc, state->gamma_lut, > > - to_intel_crtc_state(state)); > > + (state->base.ctm ? CGM_PIPE_MODE_CSC : 0)); > > + i9xx_load_luts_internal(state, state->base.gamma_lut); > > return; > > } > > > > - if (state->degamma_lut) { > > - lut = state->degamma_lut->data; > > + if (state->base.degamma_lut) { > > + lut = state->base.degamma_lut->data; > > lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size; > > for (i = 0; i < lut_size; i++) { > > /* Write LUT in U0.14 format. */ > > @@ -579,8 +564,8 @@ static void cherryview_load_luts(struct drm_crtc_state *state) > > } > > } > > > > - if (state->gamma_lut) { > > - lut = state->gamma_lut->data; > > + if (state->base.gamma_lut) { > > + lut = state->base.gamma_lut->data; > > lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size; > > for (i = 0; i < lut_size; i++) { > > /* Write LUT in U0.10 format. */ > > @@ -595,29 +580,29 @@ static void cherryview_load_luts(struct drm_crtc_state *state) > > } > > > > I915_WRITE(CGM_PIPE_MODE(pipe), > > - (state->ctm ? CGM_PIPE_MODE_CSC : 0) | > > - (state->degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > > - (state->gamma_lut ? CGM_PIPE_MODE_GAMMA : 0)); > > + (state->base.ctm ? CGM_PIPE_MODE_CSC : 0) | > > + (state->base.degamma_lut ? CGM_PIPE_MODE_DEGAMMA : 0) | > > + (state->base.gamma_lut ? CGM_PIPE_MODE_GAMMA : 0)); > > > > /* > > * Also program a linear LUT in the legacy block (behind the > > * CGM block). > > */ > > - i9xx_load_luts_internal(crtc, NULL, to_intel_crtc_state(state)); > > + i9xx_load_luts_internal(state, NULL); > > } > > > > -void intel_color_load_luts(struct drm_crtc_state *crtc_state) > > +void intel_color_load_luts(struct intel_crtc_state *state) > > { > > - struct drm_device *dev = crtc_state->crtc->dev; > > + struct drm_device *dev = state->base.crtc->dev; > > struct drm_i915_private *dev_priv = to_i915(dev); > > > > - dev_priv->display.load_luts(crtc_state); > > + dev_priv->display.load_luts(state); > > } > > > > -int intel_color_check(struct drm_crtc *crtc, > > - struct drm_crtc_state *crtc_state) > > +int intel_color_check(struct intel_crtc *crtc, > > + struct intel_crtc_state *state) > > { > > - struct drm_i915_private *dev_priv = to_i915(crtc->dev); > > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > size_t gamma_length, degamma_length; > > > > degamma_length = INTEL_INFO(dev_priv)->color.degamma_lut_size; > > @@ -627,27 +612,27 @@ int intel_color_check(struct drm_crtc *crtc, > > * We allow both degamma & gamma luts at the right size or > > * NULL. > > */ > > - if ((!crtc_state->degamma_lut || > > - drm_color_lut_size(crtc_state->degamma_lut) == degamma_length) && > > - (!crtc_state->gamma_lut || > > - drm_color_lut_size(crtc_state->gamma_lut) == gamma_length)) > > + if ((!state->base.degamma_lut || > > + drm_color_lut_size(state->base.degamma_lut) == degamma_length) && > > + (!state->base.gamma_lut || > > + drm_color_lut_size(state->base.gamma_lut) == gamma_length)) > > return 0; > > > > /* > > * We also allow no degamma lut/ctm and a gamma lut at the legacy > > * size (256 entries). > > */ > > - if (crtc_state_is_legacy_gamma(crtc_state)) > > + if (crtc_state_is_legacy_gamma(state)) > > return 0; > > > > return -EINVAL; > > } > > > > -void intel_color_init(struct drm_crtc *crtc) > > +void intel_color_init(struct intel_crtc *crtc) > > { > > - struct drm_i915_private *dev_priv = to_i915(crtc->dev); > > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > > > - drm_mode_crtc_set_gamma_size(crtc, 256); > > + drm_mode_crtc_set_gamma_size(&crtc->base, 256); > > > > if (IS_CHERRYVIEW(dev_priv)) { > > dev_priv->display.load_csc_matrix = cherryview_load_csc_matrix; > > @@ -669,7 +654,7 @@ void intel_color_init(struct drm_crtc *crtc) > > /* Enable color management support when we have degamma & gamma LUTs. */ > > if (INTEL_INFO(dev_priv)->color.degamma_lut_size != 0 && > > INTEL_INFO(dev_priv)->color.gamma_lut_size != 0) > > - drm_crtc_enable_color_mgmt(crtc, > > + drm_crtc_enable_color_mgmt(&crtc->base, > > INTEL_INFO(dev_priv)->color.degamma_lut_size, > > true, > > INTEL_INFO(dev_priv)->color.gamma_lut_size); > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index db6004a883c7..5b965797df4e 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -5641,7 +5641,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config, > > * On ILK+ LUT must be loaded before the pipe is running but with > > * clocks enabled > > */ > > - intel_color_load_luts(&pipe_config->base); > > + intel_color_load_luts(pipe_config); > > > > if (dev_priv->display.initial_watermarks != NULL) > > dev_priv->display.initial_watermarks(old_intel_state, pipe_config); > > @@ -5752,7 +5752,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, > > > > haswell_set_pipemisc(pipe_config); > > > > - intel_color_set_csc(&pipe_config->base); > > + intel_color_set_csc(pipe_config); > > > > intel_crtc->active = true; > > > > @@ -5771,7 +5771,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, > > * On ILK+ LUT must be loaded before the pipe is running but with > > * clocks enabled > > */ > > - intel_color_load_luts(&pipe_config->base); > > + intel_color_load_luts(pipe_config); > > > > /* > > * Display WA #1153: enable hardware to bypass the alpha math > > @@ -6117,7 +6117,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config, > > > > i9xx_set_pipeconf(pipe_config); > > > > - intel_color_set_csc(&pipe_config->base); > > + intel_color_set_csc(pipe_config); > > > > intel_crtc->active = true; > > > > @@ -6137,7 +6137,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config, > > > > i9xx_pfit_enable(pipe_config); > > > > - intel_color_load_luts(&pipe_config->base); > > + intel_color_load_luts(pipe_config); > > > > dev_priv->display.initial_watermarks(old_intel_state, > > pipe_config); > > @@ -6193,7 +6193,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config, > > > > i9xx_pfit_enable(pipe_config); > > > > - intel_color_load_luts(&pipe_config->base); > > + intel_color_load_luts(pipe_config); > > > > if (dev_priv->display.initial_watermarks != NULL) > > dev_priv->display.initial_watermarks(old_intel_state, > > @@ -10972,7 +10972,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, > > } > > > > if (crtc_state->color_mgmt_changed) { > > - ret = intel_color_check(crtc, crtc_state); > > + ret = intel_color_check(intel_crtc, pipe_config); > > if (ret) > > return ret; > > > > @@ -13548,8 +13548,8 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc, > > if (!modeset && > > (intel_cstate->base.color_mgmt_changed || > > intel_cstate->update_pipe)) { > > - intel_color_set_csc(&intel_cstate->base); > > - intel_color_load_luts(&intel_cstate->base); > > + intel_color_set_csc(intel_cstate); > > + intel_color_load_luts(intel_cstate); > > } > > > > /* Perform vblank evasion around commit operation */ > > @@ -14122,7 +14122,7 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) > > > > drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); > > > > - intel_color_init(&intel_crtc->base); > > + intel_color_init(intel_crtc); > > > > WARN_ON(drm_crtc_index(&intel_crtc->base) != intel_crtc->pipe); > > > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > > index a8177ccf1d4f..ba1d97991d5a 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -2327,10 +2327,10 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ > > struct intel_plane_state *intel_state); > > > > /* intel_color.c */ > > -void intel_color_init(struct drm_crtc *crtc); > > -int intel_color_check(struct drm_crtc *crtc, struct drm_crtc_state *state); > > -void intel_color_set_csc(struct drm_crtc_state *crtc_state); > > -void intel_color_load_luts(struct drm_crtc_state *crtc_state); > > +void intel_color_init(struct intel_crtc *crtc); > > +int intel_color_check(struct intel_crtc *crtc, struct intel_crtc_state *state); > > +void intel_color_set_csc(struct intel_crtc_state *state); > > +void intel_color_load_luts(struct intel_crtc_state *state); > > > > /* intel_lspcon.c */ > > bool lspcon_init(struct intel_digital_port *intel_dig_port); > > -- > > 2.14.4 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ville Syrjälä > Intel -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for Use intel_* types more consistently 2018-12-07 0:53 [PATCH 0/2] Use intel_* types more consistently Matt Roper 2018-12-07 0:54 ` [PATCH 1/2] drm/i915: Use intel_ types more consistently for watermark code Matt Roper 2018-12-07 0:54 ` [PATCH 2/2] drm/i915: Use intel_ types more consistently for color management code Matt Roper @ 2018-12-07 1:09 ` Patchwork 2018-12-07 1:11 ` ✗ Fi.CI.SPARSE: " Patchwork ` (2 subsequent siblings) 5 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2018-12-07 1:09 UTC (permalink / raw) To: Matt Roper; +Cc: intel-gfx == Series Details == Series: Use intel_* types more consistently URL : https://patchwork.freedesktop.org/series/53705/ State : warning == Summary == $ dim checkpatch origin/drm-tip 3b3378ade6f9 drm/i915: Use intel_ types more consistently for watermark code 3c31c0ac3fda drm/i915: Use intel_ types more consistently for color management code -:209: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'state->gamma_mode == GAMMA_MODE_MODE_SPLIT' #209: FILE: drivers/gpu/drm/i915/intel_color.c:367: + if (IS_HASWELL(dev_priv) && state->ips_enabled && + (state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) { total: 0 errors, 0 warnings, 1 checks, 511 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* ✗ Fi.CI.SPARSE: warning for Use intel_* types more consistently 2018-12-07 0:53 [PATCH 0/2] Use intel_* types more consistently Matt Roper ` (2 preceding siblings ...) 2018-12-07 1:09 ` ✗ Fi.CI.CHECKPATCH: warning for Use intel_* types more consistently Patchwork @ 2018-12-07 1:11 ` Patchwork 2018-12-07 1:31 ` ✓ Fi.CI.BAT: success " Patchwork 2018-12-07 13:47 ` ✓ Fi.CI.IGT: " Patchwork 5 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2018-12-07 1:11 UTC (permalink / raw) To: Matt Roper; +Cc: intel-gfx == Series Details == Series: Use intel_* types more consistently URL : https://patchwork.freedesktop.org/series/53705/ State : warning == Summary == $ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: Use intel_ types more consistently for watermark code -drivers/gpu/drm/i915/selftests/../i915_drv.h:3563:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3562:16: warning: expression using sizeof(void) Commit: drm/i915: Use intel_ types more consistently for color management code Okay! _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* ✓ Fi.CI.BAT: success for Use intel_* types more consistently 2018-12-07 0:53 [PATCH 0/2] Use intel_* types more consistently Matt Roper ` (3 preceding siblings ...) 2018-12-07 1:11 ` ✗ Fi.CI.SPARSE: " Patchwork @ 2018-12-07 1:31 ` Patchwork 2018-12-07 13:47 ` ✓ Fi.CI.IGT: " Patchwork 5 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2018-12-07 1:31 UTC (permalink / raw) To: Matt Roper; +Cc: intel-gfx == Series Details == Series: Use intel_* types more consistently URL : https://patchwork.freedesktop.org/series/53705/ State : success == Summary == CI Bug Log - changes from CI_DRM_5279 -> Patchwork_11042 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/53705/revisions/1/mbox/ Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_11042: ### IGT changes ### #### Warnings #### * igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c: - {fi-kbl-7567u}: PASS -> SKIP +33 Known issues ------------ Here are the changes found in Patchwork_11042 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@amdgpu/amd_basic@cs-compute: - fi-kbl-8809g: NOTRUN -> FAIL [fdo#108094] * igt@amdgpu/amd_prime@amd-to-i915: - fi-kbl-8809g: NOTRUN -> FAIL [fdo#107341] * igt@gem_ctx_create@basic-files: - fi-bsw-kefka: PASS -> FAIL [fdo#108656] * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b: - fi-blb-e6850: NOTRUN -> INCOMPLETE [fdo#107718] #### Possible fixes #### * igt@amdgpu/amd_basic@userptr: - fi-kbl-8809g: DMESG-WARN -> PASS * igt@gem_exec_suspend@basic-s3: - fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS * igt@gem_exec_suspend@basic-s4-devices: - fi-ivb-3520m: FAIL [fdo#108880] -> PASS {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#107341]: https://bugs.freedesktop.org/show_bug.cgi?id=107341 [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#108094]: https://bugs.freedesktop.org/show_bug.cgi?id=108094 [fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656 [fdo#108880]: https://bugs.freedesktop.org/show_bug.cgi?id=108880 Participating hosts (46 -> 41) ------------------------------ Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-u3 Build changes ------------- * Linux: CI_DRM_5279 -> Patchwork_11042 CI_DRM_5279: 8c3dbdac21ef5357bfa9b11da9b2bd1baedc4962 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_4743: edb2db2cf2b6665d7ba3fa9117263302f6307a4f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_11042: 3c31c0ac3fda554cb4383098e3f8ee4611720567 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 3c31c0ac3fda drm/i915: Use intel_ types more consistently for color management code 3b3378ade6f9 drm/i915: Use intel_ types more consistently for watermark code == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11042/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* ✓ Fi.CI.IGT: success for Use intel_* types more consistently 2018-12-07 0:53 [PATCH 0/2] Use intel_* types more consistently Matt Roper ` (4 preceding siblings ...) 2018-12-07 1:31 ` ✓ Fi.CI.BAT: success " Patchwork @ 2018-12-07 13:47 ` Patchwork 5 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2018-12-07 13:47 UTC (permalink / raw) To: Matt Roper; +Cc: intel-gfx == Series Details == Series: Use intel_* types more consistently URL : https://patchwork.freedesktop.org/series/53705/ State : success == Summary == CI Bug Log - changes from CI_DRM_5279_full -> Patchwork_11042_full ==================================================== Summary ------- **WARNING** Minor unknown changes coming with Patchwork_11042_full need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_11042_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_11042_full: ### IGT changes ### #### Warnings #### * igt@tools_test@sysfs_l3_parity: - shard-hsw: PASS -> SKIP Known issues ------------ Here are the changes found in Patchwork_11042_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@kms_cursor_crc@cursor-256x256-dpms: - shard-glk: PASS -> FAIL [fdo#103232] - shard-apl: PASS -> FAIL [fdo#103232] +2 * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible: - shard-hsw: PASS -> FAIL [fdo#102887] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render: - shard-glk: PASS -> FAIL [fdo#103167] +1 * igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max: - shard-glk: PASS -> FAIL [fdo#108145] * igt@kms_plane_multiple@atomic-pipe-a-tiling-yf: - shard-glk: PASS -> FAIL [fdo#103166] * {igt@kms_rotation_crc@multiplane-rotation-cropping-top}: - shard-kbl: PASS -> DMESG-FAIL [fdo#108950] - shard-glk: PASS -> DMESG-WARN [fdo#105763] / [fdo#106538] #### Possible fixes #### * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a: - shard-snb: DMESG-WARN [fdo#107956] -> PASS * igt@kms_cursor_crc@cursor-128x128-random: - shard-apl: FAIL [fdo#103232] -> PASS * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-cpu: - shard-glk: FAIL [fdo#103167] -> PASS * {igt@kms_plane@pixel-format-pipe-b-planes-source-clamping}: - shard-apl: FAIL [fdo#108948] -> PASS * igt@kms_plane_multiple@atomic-pipe-c-tiling-y: - shard-apl: FAIL [fdo#103166] -> PASS * igt@kms_setmode@basic: - shard-apl: FAIL [fdo#99912] -> PASS * igt@kms_vblank@pipe-c-ts-continuation-suspend: - shard-kbl: INCOMPLETE [fdo#103665] -> PASS {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887 [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232 [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665 [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763 [fdo#106538]: https://bugs.freedesktop.org/show_bug.cgi?id=106538 [fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948 [fdo#108950]: https://bugs.freedesktop.org/show_bug.cgi?id=108950 [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 Participating hosts (7 -> 5) ------------------------------ Missing (2): shard-skl shard-iclb Build changes ------------- * Linux: CI_DRM_5279 -> Patchwork_11042 CI_DRM_5279: 8c3dbdac21ef5357bfa9b11da9b2bd1baedc4962 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_4743: edb2db2cf2b6665d7ba3fa9117263302f6307a4f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_11042: 3c31c0ac3fda554cb4383098e3f8ee4611720567 @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11042/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-12-10 23:07 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-12-07 0:53 [PATCH 0/2] Use intel_* types more consistently Matt Roper 2018-12-07 0:54 ` [PATCH 1/2] drm/i915: Use intel_ types more consistently for watermark code Matt Roper 2018-12-10 19:27 ` Ville Syrjälä 2018-12-07 0:54 ` [PATCH 2/2] drm/i915: Use intel_ types more consistently for color management code Matt Roper 2018-12-10 19:31 ` Ville Syrjälä 2018-12-10 23:07 ` Matt Roper 2018-12-07 1:09 ` ✗ Fi.CI.CHECKPATCH: warning for Use intel_* types more consistently Patchwork 2018-12-07 1:11 ` ✗ Fi.CI.SPARSE: " Patchwork 2018-12-07 1:31 ` ✓ Fi.CI.BAT: success " Patchwork 2018-12-07 13:47 ` ✓ Fi.CI.IGT: " 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.