drm/i915: Rework watermark readout to use plane api
Subsystems (3)
PATCH 1/14 drm/i915: Rework watermark readout to use plane api
Instead of unconditionally verifying the cursor plane, handle it in the same way as any other plane, and use our existing api to verify.
While at it, ensure that on gen9+ we verify active_planes mask as well. This should give the correct results for planar YUV planes too, as we update active_planes for them.
--- drivers/gpu/drm/i915/display/intel_display.c | 83 ++++++-------------- 1 file changed, 23 insertions(+), 60 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +23 -60
@@ -13183,7 +13183,8 @@ static void verify_wm_state(struct intel_crtc *crtc,struct skl_pipe_wm *sw_wm;struct skl_ddb_entry *hw_ddb_entry, *sw_ddb_entry;const enum pipe pipe = crtc->pipe; -int plane, level, max_level =ilk_wm_max_level (dev_priv); +int level, max_level =ilk_wm_max_level (dev_priv); +struct intel_plane *plane;if (INTEL_GEN (dev_priv) <9 || !new_crtc_state->base.active)return ;
@@ -13207,63 +13208,25 @@ static void verify_wm_state(struct intel_crtc *crtc, hw->ddb.enabled_slices);/* planes */ -for_each_universal_plane (dev_priv, pipe, plane) { +for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) {struct skl_plane_wm *hw_plane_wm, *sw_plane_wm; +enum pipe plane_pipe = pipe; - hw_plane_wm = &hw->wm.planes[plane]; - sw_plane_wm = &sw_wm->planes[plane]; - -/* Watermarks */ -for (level =0 ; level <= max_level; level++) { -if (skl_wm_level_equals (&hw_plane_wm->wm[level], - &sw_plane_wm->wm[level])) -continue ; - -DRM_ERROR ("mismatch in WM pipe %c plane %d level %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n" , -pipe_name (pipe), plane +1 , level, - sw_plane_wm->wm[level].plane_en, - sw_plane_wm->wm[level].plane_res_b, - sw_plane_wm->wm[level].plane_res_l, - hw_plane_wm->wm[level].plane_en, - hw_plane_wm->wm[level].plane_res_b, - hw_plane_wm->wm[level].plane_res_l); - } + hw_plane_wm = &hw->wm.planes[plane->id]; + sw_plane_wm = &sw_wm->planes[plane->id]; -if (!skl_wm_level_equals (&hw_plane_wm->trans_wm, - &sw_plane_wm->trans_wm)) { -DRM_ERROR ("mismatch in trans WM pipe %c plane %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n" , -pipe_name (pipe), plane +1 , - sw_plane_wm->trans_wm.plane_en, - sw_plane_wm->trans_wm.plane_res_b, - sw_plane_wm->trans_wm.plane_res_l, - hw_plane_wm->trans_wm.plane_en, - hw_plane_wm->trans_wm.plane_res_b, - hw_plane_wm->trans_wm.plane_res_l); - } - -/* DDB */ - hw_ddb_entry = &hw->ddb_y[plane]; - sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb_y[plane]; - -if (!skl_ddb_entry_equal (hw_ddb_entry, sw_ddb_entry)) { -DRM_ERROR ("mismatch in DDB state pipe %c plane %d (expected (%u,%u), found (%u,%u))\n" , -pipe_name (pipe), plane +1 , - sw_ddb_entry->start, sw_ddb_entry->end, - hw_ddb_entry->start, hw_ddb_entry->end); +if (!plane->get_hw_state (plane, &plane_pipe)) { +WARN (new_crtc_state->active_planes &BIT (plane->id), +"pipe %c %s should be visible, but isn't\n" , +pipe_name (pipe), plane->base.name); +continue ; } - } -/* -* cursor -* If the cursor plane isn't active, we may not have updated it's ddb -* allocation. In that case since the ddb allocation will be updated -* once the plane becomes visible, we can skip this check -*/ -if (1 ) { -struct skl_plane_wm *hw_plane_wm, *sw_plane_wm; +WARN_ON (plane_pipe != pipe); - hw_plane_wm = &hw->wm.planes[PLANE_CURSOR ]; - sw_plane_wm = &sw_wm->planes[PLANE_CURSOR ]; +WARN (!(new_crtc_state->active_planes &BIT (plane->id)), +"pipe %c %s should be invisible, but visible.\n" , +pipe_name (pipe), plane->base.name);/* Watermarks */ for (level =0 ; level <= max_level; level++) {
@@ -13271,8 +13234,8 @@ static void verify_wm_state(struct intel_crtc *crtc, &sw_plane_wm->wm[level]))continue ; - DRM_ERROR("mismatch in WM pipe %c cursor level %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", - pipe_name(pipe), level, + DRM_ERROR("mismatch in WM pipe %c %s level %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", + pipe_name(pipe), plane->base.name, level, sw_plane_wm->wm[level].plane_en, sw_plane_wm->wm[level].plane_res_b, sw_plane_wm->wm[level].plane_res_l,
@@ -13283,8 +13246,8 @@ static void verify_wm_state(struct intel_crtc *crtc,if (!skl_wm_level_equals (&hw_plane_wm->trans_wm, &sw_plane_wm->trans_wm)) { - DRM_ERROR("mismatch in trans WM pipe %c cursor (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", - pipe_name(pipe), + DRM_ERROR("mismatch in trans WM pipe %c %s (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", + pipe_name(pipe), plane->base.name, sw_plane_wm->trans_wm.plane_en, sw_plane_wm->trans_wm.plane_res_b, sw_plane_wm->trans_wm.plane_res_l,
@@ -13294,12 +13257,12 @@ static void verify_wm_state(struct intel_crtc *crtc, }/* DDB */ - hw_ddb_entry = &hw->ddb_y[PLANE_CURSOR ]; - sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb_y[PLANE_CURSOR ]; + hw_ddb_entry = &hw->ddb_y[plane->id]; + sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb_y[plane->id];if (!skl_ddb_entry_equal (hw_ddb_entry, sw_ddb_entry)) { -DRM_ERROR ("mismatch in DDB state pipe %c cursor (expected (%u,%u), found (%u,%u))\n" , -pipe_name (pipe), +DRM_ERROR ("mismatch in DDB state pipe %c %s (expected (%u,%u), found (%u,%u))\n" , +pipe_name (pipe), plane->base.name, sw_ddb_entry->start, sw_ddb_entry->end, hw_ddb_entry->start, hw_ddb_entry->end); }
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/14 drm/i915: Introduce intel_atomic_get_plane_state_after_check(), v2.
Use this in all the places where we try to acquire planes after the planes atomic_check().
In case of intel_modeset_all_pipes() this is not yet done after atomic_check, but seems like it will be in the future. To add some paranoia, add all planes rather than active planes, because of bigjoiner and planar YUV support having extra planes outside of the core's view that wouldn't be added otherwise.
Changes since v1:
- Always add all planes, to handle force plane updates to work correctly with a disabled cursor plane.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 41 +++++++++---------- .../gpu/drm/i915/display/intel_atomic_plane.c | 15 +++++++ drivers/gpu/drm/i915/display/intel_cdclk.c | 15 ++++--- drivers/gpu/drm/i915/display/intel_color.c | 7 ++-- .../drm/i915/display/intel_display_types.h | 6 +++ drivers/gpu/drm/i915/intel_pm.c | 14 ++++--- 6 files changed, 62 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +20 -21
@@ -313,13 +313,10 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) { - struct drm_plane *plane = NULL; -struct intel_plane *intel_plane; -struct intel_plane_state *plane_state =NULL ; struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;struct drm_atomic_state *drm_state = crtc_state->base.state; -struct intel_atomic_state *intel_state =to_intel_atomic_state (drm_state); +struct intel_atomic_state *state =to_intel_atomic_state (drm_state);int num_scalers_need;int i;
@@ -346,6 +343,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,/* walkthrough scaler_users bits and start assigning scalers */ for (i =0 ; i <sizeof (scaler_state->scaler_users) *8 ; i++) { +struct intel_plane_state *plane_state =NULL ;int *scaler_id;const char *name;int idx;
@@ -361,19 +359,16 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,/* panel fitter case: assign as a crtc scaler */ scaler_id = &scaler_state->scaler_id; }else { - name ="PLANE" ; +struct intel_plane *plane;/* plane scaler case: assign as a plane scaler */ /* find the plane that set the bit as scaler_user */ - plane = drm_state->planes[i].ptr;/* * to enable/disable hq mode, add planes that are using scaler * into this transaction */ -if (!plane) { -struct drm_plane_state *state; - +if (!drm_state->planes[i].ptr) {/* * GLK+ scalers don't have a HQ mode so it * isn't necessary to change between HQ and dyn mode
@@ -382,24 +377,28 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv))continue ; - plane =drm_plane_from_index (&dev_priv->drm, i); - state =drm_atomic_get_plane_state (drm_state, plane); -if (IS_ERR (state)) { -DRM_DEBUG_KMS ("Failed to add [PLANE:%d] to drm_state\n" , - plane->base.id); -return PTR_ERR (state); + plane =to_intel_plane (drm_plane_from_index (&dev_priv->drm, i)); + plane_state = +intel_atomic_get_plane_state_after_check (state, + crtc_state, + plane); +if (IS_ERR (plane_state)) { +DRM_DEBUG_KMS ("Failed to add [PLANE:%d] to drm_state: %li\n" , + plane->base.base.id,PTR_ERR (plane_state)); +return PTR_ERR (plane_state); } + }else { + plane =to_intel_plane (drm_state->planes[i].ptr); + plane_state =intel_atomic_get_new_plane_state (state, + plane); } - intel_plane =to_intel_plane (plane); - idx = plane->base.id; -/* plane on different crtc cannot be a scaler user of this crtc */ -if (WARN_ON (intel_plane->pipe != intel_crtc->pipe)) +if (WARN_ON (plane->pipe != intel_crtc->pipe))continue ; - plane_state =intel_atomic_get_new_plane_state (intel_state, - intel_plane); + name ="PLANE" ; + idx = plane->base.base.id; scaler_id = &plane_state->scaler_id; }
drivers/gpu/drm/i915/display/intel_atomic_plane.c +15 -0
@@ -363,6 +363,21 @@ void i9xx_update_planes_on_crtc(struct intel_atomic_state *state, } } +struct intel_plane_state * +intel_atomic_get_plane_state_after_check (struct intel_atomic_state *state, +struct intel_crtc_state *new_crtc_state, +struct intel_plane *plane) +{ +struct intel_plane_state *plane_state = +intel_atomic_get_plane_state (state, plane); + +if (IS_ERR (plane_state)) +return plane_state; + + new_crtc_state->update_planes |=BIT (plane->id); +return plane_state; +} +const struct drm_plane_helper_funcs intel_plane_helper_funcs = { .prepare_fb = intel_prepare_plane_fb, .cleanup_fb = intel_cleanup_plane_fb,
drivers/gpu/drm/i915/display/intel_cdclk.c +9 -6
@@ -2253,6 +2253,7 @@ static int intel_modeset_all_pipes(struct intel_atomic_state *state)*/ for_each_intel_crtc (&dev_priv->drm, crtc) {struct intel_crtc_state *crtc_state; +struct intel_plane *plane;int ret; crtc_state =intel_atomic_get_crtc_state (&state->base, crtc);
@@ -2270,12 +2271,14 @@ static int intel_modeset_all_pipes(struct intel_atomic_state *state)if (ret)return ret; - ret =drm_atomic_add_affected_planes (&state->base, - &crtc->base); -if (ret) -return ret; - - crtc_state->update_planes |= crtc_state->active_planes; +for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) { +struct intel_plane_state *plane_state = +intel_atomic_get_plane_state_after_check (state, + crtc_state, + plane); +if (IS_ERR (plane_state)) +return PTR_ERR (plane_state); + } }return 0 ;
drivers/gpu/drm/i915/display/intel_color.c +4 -3
@@ -1077,11 +1077,12 @@ intel_color_add_affected_planes(struct intel_crtc_state *new_crtc_state)if (!need_plane_update (plane, new_crtc_state))continue ; - plane_state =intel_atomic_get_plane_state (state, plane); + plane_state = +intel_atomic_get_plane_state_after_check (state, + new_crtc_state, + plane);if (IS_ERR (plane_state))return PTR_ERR (plane_state); - - new_crtc_state->update_planes |=BIT (plane->id); }return 0 ;
drivers/gpu/drm/i915/display/intel_display_types.h +6 -0
@@ -1549,4 +1549,10 @@ static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *state) return i915_ggtt_offset(state->vma); } +/* intel_atomic_plane.c */ +struct intel_plane_state * +intel_atomic_get_plane_state_after_check (struct intel_atomic_state *state, +struct intel_crtc_state *crtc_state, +struct intel_plane *plane); +#endif /* __INTEL_DISPLAY_TYPES_H__ */
drivers/gpu/drm/i915/intel_pm.c +8 -6
@@ -5255,11 +5255,12 @@ skl_ddb_add_affected_planes(const struct intel_crtc_state *old_crtc_state, &new_crtc_state->wm.skl.plane_ddb_uv[plane_id])) continue; - plane_state =intel_atomic_get_plane_state (state, plane); + plane_state = +intel_atomic_get_plane_state_after_check (state, + new_crtc_state, + plane);if (IS_ERR (plane_state))return PTR_ERR (plane_state); - - new_crtc_state->update_planes |=BIT (plane_id); }return 0 ;
@@ -5531,11 +5532,12 @@ static int skl_wm_add_affected_planes(struct intel_atomic_state *state, &new_crtc_state->wm.skl.optimal.planes[plane_id])) continue; - plane_state =intel_atomic_get_plane_state (state, plane); + plane_state = +intel_atomic_get_plane_state_after_check (state, + new_crtc_state, + plane);if (IS_ERR (plane_state))return PTR_ERR (plane_state); - - new_crtc_state->update_planes |=BIT (plane_id); }return 0 ;
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/14 drm/i915: Handle a few more cases for crtc hw/uapi split, v3.
In reply to Maarten LankhorstWe are still looking at drm_crtc_state in a few places, convert those to use intel_crtc_state instead.
Changes since v1:
- Move to before uapi/hw split.
- Add hunks for intel_pm.c as well.
Changes since v2:
- Incorporate Ville's feedback.
--- drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++------- drivers/gpu/drm/i915/display/intel_dp_mst.c | 12 ++++++++---- drivers/gpu/drm/i915/display/intel_psr.c | 16 +++++++--------- drivers/gpu/drm/i915/intel_pm.c | 6 ++---- 4 files changed, 25 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +8 -7
@@ -16528,8 +16528,7 @@ static int intel_initial_commit(struct drm_device *dev) {struct drm_atomic_state *state =NULL ;struct drm_modeset_acquire_ctx ctx; -struct drm_crtc *crtc; -struct drm_crtc_state *crtc_state; +struct intel_crtc *crtc;int ret =0 ; state =drm_atomic_state_alloc (dev);
@@ -16541,15 +16540,17 @@ static int intel_initial_commit(struct drm_device *dev) retry: state->acquire_ctx = &ctx; -drm_for_each_crtc (crtc, dev) { - crtc_state =drm_atomic_get_crtc_state (state, crtc); +for_each_intel_crtc (dev, crtc) { +struct intel_crtc_state *crtc_state = +intel_atomic_get_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) { ret =PTR_ERR (crtc_state); goto out; } -if (crtc_state->active) { - ret =drm_atomic_add_affected_planes (state, crtc); +if (crtc_state->base.active) { + ret =drm_atomic_add_affected_planes (state, &crtc->base);if (ret) goto out;
@@ -16559,7 +16560,7 @@ static int intel_initial_commit(struct drm_device *dev)* having a proper LUT loaded. Remove once we * have readout for pipe gamma enable. */ - crtc_state->color_mgmt_changed = true; + crtc_state->base.color_mgmt_changed = true; } }
drivers/gpu/drm/i915/display/intel_dp_mst.c +8 -4
@@ -168,7 +168,6 @@ intel_dp_mst_atomic_check(struct drm_connector *connector,struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_crtc *new_crtc = new_conn_state->crtc; -struct drm_crtc_state *crtc_state;struct drm_dp_mst_topology_mgr *mgr;int ret;
@@ -183,11 +182,16 @@ intel_dp_mst_atomic_check(struct drm_connector *connector,* connector */ if (new_crtc) { - crtc_state =drm_atomic_get_new_crtc_state (state, new_crtc); +struct intel_atomic_state *intel_state = +to_intel_atomic_state (state); +struct intel_crtc *intel_crtc =to_intel_crtc (new_crtc); +struct intel_crtc_state *crtc_state = +intel_atomic_get_new_crtc_state (intel_state, + intel_crtc);if (!crtc_state || - !drm_atomic_crtc_needs_modeset (crtc_state) || - crtc_state->enable) + !drm_atomic_crtc_needs_modeset (&crtc_state->base) || + crtc_state->base.enable)return 0 ; }
drivers/gpu/drm/i915/display/intel_psr.c +7 -9
@@ -26,6 +26,7 @@#include "display/intel_dp.h" #include "i915_drv.h" +#include "intel_atomic.h" #include "intel_display_types.h" #include "intel_psr.h" #include "intel_sprite.h"
@@ -1116,7 +1117,7 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv)struct drm_device *dev = &dev_priv->drm;struct drm_modeset_acquire_ctx ctx;struct drm_atomic_state *state; -struct drm_crtc *crtc; +struct intel_crtc *crtc;int err; state =drm_atomic_state_alloc (dev);
@@ -1127,21 +1128,18 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv) state->acquire_ctx = &ctx; retry: -drm_for_each_crtc (crtc, dev) { -struct drm_crtc_state *crtc_state; -struct intel_crtc_state *intel_crtc_state; +for_each_intel_crtc (dev, crtc) { +struct intel_crtc_state *crtc_state = +intel_atomic_get_crtc_state (state, crtc); - crtc_state =drm_atomic_get_crtc_state (state, crtc);if (IS_ERR (crtc_state)) { err =PTR_ERR (crtc_state); goto error; } - intel_crtc_state =to_intel_crtc_state (crtc_state); - -if (crtc_state->active && intel_crtc_state->has_psr) { +if (crtc_state->base.active && crtc_state->has_psr) {/* Mark mode as changed to trigger a pipe->update() */ - crtc_state->mode_changed = true; + crtc_state->base.mode_changed = true;break ; } }
drivers/gpu/drm/i915/intel_pm.c +2 -4
@@ -3083,11 +3083,9 @@ static bool ilk_validate_pipe_wm(const struct drm_i915_private *dev_priv,/* Compute new watermarks for the pipe */ static int ilk_compute_pipe_wm (struct intel_crtc_state *crtc_state) { -struct drm_atomic_state *state = crtc_state->base.state; +struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc);struct intel_pipe_wm *pipe_wm; -struct drm_device *dev = state->dev; -const struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_plane *plane;const struct intel_plane_state *plane_state;const struct intel_plane_state *pristate =NULL ;
@@ -3782,7 +3780,7 @@ bool intel_can_enable_sagv(struct intel_atomic_state *state) crtc =intel_get_crtc_for_pipe (dev_priv, pipe); crtc_state =to_intel_crtc_state (crtc->base.state); -if (crtc->base.state->adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) +if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE )return false;for_each_intel_plane_on_crtc (dev, crtc, plane) {
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/14 drm/i915: Add aliases for uapi and hw to crtc_state
In reply to Maarten LankhorstPrepare to split up hw and uapi machinally, by adding a uapi and hw alias. We will remove the base in a bit. This is a split from the original uapi/hw patch, which did it all in one go.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 8 ++++-- drivers/gpu/drm/i915/display/intel_display.c | 2 ++ drivers/gpu/drm/i915/display/intel_display.h | 6 ++--- .../drm/i915/display/intel_display_types.h | 27 ++++++++++++++++++- 4 files changed, 37 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +6 -2
@@ -186,9 +186,10 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector)struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc) { +const struct intel_crtc_state *old_crtc_state =to_intel_crtc_state (crtc->state);struct intel_crtc_state *crtc_state; - crtc_state =kmemdup (crtc->state,sizeof (*crtc_state),GFP_KERNEL ); + crtc_state =kmemdup (old_crtc_state,sizeof (*crtc_state),GFP_KERNEL );if (!crtc_state)return NULL ;
@@ -219,7 +220,10 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state) { -drm_atomic_helper_crtc_destroy_state (crtc, state); + struct intel_crtc_state *crtc_state = to_intel_crtc_state(state); + +__drm_atomic_helper_crtc_destroy_state (&crtc_state->base); +kfree (crtc_state); } static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,
drivers/gpu/drm/i915/display/intel_display.c +2 -0
@@ -12517,6 +12517,8 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)/* Keep base drm_crtc_state intact, only clear our extended struct */ BUILD_BUG_ON (offsetof(struct intel_crtc_state , base)); +BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); +BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw));memcpy (&crtc_state->base +1 , &saved_state->base +1 ,sizeof (*crtc_state) -sizeof (crtc_state->base));
drivers/gpu/drm/i915/display/intel_display.h +3 -3
@@ -447,10 +447,10 @@ enum phy_fia {#define intel_atomic_crtc_state_for_each_plane_state ( \ plane, plane_state, \ crtc_state) \ - for_each_intel_plane_mask(((crtc_state)->base.state->dev), (plane), \ - ((crtc_state)->base.plane_mask)) \ + for_each_intel_plane_mask(((crtc_state)->uapi.state->dev), (plane), \ + ((crtc_state)->uapi.plane_mask)) \ for_each_if ((plane_state = \ - to_intel_plane_state(__drm_atomic_get_current_plane_state((crtc_state)->base.state, &plane->base)))) + to_intel_plane_state(__drm_atomic_get_current_plane_state((crtc_state)->uapi.state, &plane->base)))) void intel_link_compute_m_n(u16 bpp, int nlanes, int pixel_clock, int link_clock,
drivers/gpu/drm/i915/display/intel_display_types.h +26 -1
@@ -749,7 +749,32 @@ enum intel_output_format { };struct intel_crtc_state { +union {struct drm_crtc_state base; +/* +* uapi (drm) state. This is the software state shown to userspace. +* In particular, the following members are used for bookkeeping: +* - crtc +* - state +* - *_changed +* - event +* - commit +* - mode_blob +*/ +struct drm_crtc_state uapi; + +/* +* actual hardware state, the state we program to the hardware. +* The following members are used to verify the hardware state: +* - enable +* - active +* - mode / adjusted_mode +* - color property blobs. +* +* During initial hw readout, they need to be copied to uapi. +*/ +struct drm_crtc_state hw; + };/** * quirks - bitfield with hw state readout quirks
@@ -1100,7 +1125,7 @@ struct cxsr_latency {#define to_intel_atomic_state (x) container_of(x, struct intel_atomic_state, base)#define to_intel_crtc (x) container_of(x, struct intel_crtc, base) -#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, base) +#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, uapi)#define to_intel_connector (x) container_of(x, struct intel_connector, base)#define to_intel_encoder (x) container_of(x, struct intel_encoder, base)#define to_intel_framebuffer (x) container_of(x, struct intel_framebuffer, base)
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/14 drm/i915: Perform manual conversions for crtc uapi/hw split, v2.
In reply to Maarten Lankhorstintel_get_load_detect_pipe() needs to set uapi active, uapi enable is set by the call to drm_atomic_set_mode_for_crtc(), so we can remove it.
intel_pipe_config_compare() needs to look at hw state, but I didn't change spatch to look at it. It's easy enough to do manually.
intel_atomic_check() definitely needs to check for uapi enable, otherwise intel_modeset_pipe_config cannot copy uapi state to hw.
Changes since v1:
- Actually set uapi.active in get_load_detect_pipe().
--- drivers/gpu/drm/i915/display/intel_display.c | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +21 -21
@@ -11357,7 +11357,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector, goto fail; } - crtc_state->base.active = crtc_state->base.enable = true; + crtc_state->uapi.active = true;if (!mode) mode = &load_detect_mode;
@@ -13002,19 +13002,19 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_X (output_types); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hdisplay); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_htotal); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hblank_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hblank_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hsync_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hsync_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hdisplay); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_htotal); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hblank_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hblank_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hsync_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hsync_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vdisplay); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vtotal); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vblank_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vblank_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vsync_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vsync_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vdisplay); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vtotal); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vblank_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vblank_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vsync_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vsync_end);PIPE_CONF_CHECK_I (pixel_multiplier);PIPE_CONF_CHECK_I (output_format);
@@ -13031,17 +13031,17 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_BOOL_INCOMPLETE (has_audio); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_INTERLACE );if (!PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS )) { -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_PHSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_NHSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_PVSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_NVSYNC ); }
@@ -13080,7 +13080,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, bp_gamma =intel_color_get_gamma_bit_precision (pipe_config);if (bp_gamma) -PIPE_CONF_CHECK_COLOR_LUT (gamma_mode, base.gamma_lut, bp_gamma); +PIPE_CONF_CHECK_COLOR_LUT (gamma_mode, hw.gamma_lut, bp_gamma); }
@@ -13125,7 +13125,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,if (IS_G4X (dev_priv) ||INTEL_GEN (dev_priv) >=5 )PIPE_CONF_CHECK_I (pipe_bpp); -PIPE_CONF_CHECK_CLOCK_FUZZY (base.adjusted_mode.crtc_clock); +PIPE_CONF_CHECK_CLOCK_FUZZY (hw.adjusted_mode.crtc_clock);PIPE_CONF_CHECK_CLOCK_FUZZY (port_clock);PIPE_CONF_CHECK_I (min_voltage_level);
@@ -13823,7 +13823,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!needs_modeset (new_crtc_state))continue ; -if (!new_crtc_state->base.enable) { +if (!new_crtc_state->uapi.enable) { any_ms = true;continue ; }
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/14 drm/i915: Perform automated conversions for crtc uapi/hw split, base -> hw.
In reply to Maarten LankhorstSplit up crtc_state->base to hw where appropriate. This is done using the following patch:
@@
struct intel_crtc_state *T;
identifier x =~ "^(active|enable|degamma_lut|gamma_lut|ctm|mode|adjusted_mode)$"; @@
-T->base.x
+T->hw.x
@@
struct drm_crtc_state *T;
identifier x =~ "^(active|enable|degamma_lut|gamma_lut|ctm|mode|adjusted_mode)$"; @@
-to_intel_crtc_state(T)->base.x
+to_intel_crtc_state(T)->hw.x
--- drivers/gpu/drm/i915/display/icl_dsi.c | 12 +- drivers/gpu/drm/i915/display/intel_audio.c | 4 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 8 +- drivers/gpu/drm/i915/display/intel_color.c | 108 ++++---- drivers/gpu/drm/i915/display/intel_crt.c | 18 +- drivers/gpu/drm/i915/display/intel_ddi.c | 18 +- drivers/gpu/drm/i915/display/intel_display.c | 262 +++++++++--------- drivers/gpu/drm/i915/display/intel_dp.c | 22 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/display/intel_dvo.c | 12 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 20 +- drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- drivers/gpu/drm/i915/display/intel_panel.c | 8 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 12 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 16 +- drivers/gpu/drm/i915/display/intel_sprite.c | 8 +- drivers/gpu/drm/i915/display/intel_tv.c | 4 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 10 +- drivers/gpu/drm/i915/i915_debugfs.c | 8 +- drivers/gpu/drm/i915/intel_pm.c | 62 ++--- 24 files changed, 321 insertions(+), 317 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +6 -6
@@ -276,7 +276,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder,if (intel_dsi->dual_link ==DSI_DUAL_LINK_FRONT_BACK ) {const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;u32 dss_ctl2;u16 hactive = adjusted_mode->crtc_hdisplay;u16 dl_buffer_depth;
@@ -768,7 +768,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;enum port port;enum transcoder dsi_trans;/* horizontal timings */
@@ -1216,7 +1216,7 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder, {struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (intel_dsi->dual_link) { adjusted_mode->crtc_hdisplay *=2 ;
@@ -1249,9 +1249,9 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, pipe_config->port_clock =cnl_calc_wrpll_link (dev_priv, &pipe_config->dpll_hw_state); - pipe_config->base.adjusted_mode.crtc_clock = intel_dsi->pclk; + pipe_config->hw.adjusted_mode.crtc_clock = intel_dsi->pclk;if (intel_dsi->dual_link) - pipe_config->base.adjusted_mode.crtc_clock *=2 ; + pipe_config->hw.adjusted_mode.crtc_clock *=2 ;gen11_dsi_get_timings (encoder, pipe_config); pipe_config->output_types |=BIT (INTEL_OUTPUT_DSI );
@@ -1269,7 +1269,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode; pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;intel_fixed_panel_mode (fixed_mode, adjusted_mode);
drivers/gpu/drm/i915/display/intel_audio.c +2 -2
@@ -233,7 +233,7 @@ static const struct hdmi_aud_ncts hdmi_aud_ncts_36bpp[] = {static u32 audio_config_hdmi_pixel_clock (const struct intel_crtc_state *crtc_state) {const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int i;for (i =0 ; i <ARRAY_SIZE (hdmi_audio_clock); i++) {
@@ -694,7 +694,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_connector *connector = conn_state->connector;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;enum port port = encoder->port;enum pipe pipe = crtc->pipe;
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -4
@@ -1924,7 +1924,7 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state)to_i915 (crtc_state->base.crtc->dev);int min_cdclk; -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)return 0 ; min_cdclk =intel_pixel_rate_to_cdclk (crtc_state);
@@ -2047,7 +2047,7 @@ static u8 bxt_compute_min_voltage_level(struct intel_atomic_state *state) sizeof(state->min_voltage_level));for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (crtc_state->base.enable) +if (crtc_state->hw.enable) state->min_voltage_level[i] = crtc_state->min_voltage_level;else
@@ -2133,7 +2133,7 @@ static int skl_dpll0_vco(struct intel_atomic_state *state) vco = dev_priv->skl_preferred_vco_freq;for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)continue ;if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ))
@@ -2260,7 +2260,7 @@ static int intel_modeset_all_pipes(struct intel_atomic_state *state)if (IS_ERR (crtc_state))return PTR_ERR (crtc_state); -if (!crtc_state->base.active || +if (!crtc_state->hw.active ||drm_atomic_crtc_needs_modeset (&crtc_state->base))continue ;
drivers/gpu/drm/i915/display/intel_color.c +54 -54
328 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_crt.c +9 -9
@@ -132,9 +132,9 @@ static void intel_crt_get_config(struct intel_encoder *encoder, { pipe_config->output_types |=BIT (INTEL_OUTPUT_ANALOG ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void hsw_crt_get_config(struct intel_encoder *encoder,
@@ -144,13 +144,13 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,intel_ddi_get_config (encoder, pipe_config); - pipe_config->base.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC | + pipe_config->hw.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_NVSYNC ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); + pipe_config->hw.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); }/* Note: The caller is required to filter out dpms modes not supported by the
@@ -162,7 +162,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder);struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa;if (INTEL_GEN (dev_priv) >=5 )
@@ -358,7 +358,7 @@ static int intel_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;
@@ -373,7 +373,7 @@ static int pch_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;
@@ -390,7 +390,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;
drivers/gpu/drm/i915/display/intel_ddi.c +9 -9
@@ -1528,7 +1528,7 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)if (pipe_config->pixel_multiplier) dotclock /= pipe_config->pixel_multiplier; - pipe_config->base.adjusted_mode.crtc_clock = dotclock; + pipe_config->hw.adjusted_mode.crtc_clock = dotclock; } static void icl_ddi_clock_get(struct intel_encoder *encoder,
@@ -1860,9 +1860,9 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)BUG (); } -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) temp |=TRANS_DDI_PVSYNC ; -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) temp |=TRANS_DDI_PHSYNC ;if (cpu_transcoder ==TRANSCODER_EDP ) {
@@ -3371,7 +3371,7 @@ static void tgl_dc3co_exitline_compute_config(struct intel_encoder *encoder, {u32 exit_scanlines;struct drm_i915_private *dev_priv =to_i915 (cstate->base.crtc->dev); -u32 crtc_vdisplay = cstate->base.adjusted_mode.crtc_vdisplay; +u32 crtc_vdisplay = cstate->hw.adjusted_mode.crtc_vdisplay; cstate->dc3co_exitline =0 ;
@@ -3383,7 +3383,7 @@ static void tgl_dc3co_exitline_compute_config(struct intel_encoder *encoder, encoder->port != PORT_A)return ; -if (!cstate->has_psr2 || !cstate->base.active) +if (!cstate->has_psr2 || !cstate->hw.active)return ;/*
@@ -3391,7 +3391,7 @@ static void tgl_dc3co_exitline_compute_config(struct intel_encoder *encoder,* PSR2 transcoder Early Exit scanlines = ROUNDUP(200 / line time) + 1 */ exit_scanlines = -intel_usecs_to_scanlines (&cstate->base.adjusted_mode,200 ) +1 ; +intel_usecs_to_scanlines (&cstate->hw.adjusted_mode,200 ) +1 ;if (WARN_ON (exit_scanlines > crtc_vdisplay))return ;
@@ -4078,7 +4078,7 @@ intel_ddi_update_prepare(struct intel_atomic_state *state,WARN_ON (crtc && crtc->active);intel_tc_port_get_link (enc_to_dig_port (&encoder->base), required_lanes); -if (crtc_state && crtc_state->base.active) +if (crtc_state && crtc_state->hw.active)intel_update_active_dpll (state, crtc, encoder); }
@@ -4226,7 +4226,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;switch (temp &TRANS_DDI_BPC_MASK ) {case TRANS_DDI_BPC_6 :
@@ -4509,7 +4509,7 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder,WARN_ON (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )); -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; if (!crtc_state->hdmi_high_tmds_clock_ratio &&
drivers/gpu/drm/i915/display/intel_display.c +133 -129
762 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp.c +11 -11
@@ -1990,7 +1990,7 @@ intel_dp_compute_link_config_wide(struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config, const struct link_config_limits *limits) { - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; + struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int bpp, clock, lane_count;int mode_rate, link_clock, link_avail;
@@ -2044,7 +2044,7 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;u8 dsc_max_bpc;int pipe_bpp;int ret;
@@ -2155,7 +2155,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; + struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct link_config_limits limits;int common_len;
@@ -2243,7 +2243,7 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp, {const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);int ret;
@@ -2272,7 +2272,7 @@ bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,const struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;/* * Our YCbCr output is always limited range.
@@ -2305,7 +2305,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_lspcon *lspcon =enc_to_intel_lspcon (&encoder->base);enum port port = encoder->port;
@@ -2428,7 +2428,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port = encoder->port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; intel_dp_set_link_params(intel_dp, pipe_config->port_clock, pipe_config->lane_count,
@@ -3260,7 +3260,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, flags |=DRM_MODE_FLAG_NVSYNC ; } - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;if (IS_G4X (dev_priv) && tmp &DP_COLOR_RANGE_16_235 ) pipe_config->limited_color_range = true;
@@ -3277,7 +3277,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, pipe_config->port_clock =270000 ; } - pipe_config->base.adjusted_mode.crtc_clock = + pipe_config->hw.adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->dp_m_n);
@@ -5070,7 +5070,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,WARN_ON (!intel_crtc_has_dp_encoder (crtc_state)); -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; if (conn_state->commit &&
@@ -6932,7 +6932,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,return ; } -if (!crtc_state->base.active) { +if (!crtc_state->hw.active) {DRM_DEBUG_KMS ("eDP encoder disabled. CRTC not Active\n" );return ; }
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -3
@@ -48,7 +48,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,struct intel_connector *connector =to_intel_connector (conn_state->connector);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;void *port = connector->port;bool constant_n =drm_dp_has_quirk (&intel_dp->desc,DP_DPCD_QUIRK_CONSTANT_N );
@@ -99,7 +99,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;void *port = connector->port;struct link_config_limits limits;int ret;
@@ -191,7 +191,7 @@ intel_dp_mst_atomic_check(struct drm_connector *connector,if (!crtc_state || !drm_atomic_crtc_needs_modeset (&crtc_state->base) || - crtc_state->base.enable) + crtc_state->hw.enable)return 0 ; }
drivers/gpu/drm/i915/display/intel_dvo.c +6 -6
@@ -178,9 +178,9 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags; - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void intel_disable_dvo(struct intel_encoder *encoder,
@@ -207,8 +207,8 @@ static void intel_enable_dvo(struct intel_encoder *encoder,u32 temp =I915_READ (dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, - &pipe_config->base.mode, - &pipe_config->base.adjusted_mode); + &pipe_config->hw.mode, + &pipe_config->hw.adjusted_mode);I915_WRITE (dvo_reg, temp |DVO_ENABLE );I915_READ (dvo_reg);
@@ -253,7 +253,7 @@ static int intel_dvo_compute_config(struct intel_encoder *encoder,struct intel_dvo *intel_dvo =enc_to_dvo (encoder);const struct drm_display_mode *fixed_mode = intel_dvo->attached_connector->panel.fixed_mode; -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;/* * If we have timings from the BIOS for the panel, put them in
@@ -278,7 +278,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);enum pipe pipe = crtc->pipe;u32 dvo_val;
drivers/gpu/drm/i915/display/intel_fbc.c +1 -1
@@ -667,7 +667,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->vma =NULL ; cache->flags =0 ; - cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags; + cache->crtc.mode_flags = crtc_state->hw.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate;
drivers/gpu/drm/i915/display/intel_hdmi.c +10 -10
@@ -708,7 +708,7 @@ intel_hdmi_compute_avi_infoframe(struct intel_encoder *encoder, {struct hdmi_avi_infoframe *frame = &crtc_state->infoframes.avi.avi;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;struct drm_connector *connector = conn_state->connector;int ret;
@@ -804,7 +804,7 @@ intel_hdmi_compute_hdmi_infoframe(struct intel_encoder *encoder, ret =drm_hdmi_vendor_infoframe_from_display_mode (frame, conn_state->connector, - &crtc_state->base.adjusted_mode); + &crtc_state->hw.adjusted_mode);if (WARN_ON (ret))return false;
@@ -1027,7 +1027,7 @@ static void intel_hdmi_compute_gcp_infoframe(struct intel_encoder *encoder,/* Enable default_phase whenever the display mode is suitably aligned */ if (gcp_default_phase_possible (crtc_state->pipe_bpp, - &crtc_state->base.adjusted_mode)) + &crtc_state->hw.adjusted_mode)) crtc_state->infoframes.gcp |=GCP_DEFAULT_PHASE_ENABLE ; }
@@ -1738,7 +1738,7 @@ static void intel_hdmi_prepare(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base); -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 hdmi_val;intel_dp_dual_mode_set_tmds_output (intel_hdmi, true);
@@ -1829,7 +1829,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, tmp & HDMI_COLOR_RANGE_16_235) pipe_config->limited_color_range = true; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;if ((tmp &SDVO_COLOR_FORMAT_MASK ) == HDMI_COLOR_FORMAT_12bpc) dotclock = pipe_config->port_clock *2 /3 ;
@@ -1839,7 +1839,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,if (pipe_config->pixel_multiplier) dotclock /= pipe_config->pixel_multiplier; - pipe_config->base.adjusted_mode.crtc_clock = dotclock; + pipe_config->hw.adjusted_mode.crtc_clock = dotclock; pipe_config->lane_count =4 ;
@@ -2215,7 +2215,7 @@ static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,struct drm_connector_state *connector_state;struct drm_connector *connector;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int i;if (HAS_GMCH (dev_priv))
@@ -2336,7 +2336,7 @@ static int intel_hdmi_compute_clock(struct intel_encoder *encoder, {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int bpc, clock = adjusted_mode->crtc_clock;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLCLK )
@@ -2378,7 +2378,7 @@ static bool intel_hdmi_limited_color_range(const struct intel_crtc_state *crtc_sconst struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;/* * Our YCbCr output is always limited range.
@@ -2406,7 +2406,7 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct drm_connector *connector = conn_state->connector;struct drm_scdc *scdc = &connector->display_info.hdmi.scdc; struct intel_digital_connector_state *intel_conn_state =
drivers/gpu/drm/i915/display/intel_lspcon.c +2 -2
@@ -189,7 +189,7 @@ void lspcon_ycbcr420_config(struct drm_connector *connector, {const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;if (drm_mode_is_420_only (info, adjusted_mode) && connector->ycbcr_420_allowed) {
@@ -475,7 +475,7 @@ void lspcon_set_infoframes(struct intel_encoder *encoder,struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base);struct intel_lspcon *lspcon = &dig_port->lspcon;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;if (!lspcon->active) {DRM_ERROR ("Writing infoframes while LSPCON disabled ?\n" );
drivers/gpu/drm/i915/display/intel_lvds.c +4 -4
@@ -135,7 +135,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_PVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;if (INTEL_GEN (dev_priv) <5 ) pipe_config->gmch_pfit.lvds_border_bits =
@@ -148,7 +148,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, pipe_config->gmch_pfit.control |= tmp &PANEL_8TO6_DITHER_ENABLE ; } - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv,
@@ -231,7 +231,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder,struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;enum pipe pipe = crtc->pipe;u32 temp;
@@ -392,7 +392,7 @@ static int intel_lvds_compute_config(struct intel_encoder *intel_encoder,to_lvds_encoder (&intel_encoder->base);struct intel_connector *intel_connector = lvds_encoder->attached_connector; -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);unsigned int lvds_bpp;
drivers/gpu/drm/i915/display/intel_panel.c +4 -4
@@ -178,7 +178,7 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc, struct intel_crtc_state *pipe_config, int fitting_mode) { -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int x =0 , y =0 , width =0 , height =0 ;/* Native modes don't need fitting */
@@ -300,7 +300,7 @@ static inline u32 panel_fitter_scaling(u32 source, u32 target)static void i965_scale_aspect (struct intel_crtc_state *pipe_config,u32 *pfit_control) { -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;u32 scaled_width = adjusted_mode->crtc_hdisplay * pipe_config->pipe_src_h; u32 scaled_height = pipe_config->pipe_src_w *
@@ -321,7 +321,7 @@ static void i9xx_scale_aspect(struct intel_crtc_state *pipe_config, u32 *pfit_control, u32 *pfit_pgm_ratios, u32 *border) { -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;u32 scaled_width = adjusted_mode->crtc_hdisplay * pipe_config->pipe_src_h; u32 scaled_height = pipe_config->pipe_src_w *
@@ -380,7 +380,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, {struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);u32 pfit_control =0 , pfit_pgm_ratios =0 , border =0 ; -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;/* Native modes don't need fitting */ if (adjusted_mode->crtc_hdisplay == pipe_config->pipe_src_w &&
drivers/gpu/drm/i915/display/intel_pipe_crc.c +1 -1
@@ -313,7 +313,7 @@ intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable) pipe_config->crc_enabled = enable;if (IS_HASWELL (dev_priv) && - pipe_config->base.active && crtc->pipe ==PIPE_A && + pipe_config->hw.active && crtc->pipe ==PIPE_A && pipe_config->cpu_transcoder ==TRANSCODER_EDP ) pipe_config->base.mode_changed = true;
drivers/gpu/drm/i915/display/intel_psr.c +6 -6
@@ -537,11 +537,11 @@ transcoder_has_psr2(struct drm_i915_private *dev_priv, enum transcoder trans)static u32 intel_get_frame_time_us (const struct intel_crtc_state *cstate) { -if (!cstate || !cstate->base.active) +if (!cstate || !cstate->hw.active)return 0 ;return DIV_ROUND_UP (1000 *1000 , -drm_mode_vrefresh (&cstate->base.adjusted_mode)); +drm_mode_vrefresh (&cstate->hw.adjusted_mode)); } static void psr2_program_idle_frames(struct drm_i915_private *dev_priv,
@@ -606,8 +606,8 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); -int crtc_hdisplay = crtc_state->base.adjusted_mode.crtc_hdisplay; -int crtc_vdisplay = crtc_state->base.adjusted_mode.crtc_vdisplay; +int crtc_hdisplay = crtc_state->hw.adjusted_mode.crtc_hdisplay; +int crtc_vdisplay = crtc_state->hw.adjusted_mode.crtc_vdisplay;int psr_max_h =0 , psr_max_v =0 ;if (!dev_priv->psr.sink_psr2_support)
@@ -673,7 +673,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int psr_setup_time;if (!CAN_PSR (dev_priv))
@@ -1137,7 +1137,7 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv) goto error; } -if (crtc_state->base.active && crtc_state->has_psr) { +if (crtc_state->hw.active && crtc_state->has_psr) {/* Mark mode as changed to trigger a pipe->update() */ crtc_state->base.mode_changed = true;break ;
drivers/gpu/drm/i915/display/intel_sdvo.c +8 -8
@@ -1087,7 +1087,7 @@ static bool intel_sdvo_compute_avi_infoframe(struct intel_sdvo *intel_sdvo, {struct hdmi_avi_infoframe *frame = &crtc_state->infoframes.avi.avi;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int ret;if (!crtc_state->has_hdmi_sink)
@@ -1276,8 +1276,8 @@ static int intel_sdvo_compute_config(struct intel_encoder *encoder,to_intel_sdvo_connector_state (conn_state);struct intel_sdvo_connector *intel_sdvo_connector =to_intel_sdvo_connector (conn_state->connector); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; -struct drm_display_mode *mode = &pipe_config->base.mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; +struct drm_display_mode *mode = &pipe_config->hw.mode;DRM_DEBUG_KMS ("forcing bpc to 8 for SDVO\n" ); pipe_config->pipe_bpp =8 *3 ;
@@ -1430,12 +1430,12 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder, {struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;const struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state (conn_state);const struct intel_sdvo_connector *intel_sdvo_connector =to_intel_sdvo_connector (conn_state->connector); -const struct drm_display_mode *mode = &crtc_state->base.mode; +const struct drm_display_mode *mode = &crtc_state->hw.mode;struct intel_sdvo *intel_sdvo =to_sdvo (intel_encoder);u32 sdvox;struct intel_sdvo_in_out_map in_out;
@@ -1629,7 +1629,7 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, flags |=DRM_MODE_FLAG_NVSYNC ; } - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;/* * pixel multiplier readout is tricky: Only on i915g/gm it is stored in
@@ -1649,7 +1649,7 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,if (pipe_config->pixel_multiplier) dotclock /= pipe_config->pixel_multiplier; - pipe_config->base.adjusted_mode.crtc_clock = dotclock; + pipe_config->hw.adjusted_mode.crtc_clock = dotclock;/* Cross check the port pixel multiplier with the sdvo encoder state. */ if (intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_CLOCK_RATE_MULT,
@@ -1701,7 +1701,7 @@ static void intel_sdvo_enable_audio(struct intel_sdvo *intel_sdvo, const struct drm_connector_state *conn_state) {const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;struct drm_connector *connector = conn_state->connector;u8 *eld = connector->eld;
drivers/gpu/drm/i915/display/intel_sprite.c +4 -4
@@ -83,7 +83,7 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state) {struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_display_mode *adjusted_mode = &new_crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &new_crtc_state->hw.adjusted_mode;long timeout =msecs_to_jiffies_timeout (1 );int scanline, min, max, vblank_start;wait_queue_head_t *wq =drm_crtc_vblank_waitqueue (&crtc->base);
@@ -1513,7 +1513,7 @@ g4x_sprite_check_scaling(struct intel_crtc_state *crtc_state,const struct drm_rect *dst = &plane_state->base.dst;int src_x, src_w, src_h, crtc_w, crtc_h;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;unsigned int stride = plane_state->color_plane[0 ].stride;unsigned int cpp = fb->format->cpp[0 ];unsigned int width_bytes;
@@ -1727,8 +1727,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, }/* Y-tiling is not supported in IF-ID Interlace mode */ - if (crtc_state->base.enable && - crtc_state->base.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE && + if (crtc_state->hw.enable && + crtc_state->hw.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE && (fb->modifier == I915_FORMAT_MOD_Y_TILED || fb->modifier == I915_FORMAT_MOD_Yf_TILED || fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
drivers/gpu/drm/i915/display/intel_tv.c +2 -2
@@ -1085,7 +1085,7 @@ intel_tv_get_config(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;struct drm_display_mode mode = {};u32 tv_ctl, hctl1, hctl3, vctl1, vctl2, tmp;struct tv_mode tv_mode = {};
@@ -1188,7 +1188,7 @@ intel_tv_compute_config(struct intel_encoder *encoder,to_intel_tv_connector_state (conn_state);const struct tv_mode *tv_mode =intel_tv_mode_find (conn_state);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;int hdisplay = adjusted_mode->crtc_hdisplay;int vdisplay = adjusted_mode->crtc_vdisplay;
drivers/gpu/drm/i915/display/intel_vdsc.c +2 -2
@@ -329,8 +329,8 @@ int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,int column_index =0 ;u8 line_buf_depth =0 ; - vdsc_cfg->pic_width = pipe_config->base.adjusted_mode.crtc_hdisplay; - vdsc_cfg->pic_height = pipe_config->base.adjusted_mode.crtc_vdisplay; + vdsc_cfg->pic_width = pipe_config->hw.adjusted_mode.crtc_hdisplay; + vdsc_cfg->pic_height = pipe_config->hw.adjusted_mode.crtc_vdisplay; vdsc_cfg->slice_width =DIV_ROUND_UP (vdsc_cfg->pic_width, pipe_config->dsc.slice_count);/*
drivers/gpu/drm/i915/display/vlv_dsi.c +5 -5
@@ -263,7 +263,7 @@ static int intel_dsi_compute_config(struct intel_encoder *encoder,struct intel_connector *intel_connector = intel_dsi->attached_connector;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int ret;DRM_DEBUG_KMS ("\n" );
@@ -1032,7 +1032,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;struct drm_display_mode *adjusted_mode_sw;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);
@@ -1045,7 +1045,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, crtc_hblank_start_sw, crtc_hblank_end_sw;/* FIXME: hw readout should not depend on SW state */ - adjusted_mode_sw = &crtc->config->base.adjusted_mode; + adjusted_mode_sw = &crtc->config->hw.adjusted_mode;/* * Atleast one port is active as encoder->get_config called only if
@@ -1204,7 +1204,7 @@ static void intel_dsi_get_config(struct intel_encoder *encoder, }if (pclk) { - pipe_config->base.adjusted_mode.crtc_clock = pclk; + pipe_config->hw.adjusted_mode.crtc_clock = pclk; pipe_config->port_clock = pclk; } }
@@ -1317,7 +1317,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;enum port port;unsigned int bpp =mipi_dsi_pixel_format_to_bpp (intel_dsi->pixel_format);u32 val, tmp;
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -2679,11 +2679,11 @@ static int i915_display_info(struct seq_file *m, void *unused)seq_printf (m,"CRTC %d: pipe: %c, active=%s, (size=%dx%d), dither=%s, bpp=%d\n" , crtc->base.base.id,pipe_name (crtc->pipe), -yesno (pipe_config->base.active), +yesno (pipe_config->hw.active), pipe_config->pipe_src_w, pipe_config->pipe_src_h,yesno (pipe_config->dither), pipe_config->pipe_bpp); -if (pipe_config->base.active) { +if (pipe_config->hw.active) {struct intel_plane *cursor =to_intel_plane (crtc->base.cursor);
@@ -4156,7 +4156,7 @@ static int i915_drrs_ctl_set(void *data, u64 val) crtc_state =to_intel_crtc_state (crtc->base.state); -if (!crtc_state->base.active || +if (!crtc_state->hw.active || !crtc_state->has_drrs) goto out;
@@ -4238,7 +4238,7 @@ i915_fifo_underrun_reset_write(struct file *filp, ret =wait_for_completion_interruptible (&commit->flip_done); } -if (!ret && crtc_state->base.active) { +if (!ret && crtc_state->hw.active) {DRM_DEBUG_KMS ("Re-arming FIFO underruns on pipe %c\n" ,pipe_name (intel_crtc->pipe));
drivers/gpu/drm/i915/intel_pm.c +31 -31
241 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/14 drm/i915: Perform automated conversions for crtc uapi/hw split, base -> uapi.
In reply to Maarten LankhorstSplit up crtc_state->base to uapi. This is done using the following patch, ran after the previous commit that splits out any hw references:
@@
struct intel_crtc_state *T;
@@
-T->base
+T->uapi
--- drivers/gpu/drm/i915/display/icl_dsi.c | 6 +- drivers/gpu/drm/i915/display/intel_atomic.c | 8 +- .../gpu/drm/i915/display/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/display/intel_audio.c | 8 +- drivers/gpu/drm/i915/display/intel_bw.c | 4 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 10 +- drivers/gpu/drm/i915/display/intel_color.c | 70 ++--- drivers/gpu/drm/i915/display/intel_crt.c | 6 +- drivers/gpu/drm/i915/display/intel_ddi.c | 32 +-- drivers/gpu/drm/i915/display/intel_display.c | 257 +++++++++--------- drivers/gpu/drm/i915/display/intel_dp.c | 20 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 14 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 44 +-- drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- drivers/gpu/drm/i915/display/intel_panel.c | 6 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/display/intel_psr.c | 6 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +- drivers/gpu/drm/i915/display/intel_sprite.c | 17 +- drivers/gpu/drm/i915/display/intel_tv.c | 4 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 8 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 10 +- drivers/gpu/drm/i915/i915_debugfs.c | 6 +- drivers/gpu/drm/i915/intel_pm.c | 112 ++++---- 27 files changed, 348 insertions(+), 346 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +3 -3
@@ -625,7 +625,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum pipe pipe = intel_crtc->pipe;u32 tmp;enum port port;
@@ -1242,7 +1242,7 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);/* FIXME: adapt icl_ddi_clock_get() for DSI and use that? */
@@ -1265,7 +1265,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; struct drm_display_mode *adjusted_mode =
drivers/gpu/drm/i915/display/intel_atomic.c +4 -4
@@ -193,7 +193,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)if (!crtc_state)return NULL ; -__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->base); +__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false;
@@ -205,7 +205,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->fb_bits =0 ; crtc_state->update_planes =0 ; -return &crtc_state->base; +return &crtc_state->uapi; }/**
@@ -222,7 +222,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc, {struct intel_crtc_state *crtc_state =to_intel_crtc_state (state); -__drm_atomic_helper_crtc_destroy_state (&crtc_state->base); +__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi);kfree (crtc_state); }
@@ -319,7 +319,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, {struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; -struct drm_atomic_state *drm_state = crtc_state->base.state; +struct drm_atomic_state *drm_state = crtc_state->uapi.state;struct intel_atomic_state *state =to_intel_atomic_state (drm_state);int num_scalers_need;int i;
drivers/gpu/drm/i915/display/intel_atomic_plane.c +3 -3
@@ -268,7 +268,7 @@ void intel_update_plane(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_plane (plane, crtc_state, plane_state);
@@ -278,7 +278,7 @@ void intel_update_slave(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_slave (plane, crtc_state, plane_state);
@@ -287,7 +287,7 @@ void intel_update_slave(struct intel_plane *plane,void intel_disable_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);trace_intel_disable_plane (&plane->base, crtc); plane->disable_plane (plane, crtc_state);
drivers/gpu/drm/i915/display/intel_audio.c +4 -4
@@ -554,7 +554,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;enum port port = encoder->port;u32 tmp, eldv;
@@ -601,7 +601,7 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;enum pipe pipe = crtc->pipe;enum port port = encoder->port;
@@ -691,7 +691,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
@@ -752,7 +752,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum port port = encoder->port;enum pipe pipe = crtc->pipe;
drivers/gpu/drm/i915/display/intel_bw.c +2 -2
@@ -297,7 +297,7 @@ static unsigned int intel_bw_crtc_num_active_planes(const struct intel_crtc_statstatic unsigned int intel_bw_crtc_data_rate (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);unsigned int data_rate =0 ;enum plane_id plane_id;
@@ -318,7 +318,7 @@ static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_void intel_bw_crtc_update (struct intel_bw_state *bw_state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); bw_state->data_rate[crtc->pipe] =intel_bw_crtc_data_rate (crtc_state);
drivers/gpu/drm/i915/display/intel_cdclk.c +5 -5
@@ -1902,7 +1902,7 @@ intel_set_cdclk_post_plane_update(struct drm_i915_private *dev_priv,static int intel_pixel_rate_to_cdclk (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);int pixel_rate = crtc_state->pixel_rate;if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv))
@@ -1921,7 +1921,7 @@ static int intel_pixel_rate_to_cdclk(const struct intel_crtc_state *crtc_state)int intel_crtc_compute_min_cdclk (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);int min_cdclk;if (!crtc_state->hw.enable)
@@ -2261,10 +2261,10 @@ static int intel_modeset_all_pipes(struct intel_atomic_state *state)return PTR_ERR (crtc_state);if (!crtc_state->hw.active || -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +drm_atomic_crtc_needs_modeset (&crtc_state->uapi))continue ; - crtc_state->base.mode_changed = true; + crtc_state->uapi.mode_changed = true; ret =drm_atomic_add_affected_connectors (&state->base, &crtc->base);
@@ -2330,7 +2330,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) crtc =intel_get_crtc_for_pipe (dev_priv, pipe); crtc_state =intel_atomic_get_new_crtc_state (state, crtc);if (crtc_state && -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +drm_atomic_crtc_needs_modeset (&crtc_state->uapi)) pipe =INVALID_PIPE ; }else { pipe =INVALID_PIPE ;
drivers/gpu/drm/i915/display/intel_color.c +35 -35
275 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_crt.c +3 -3
@@ -161,7 +161,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa;
@@ -271,7 +271,7 @@ static void hsw_pre_enable_crt(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);
@@ -288,7 +288,7 @@ static void hsw_enable_crt(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);
drivers/gpu/drm/i915/display/intel_ddi.c +16 -16
@@ -1744,7 +1744,7 @@ static void intel_ddi_clock_get(struct intel_encoder *encoder,void intel_ddi_set_dp_msa (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1806,7 +1806,7 @@ void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state,void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1828,7 +1828,7 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,static u32 intel_ddi_transcoder_func_reg_val_get (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;
@@ -1915,7 +1915,7 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)void intel_ddi_enable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1931,7 +1931,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)static void intel_ddi_config_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1943,7 +1943,7 @@ intel_ddi_config_transcoder_func(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t reg =TRANS_DDI_FUNC_CTL (cpu_transcoder);
@@ -2241,7 +2241,7 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,void intel_ddi_enable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);enum port port = encoder->port;
@@ -2259,7 +2259,7 @@ void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;if (cpu_transcoder !=TRANSCODER_EDP ) {
@@ -3337,7 +3337,7 @@ static void intel_ddi_disable_fec_state(struct intel_encoder *encoder,static void tgl_clear_psr2_transcoder_exitline (const struct intel_crtc_state *cstate) { -struct drm_i915_private *dev_priv =to_i915 (cstate->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (cstate->uapi.crtc->dev);u32 val;if (!cstate->dc3co_exitline)
@@ -3352,7 +3352,7 @@ static void tgl_set_psr2_transcoder_exitline(const struct intel_crtc_state *cstate) {u32 val, exit_scanlines; -struct drm_i915_private *dev_priv =to_i915 (cstate->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (cstate->uapi.crtc->dev);if (!cstate->dc3co_exitline)return ;
@@ -3370,7 +3370,7 @@ static void tgl_dc3co_exitline_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *cstate) {u32 exit_scanlines; -struct drm_i915_private *dev_priv =to_i915 (cstate->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (cstate->uapi.crtc->dev);u32 crtc_vdisplay = cstate->hw.adjusted_mode.crtc_vdisplay; cstate->dc3co_exitline =0 ;
@@ -3379,7 +3379,7 @@ static void tgl_dc3co_exitline_compute_config(struct intel_encoder *encoder,return ;/* B.Specs:49196 DC3CO only works with pipeA and DDIA.*/ -if (to_intel_crtc (cstate->base.crtc)->pipe !=PIPE_A || +if (to_intel_crtc (cstate->uapi.crtc)->pipe !=PIPE_A || encoder->port !=PORT_A )return ;
@@ -3403,7 +3403,7 @@ static void tgl_dc3co_exitline_compute_config(struct intel_encoder *encoder,static void tgl_dc3co_exitline_get_config (struct intel_crtc_state *crtc_state) {u32 val; -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (INTEL_GEN (dev_priv) <12 )return ;
@@ -3651,7 +3651,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;
@@ -4208,7 +4208,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 temp, flags =0 ;
@@ -4375,7 +4375,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = encoder->port;int ret;
drivers/gpu/drm/i915/display/intel_display.c +129 -128
926 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp.c +10 -10
@@ -2244,7 +2244,7 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);int ret; if (!drm_mode_is_420_only(info, adjusted_mode) ||
@@ -2309,7 +2309,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_lspcon *lspcon =enc_to_intel_lspcon (&encoder->base);enum port port = encoder->port; -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_connector *intel_connector = intel_dp->attached_connector;struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);
@@ -2427,7 +2427,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port = encoder->port; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; intel_dp_set_link_params(intel_dp, pipe_config->port_clock,
@@ -3025,7 +3025,7 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)static void ironlake_edp_pll_on (struct intel_dp *intel_dp,const struct intel_crtc_state *pipe_config) { -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);
@@ -3065,7 +3065,7 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,static void ironlake_edp_pll_off (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);
@@ -3225,7 +3225,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ;enum port port = encoder->port; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);if (encoder->type ==INTEL_OUTPUT_EDP ) pipe_config->output_types |=BIT (INTEL_OUTPUT_EDP );
@@ -3492,7 +3492,7 @@ static void intel_enable_dp(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);u32 dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;intel_wakeref_t wakeref;
@@ -3625,7 +3625,7 @@ static void vlv_init_panel_power_sequencer(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);lockdep_assert_held (&dev_priv->pps_mutex);
@@ -4147,7 +4147,7 @@ intel_dp_link_down(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum port port = encoder->port;u32 DP = intel_dp->DP;
@@ -6899,7 +6899,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, int refresh_rate) {struct intel_dp *intel_dp = dev_priv->drrs.dp; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);enum drrs_refresh_rate_type index =DRRS_HIGH_RR ;if (refresh_rate <=0 ) {
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -2
@@ -42,7 +42,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,struct drm_connector_state *conn_state, struct link_config_limits *limits) { - struct drm_atomic_state *state = crtc_state->base.state; + struct drm_atomic_state *state = crtc_state->uapi.state;struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_dp *intel_dp = &intel_mst->primary->dp; struct intel_connector *connector =
@@ -190,7 +190,7 @@ intel_dp_mst_atomic_check(struct drm_connector *connector, intel_crtc);if (!crtc_state || - !drm_atomic_crtc_needs_modeset (&crtc_state->base) || + !drm_atomic_crtc_needs_modeset (&crtc_state->uapi) || crtc_state->hw.enable)return 0 ; }
drivers/gpu/drm/i915/display/intel_dpio_phy.c +7 -7
@@ -739,7 +739,7 @@ void chv_data_lane_soft_reset(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum dpio_channel ch =vlv_dport_to_channel (enc_to_dig_port (&encoder->base)); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;u32 val;
@@ -783,7 +783,7 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe; unsigned int lane_mask =
@@ -864,7 +864,7 @@ void chv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;int data, i, stagger;
@@ -953,7 +953,7 @@ void chv_phy_post_pll_disable(struct intel_encoder *encoder, const struct intel_crtc_state *old_crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum pipe pipe =to_intel_crtc (old_crtc_state->base.crtc)->pipe; +enum pipe pipe =to_intel_crtc (old_crtc_state->uapi.crtc)->pipe;u32 val;vlv_dpio_get (dev_priv);
@@ -1016,7 +1016,7 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;
@@ -1046,7 +1046,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;u32 val;
@@ -1075,7 +1075,7 @@ void vlv_phy_reset_lanes(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +10 -10
@@ -136,7 +136,7 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,*/ void intel_prepare_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;
@@ -163,7 +163,7 @@ void intel_prepare_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_enable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);
@@ -208,7 +208,7 @@ void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_disable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);
@@ -827,7 +827,7 @@ hsw_ddi_hdmi_get_dpll(struct intel_atomic_state *state,static struct intel_shared_dpll *hsw_ddi_dp_get_dpll (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_shared_dpll *pll;enum intel_dpll_id pll_id;int clock = crtc_state->port_clock;
@@ -1736,7 +1736,7 @@ static bool bxt_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state, struct bxt_clk_div *clk_div) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct dpll best_clock;/* Calculate HDMI div */
@@ -2259,7 +2259,7 @@ static bool cnl_ddi_calculate_wrpll(struct intel_crtc_state *crtc_state, struct skl_wrpll_params *wrpll_params) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 afe_clock = crtc_state->port_clock *5 ;u32 ref_clock;u32 dco_min =7998000 ;
@@ -2538,7 +2538,7 @@ static const struct skl_wrpll_params tgl_tbt_pll_24MHz_values = {static bool icl_calc_dp_combo_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);const struct icl_combo_pll_params *params = dev_priv->cdclk.hw.ref ==24000 ? icl_dp_combo_pll_24MHz_values :
@@ -2560,7 +2560,7 @@ static bool icl_calc_dp_combo_pll(struct intel_crtc_state *crtc_state,static bool icl_calc_tbt_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (INTEL_GEN (dev_priv) >=12 ) {switch (dev_priv->cdclk.hw.ref) {
@@ -2597,7 +2597,7 @@ static bool icl_calc_dpll_state(struct intel_crtc_state *crtc_state,struct intel_encoder *encoder, struct intel_dpll_hw_state *pll_state) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 cfgcr0, cfgcr1;struct skl_wrpll_params pll_params = {0 };bool ret;
@@ -2729,7 +2729,7 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,static bool icl_calc_mg_pll_state (struct intel_crtc_state *crtc_state,struct intel_dpll_hw_state *pll_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);int refclk_khz = dev_priv->cdclk.hw.ref;int clock = crtc_state->port_clock;u32 dco_khz, m1div, m2div_int, m2div_rem, m2div_frac;
drivers/gpu/drm/i915/display/intel_dvo.c +1 -1
@@ -277,7 +277,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);enum pipe pipe = crtc->pipe;
drivers/gpu/drm/i915/display/intel_hdmi.c +22 -22
170 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_lvds.c +2 -2
@@ -230,7 +230,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder, {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;enum pipe pipe = crtc->pipe;u32 temp;
@@ -393,7 +393,7 @@ static int intel_lvds_compute_config(struct intel_encoder *intel_encoder,struct intel_connector *intel_connector = lvds_encoder->attached_connector;struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);unsigned int lvds_bpp;/* Should never happen!! */
drivers/gpu/drm/i915/display/intel_panel.c +3 -3
@@ -1047,7 +1047,7 @@ static void vlv_enable_backlight(const struct intel_crtc_state *crtc_state,struct intel_connector *connector =to_intel_connector (conn_state->connector);struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -enum pipe pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; +enum pipe pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe;u32 ctl, ctl2; ctl2 =I915_READ (VLV_BLC_PWM_CTL2 (pipe));
@@ -1077,7 +1077,7 @@ static void bxt_enable_backlight(const struct intel_crtc_state *crtc_state,struct intel_connector *connector =to_intel_connector (conn_state->connector);struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -enum pipe pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; +enum pipe pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe;u32 pwm_ctl, val;/* Controller 1 uses the utility pin. */
@@ -1189,7 +1189,7 @@ void intel_panel_enable_backlight(const struct intel_crtc_state *crtc_state,struct intel_connector *connector =to_intel_connector (conn_state->connector);struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -enum pipe pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; +enum pipe pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe;if (!panel->backlight.present)return ;
drivers/gpu/drm/i915/display/intel_pipe_crc.c +2 -2
@@ -309,13 +309,13 @@ intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable) goto put_state; } - pipe_config->base.mode_changed = pipe_config->has_psr; + pipe_config->uapi.mode_changed = pipe_config->has_psr; pipe_config->crc_enabled = enable;if (IS_HASWELL (dev_priv) && pipe_config->hw.active && crtc->pipe ==PIPE_A && pipe_config->cpu_transcoder ==TRANSCODER_EDP ) - pipe_config->base.mode_changed = true; + pipe_config->uapi.mode_changed = true; ret =drm_atomic_commit (state);
drivers/gpu/drm/i915/display/intel_psr.c +3 -3
@@ -813,7 +813,7 @@ static void intel_psr_enable_locked(struct drm_i915_private *dev_priv, dev_priv->psr.psr2_enabled =intel_psr2_enabled (dev_priv, crtc_state); dev_priv->psr.busy_frontbuffer_bits =0 ; - dev_priv->psr.pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; + dev_priv->psr.pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe; dev_priv->psr.dc3co_enabled = !!crtc_state->dc3co_exitline; dev_priv->psr.dc3co_exit_delay =intel_get_frame_time_us (crtc_state); dev_priv->psr.transcoder = crtc_state->cpu_transcoder;
@@ -1060,7 +1060,7 @@ void intel_psr_update(struct intel_dp *intel_dp,int intel_psr_wait_for_idle (const struct intel_crtc_state *new_crtc_state,u32 *out_value) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!dev_priv->psr.enabled || !new_crtc_state->has_psr)
@@ -1139,7 +1139,7 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv)if (crtc_state->hw.active && crtc_state->has_psr) {/* Mark mode as changed to trigger a pipe->update() */ - crtc_state->base.mode_changed = true; + crtc_state->uapi.mode_changed = true;break ; } }
drivers/gpu/drm/i915/display/intel_sdvo.c +3 -3
@@ -1429,7 +1429,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder, const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;const struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state (conn_state);
@@ -1723,7 +1723,7 @@ static void intel_disable_sdvo(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_sdvo *intel_sdvo =to_sdvo (encoder); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);u32 temp;if (old_crtc_state->has_audio)
@@ -1785,7 +1785,7 @@ static void intel_enable_sdvo(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_sdvo *intel_sdvo =to_sdvo (encoder); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);u32 temp;bool input1, input2;int i;
drivers/gpu/drm/i915/display/intel_sprite.c +9 -8
@@ -81,7 +81,7 @@ int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,*/ void intel_pipe_update_start (const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);const struct drm_display_mode *adjusted_mode = &new_crtc_state->hw.adjusted_mode;long timeout =msecs_to_jiffies_timeout (1 );
@@ -190,7 +190,7 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state)*/ void intel_pipe_update_end (struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;int scanline_end =intel_get_crtc_scanline (crtc);u32 end_vbl_count =intel_crtc_get_vblank_counter (crtc);
@@ -203,14 +203,15 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)* Would be slightly nice to just grab the vblank count and arm the * event outside of the critical section - the spinlock might spin for a * while ... */ -if (new_crtc_state->base.event) { +if (new_crtc_state->uapi.event) {WARN_ON (drm_crtc_vblank_get (&crtc->base) !=0 );spin_lock (&crtc->base.dev->event_lock); -drm_crtc_arm_vblank_event (&crtc->base, new_crtc_state->base.event); +drm_crtc_arm_vblank_event (&crtc->base, + new_crtc_state->uapi.event);spin_unlock (&crtc->base.dev->event_lock); - new_crtc_state->base.event =NULL ; + new_crtc_state->uapi.event =NULL ; }local_irq_enable ();
@@ -1586,7 +1587,7 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state, } ret =drm_atomic_helper_check_plane_state (&plane_state->base, - &crtc_state->base, + &crtc_state->uapi, min_scale, max_scale, true, true);if (ret)
@@ -1643,7 +1644,7 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state,return ret; ret =drm_atomic_helper_check_plane_state (&plane_state->base, - &crtc_state->base, + &crtc_state->uapi,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , true, true);
@@ -1808,7 +1809,7 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state, } ret =drm_atomic_helper_check_plane_state (&plane_state->base, - &crtc_state->base, + &crtc_state->uapi, min_scale, max_scale, true, true);if (ret)
drivers/gpu/drm/i915/display/intel_tv.c +2 -2
@@ -924,7 +924,7 @@ intel_enable_tv(struct intel_encoder *encoder,/* Prevents vblank waits from timing out in intel_tv_detect_type() */ intel_wait_for_vblank (dev_priv, -to_intel_crtc (pipe_config->base.crtc)->pipe); +to_intel_crtc (pipe_config->uapi.crtc)->pipe);I915_WRITE (TV_CTL ,I915_READ (TV_CTL ) |TV_ENC_ENABLE ); }
@@ -1417,7 +1417,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_tv *intel_tv =enc_to_tv (encoder);const struct intel_tv_connector_state *tv_conn_state =to_intel_tv_connector_state (conn_state);
drivers/gpu/drm/i915/display/intel_vdsc.c +4 -4
@@ -459,7 +459,7 @@ int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,enum intel_display_power_domain intel_dsc_power_domain (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *i915 =to_i915 (crtc_state->uapi.crtc->dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;/*
@@ -483,7 +483,7 @@ intel_dsc_power_domain(const struct intel_crtc_state *crtc_state)static void intel_configure_pps_for_dsc_encoder (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);const struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config;enum pipe pipe = crtc->pipe;
@@ -902,7 +902,7 @@ static void intel_dp_write_dsc_pps_sdp(struct intel_encoder *encoder,void intel_dsc_enable (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum pipe pipe = crtc->pipe;i915_reg_t dss_ctl1_reg, dss_ctl2_reg;
@@ -938,7 +938,7 @@ void intel_dsc_enable(struct intel_encoder *encoder,void intel_dsc_disable (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;i915_reg_t dss_ctl1_reg, dss_ctl2_reg;
drivers/gpu/drm/i915/display/vlv_dsi.c +5 -5
@@ -261,7 +261,7 @@ static int intel_dsi_compute_config(struct intel_encoder *encoder, struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int ret;
@@ -624,7 +624,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);enum port port;
@@ -746,7 +746,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;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;
@@ -1034,7 +1034,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct drm_display_mode *adjusted_mode_sw; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);unsigned int lane_count = intel_dsi->lane_count;unsigned int bpp, fmt;
@@ -1315,7 +1315,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,struct drm_encoder *encoder = &intel_encoder->base;struct drm_device *dev = encoder->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;enum port port;
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
@@ -4160,7 +4160,7 @@ static int i915_drrs_ctl_set(void *data, u64 val) !crtc_state->has_drrs) goto out; - commit = crtc_state->base.commit; + commit = crtc_state->uapi.commit;if (commit) { ret =wait_for_completion_interruptible (&commit->hw_done);if (ret)
@@ -4172,7 +4172,7 @@ static int i915_drrs_ctl_set(void *data, u64 val)struct intel_encoder *encoder;struct intel_dp *intel_dp; -if (!(crtc_state->base.connector_mask & +if (!(crtc_state->uapi.connector_mask &drm_connector_mask (connector)))continue ;
@@ -4231,7 +4231,7 @@ i915_fifo_underrun_reset_write(struct file *filp,return ret; crtc_state =to_intel_crtc_state (intel_crtc->base.state); - commit = crtc_state->base.commit; + commit = crtc_state->uapi.commit;if (commit) { ret =wait_for_completion_interruptible (&commit->hw_done);if (!ret)
drivers/gpu/drm/i915/intel_pm.c +56 -56
368 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/14 drm/i915: Complete crtc hw/uapi split, v3.
In reply to Maarten LankhorstNow that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc atomic_check(), right before color management is checked.
Changes since v1:
- Copy all blobs immediately after drm_atomic_helper_check_modeset().
- Clear crtc_state->hw on disable, instead of using clear_intel_crtc_state(). Changes since v2:
- Use intel_crtc_free_hw_state + clear in intel_crtc_disable_noatomic().
- Make a intel_crtc_prepare_state() function that clears the crtc_state and copies hw members.
- Remove setting uapi.adjusted_mode, we now have a direct call to drm_calc_timestamping_constants().
--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 56 +++++++++++++++---- .../drm/i915/display/intel_display_types.h | 9 +-- 4 files changed, 95 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +44 -0
@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;
@@ -208,6 +216,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut); +drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc
@@ -223,6 +266,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }
drivers/gpu/drm/i915/display/intel_atomic.h +2 -0
@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);
drivers/gpu/drm/i915/display/intel_display.c +44 -12
126 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_types.h +5 -4
@@ -749,8 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union { -struct drm_crtc_state base;/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping:
@@ -773,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/14] drm/i915: Complete crtc hw/uapi split, v3.
Quoted 51 lines · Maarten Lankhorst
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Changes since v1:
- Copy all blobs immediately afterdrm_atomic_helper_check_modeset().
- Clearcrtc_state->hwon disable, instead of usingclear_intel_crtc_state(). Changes since v2:
- Useintel_crtc_free_hw_state+ clear inintel_crtc_disable_noatomic().
- Make aintel_crtc_prepare_state()function that clears thecrtc_stateand copies hw members.
- Remove setting uapi.adjusted_mode, we now have a direct call todrm_calc_timestamping_constants().Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 56 +++++++++++++++---- .../drm/i915/display/intel_display_types.h | 9 +-- 4 files changed, 95 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +11
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -208,6 +216,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut);
drivers/gpu/drm/i915/display/intel_atomic.c intel_crtc_duplicate_state(struct drm_crtc *crtc) · line 231
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_atomic.c +10
-0+drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state)
This is only used in intel_display.c so should perhaps live there?
Quoted 69 lines
drivers/gpu/drm/i915/display/intel_atomic.c +23
-0+{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -223,6 +266,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +8
-0@@ -7110,6 +7110,8 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +intel_crtc_free_hw_state (crtc_state); +memset (&crtc_state->hw,0 ,sizeof (crtc_state->hw));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -12482,22 +12484,50 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void +intel_crtc_copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode;
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12502
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+ crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +intel_crtc_copy_color_blobs (crtc_state); +} + +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode;
Why are we not copying the color blobs?
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12506
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-1+} +static int -clear_intel_crtc_state (struct intel_crtc_state *crtc_state) +intel_crtc_prepare_state (struct intel_crtc_state *crtc_state)
Hmm. I was hoping we could make this even simpler, but maybe I'm a bit naive. I guess we really do need to consider needs_modeset() so as to not clobber the already computed hw state when we're not going to take the full .compute_config() path.
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12513
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0{struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_crtc_state *saved_state; +if (!needs_modeset (crtc_state)) { +/* Only need to update crtc_state->hw color blobs */
That comment is likely to get out of date. Not sure how to word it in a nice way though. Essentially we just want to copy the part of the state that doesn't clobber anything set up by .compute_config() & co.
It would be nice if we had the same level of abstraction for this case as for the full modeset case. Eg. intel_crtc_copy_hw_state_non_modeset() or something. A bit ugly that name though. Might have think of something better.
Another thing that's a bit confusing is that we need to do the intel_crtc_free_hw_state() for the full modeset path, but we don't need it for the non-modeset path. Would be nice it the two paths behaved more uniformly.
Quoted 60 lines
drivers/gpu/drm/i915/display/intel_display.c +14
-11+intel_crtc_copy_color_blobs (crtc_state); +return 0 ; + } + saved_state =kzalloc (sizeof (*saved_state),GFP_KERNEL );if (!saved_state)return -ENOMEM ; +/* free the old crtc_state->hw members */ +intel_crtc_free_hw_state (crtc_state); +/* FIXME: before the switch to atomic started, a new pipe_config was * kzalloc'd. Code that depends on any field being zero should be * fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12515,14 +12545,11 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) saved_state->sync_mode_slaves_mask = crtc_state->sync_mode_slaves_mask; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , base)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); - +memcpy (crtc_state, saved_state,sizeof (*crtc_state));kfree (saved_state); + +intel_crtc_copy_uapi_to_hw_state (crtc_state); +return 0 ; }@@ -12538,10 +12565,6 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)int i;bool retry = true; - ret =clear_intel_crtc_state (pipe_config); -if (ret) -return ret; - pipe_config->cpu_transcoder = (enum transcoder )to_intel_crtc (crtc)->pipe;@@ -13361,6 +13384,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 13853
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0@@ -13823,6 +13848,10 @@ static int intel_atomic_check(struct drm_device *dev,for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { + ret =intel_crtc_prepare_state (new_crtc_state); +if (ret) +return ret;
I have a feeling this should be its own loop in case we need to insert global stuff after this.
For example, I think the port sync stuff should be there but I can't see it now. Ah, for some reason it's buried deep inside intel_modeset_pipe_config() which seems wrong. If any (or at least the master) of the genlocked pipes does a full modeset we need to do a full modeset on all of them, which should also mean a full .compute_config() on everything.
Hmm. And if we do that then combining the uapi->hw copy and clear_intel_crtc_state() like this is not going to work.
Quoted 62 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0+if (!needs_modeset (new_crtc_state))continue ;@@ -17099,6 +17128,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);@@ -17227,6 +17257,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)* set a flag to indicate that a full recalculation is * needed on the next commit. */ + crtc_state->hw.mode = crtc->base.mode; crtc_state->hw.mode.private_flags =I915_MODE_FLAG_INHERITED ;intel_crtc_compute_pixel_rate (crtc_state);@@ -17257,6 +17288,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }drivers/gpu/drm/i915/display/intel_display_types.h +5
-4@@ -749,8 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union { -struct drm_crtc_state base;/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping: @@ -773,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/14] drm/i915: Complete crtc hw/uapi split, v3.
Op 24-10-2019 om 17:21 schreef Ville Syrjälä:
Quoted 136 lines · Maarten Lankhorst
Quoted 51 lines
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Changes since v1:
- Copy all blobs immediately afterdrm_atomic_helper_check_modeset().
- Clearcrtc_state->hwon disable, instead of usingclear_intel_crtc_state(). Changes since v2:
- Useintel_crtc_free_hw_state+ clear inintel_crtc_disable_noatomic().
- Make aintel_crtc_prepare_state()function that clears thecrtc_stateand copies hw members.
- Remove setting uapi.adjusted_mode, we now have a direct call todrm_calc_timestamping_constants().Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 56 +++++++++++++++---- .../drm/i915/display/intel_display_types.h | 9 +-- 4 files changed, 95 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +11
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -208,6 +216,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut);drivers/gpu/drm/i915/display/intel_atomic.c intel_crtc_duplicate_state(struct drm_crtc *crtc) · line 231
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_atomic.c +10
-0+drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state)This is only used in
intel_display.cso should perhaps live there?Quoted 72 lines
drivers/gpu/drm/i915/display/intel_atomic.c +23
-0+{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -223,6 +266,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +11
-0@@ -7110,6 +7110,8 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +intel_crtc_free_hw_state (crtc_state); +memset (&crtc_state->hw,0 ,sizeof (crtc_state->hw));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -12482,22 +12484,50 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void +intel_crtc_copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +intel_crtc_copy_color_blobs (crtc_state); +}
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12502
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +7
-0+ +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode;Why are we not copying the color blobs?
Hmm, we probably should at least copy the gamma blob, but probably all. :)
Missed that because this patch lingered on the ml for so long we added hw readout in the mean time.
Quoted 27 lines
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12506
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-1+} +static int -clear_intel_crtc_state (struct intel_crtc_state *crtc_state) +intel_crtc_prepare_state (struct intel_crtc_state *crtc_state)Hmm. I was hoping we could make this even simpler, but maybe I'm a bit naive. I guess we really do need to consider
needs_modeset()so as to not clobber the already computed hw state when we're not going to take the full .compute_config() path.drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12513
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0{struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_crtc_state *saved_state; +if (!needs_modeset (crtc_state)) { +/* Only need to update crtc_state->hw color blobs */ That comment is likely to get out of date. Not sure how to word it in a nice way though. Essentially we just want to copy the part of the state that doesn't clobber anything set up by .compute_config() & co.
It would be nice if we had the same level of abstraction for this case as for the full modeset case. Eg.
intel_crtc_copy_hw_state_non_modeset()or something. A bit ugly that name though. Might have think of something better.
Quoted 4 lines
Another thing that's a bit confusing is that we need to do the
intel_crtc_free_hw_state()for the full modeset path, but we don't need it for the non-modeset path. Would be nice it the two paths behaved more uniformly.
We'd have to get rid of the crtc_state clearing for that. :(
Quoted 76 lines
Quoted 60 lines
drivers/gpu/drm/i915/display/intel_display.c +14
-11+intel_crtc_copy_color_blobs (crtc_state); +return 0 ; + } + saved_state =kzalloc (sizeof (*saved_state),GFP_KERNEL );if (!saved_state)return -ENOMEM ; +/* free the old crtc_state->hw members */ +intel_crtc_free_hw_state (crtc_state); +/* FIXME: before the switch to atomic started, a new pipe_config was * kzalloc'd. Code that depends on any field being zero should be * fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12515,14 +12545,11 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) saved_state->sync_mode_slaves_mask = crtc_state->sync_mode_slaves_mask; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , base)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); - +memcpy (crtc_state, saved_state,sizeof (*crtc_state));kfree (saved_state); + +intel_crtc_copy_uapi_to_hw_state (crtc_state); +return 0 ; }@@ -12538,10 +12565,6 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)int i;bool retry = true; - ret =clear_intel_crtc_state (pipe_config); -if (ret) -return ret; - pipe_config->cpu_transcoder = (enum transcoder )to_intel_crtc (crtc)->pipe;@@ -13361,6 +13384,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 13853
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0@@ -13823,6 +13848,10 @@ static int intel_atomic_check(struct drm_device *dev,for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { + ret =intel_crtc_prepare_state (new_crtc_state); +if (ret) +return ret;I have a feeling this should be its own loop in case we need to insert global stuff after this.
For example, I think the port sync stuff should be there but I can't see it now. Ah, for some reason it's buried deep inside
intel_modeset_pipe_config()which seems wrong. If any (or at least the master) of the genlocked pipes does a full modeset we need to do a full modeset on all of them, which should also mean a full .compute_config() on everything.
Quoted 2 lines
Hmm. And if we do that then combining the
uapi->hwcopy andclear_intel_crtc_state()like this is not going to work.
Genlock would be messy either way, with fastset vs modeset. It would need its own second loop to handle correctly.
Quoted 59 lines
Quoted 59 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0+if (!needs_modeset (new_crtc_state))continue ;@@ -17099,6 +17128,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);@@ -17227,6 +17257,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)* set a flag to indicate that a full recalculation is * needed on the next commit. */ + crtc_state->hw.mode = crtc->base.mode; crtc_state->hw.mode.private_flags =I915_MODE_FLAG_INHERITED ;intel_crtc_compute_pixel_rate (crtc_state);@@ -17257,6 +17288,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }drivers/gpu/drm/i915/display/intel_display_types.h +5
-4@@ -749,8 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union { -struct drm_crtc_state base;/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping: @@ -773,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks Signature · 1 line
2.23.0
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/14] drm/i915: Complete crtc hw/uapi split, v3.
Quoted 177 lines · Maarten Lankhorst
Op 24-10-2019 om 17:21 schreef Ville Syrjälä:
Quoted 136 lines · Maarten Lankhorst
Quoted 51 lines
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Changes since v1:
- Copy all blobs immediately afterdrm_atomic_helper_check_modeset().
- Clearcrtc_state->hwon disable, instead of usingclear_intel_crtc_state(). Changes since v2:
- Useintel_crtc_free_hw_state+ clear inintel_crtc_disable_noatomic().
- Make aintel_crtc_prepare_state()function that clears thecrtc_stateand copies hw members.
- Remove setting uapi.adjusted_mode, we now have a direct call todrm_calc_timestamping_constants().Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 56 +++++++++++++++---- .../drm/i915/display/intel_display_types.h | 9 +-- 4 files changed, 95 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +11
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -208,6 +216,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut);drivers/gpu/drm/i915/display/intel_atomic.c intel_crtc_duplicate_state(struct drm_crtc *crtc) · line 231
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_atomic.c +10
-0+drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state)This is only used in
intel_display.cso should perhaps live there?Quoted 72 lines
drivers/gpu/drm/i915/display/intel_atomic.c +23
-0+{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -223,6 +266,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +11
-0@@ -7110,6 +7110,8 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +intel_crtc_free_hw_state (crtc_state); +memset (&crtc_state->hw,0 ,sizeof (crtc_state->hw));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -12482,22 +12484,50 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void +intel_crtc_copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +intel_crtc_copy_color_blobs (crtc_state); +}Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12502
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +7
-0+ +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode;Why are we not copying the color blobs?
Hmm, we probably should at least copy the gamma blob, but probably all. :)
Missed that because this patch lingered on the ml for so long we added hw readout in the mean time.
Quoted 27 lines
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12506
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-1+} +static int -clear_intel_crtc_state (struct intel_crtc_state *crtc_state) +intel_crtc_prepare_state (struct intel_crtc_state *crtc_state)Hmm. I was hoping we could make this even simpler, but maybe I'm a bit naive. I guess we really do need to consider
needs_modeset()so as to not clobber the already computed hw state when we're not going to take the full .compute_config() path.drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12513
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0{struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_crtc_state *saved_state; +if (!needs_modeset (crtc_state)) { +/* Only need to update crtc_state->hw color blobs */ That comment is likely to get out of date. Not sure how to word it in a nice way though. Essentially we just want to copy the part of the state that doesn't clobber anything set up by .compute_config() & co.
It would be nice if we had the same level of abstraction for this case as for the full modeset case. Eg.
intel_crtc_copy_hw_state_non_modeset()or something. A bit ugly that name though. Might have think of something better.
Quoted 5 lines
Quoted 4 lines
Another thing that's a bit confusing is that we need to do the
intel_crtc_free_hw_state()for the full modeset path, but we don't need it for the non-modeset path. Would be nice it the two paths behaved more uniformly.We'd have to get rid of the
crtc_stateclearing for that. :(
I was just thinking we'd have something like:crtc_state_free_lite() + crtc_state_copy_lite()
andcrtc_state_free_full() + crtc_state_copy_full()
With better names probably :)
Then both paths would do the same kind of free+copy and the reader wouldn't have to wonder why they look so different.
Quoted 76 lines
Quoted 76 lines
Quoted 60 lines
drivers/gpu/drm/i915/display/intel_display.c +14
-11+intel_crtc_copy_color_blobs (crtc_state); +return 0 ; + } + saved_state =kzalloc (sizeof (*saved_state),GFP_KERNEL );if (!saved_state)return -ENOMEM ; +/* free the old crtc_state->hw members */ +intel_crtc_free_hw_state (crtc_state); +/* FIXME: before the switch to atomic started, a new pipe_config was * kzalloc'd. Code that depends on any field being zero should be * fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12515,14 +12545,11 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) saved_state->sync_mode_slaves_mask = crtc_state->sync_mode_slaves_mask; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , base)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); - +memcpy (crtc_state, saved_state,sizeof (*crtc_state));kfree (saved_state); + +intel_crtc_copy_uapi_to_hw_state (crtc_state); +return 0 ; }@@ -12538,10 +12565,6 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)int i;bool retry = true; - ret =clear_intel_crtc_state (pipe_config); -if (ret) -return ret; - pipe_config->cpu_transcoder = (enum transcoder )to_intel_crtc (crtc)->pipe;@@ -13361,6 +13384,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 13853
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0@@ -13823,6 +13848,10 @@ static int intel_atomic_check(struct drm_device *dev,for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { + ret =intel_crtc_prepare_state (new_crtc_state); +if (ret) +return ret;I have a feeling this should be its own loop in case we need to insert global stuff after this.
For example, I think the port sync stuff should be there but I can't see it now. Ah, for some reason it's buried deep inside
intel_modeset_pipe_config()which seems wrong. If any (or at least the master) of the genlocked pipes does a full modeset we need to do a full modeset on all of them, which should also mean a full .compute_config() on everything.
Quoted 3 lines
Quoted 2 lines
Hmm. And if we do that then combining the
uapi->hwcopy andclear_intel_crtc_state()like this is not going to work.Genlock would be messy either way, with fastset vs modeset. It would need its own second loop to handle correctly.
Hmm. Yeah, this fastset vs. port sync is particularly troublesome because we now copy some state back from the old state.
Not really sure what to do about that other than:
a) don't do fastset with port sync (would be a shame)
b) redo .compute_config() for all tiles if at least one of them still insists on a full modeset after all have gone through the fastset check (a bit yucky)
c) copy even more state to make sure it's all totally consistent (should really do this anyway), and then just force a modeset on all tiles if one needs it but without redoing any .compute_config() stuff (ie. do the modeset with the fastset adjusted state)
I maybe like c) best. b) would perhaps allow us to not do any port sync things before the .compute_config() loop since we'd redo it anyway if anything affected neds a modeset. But having a retry loop would be a little annoying. Although we're going to need some kind of retry loop for eg. MST bandwidth vs. bpc stuff anyway.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/14] drm/i915: Complete crtc hw/uapi split, v3.
Op 25-10-2019 om 12:13 schreef Ville Syrjälä:
Quoted 284 lines · Maarten Lankhorst
Quoted 175 lines
Op 24-10-2019 om 17:21 schreef Ville Syrjälä:
Quoted 136 lines · Maarten Lankhorst
Quoted 51 lines
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Changes since v1:
- Copy all blobs immediately afterdrm_atomic_helper_check_modeset().
- Clearcrtc_state->hwon disable, instead of usingclear_intel_crtc_state(). Changes since v2:
- Useintel_crtc_free_hw_state+ clear inintel_crtc_disable_noatomic().
- Make aintel_crtc_prepare_state()function that clears thecrtc_stateand copies hw members.
- Remove setting uapi.adjusted_mode, we now have a direct call todrm_calc_timestamping_constants().Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 56 +++++++++++++++---- .../drm/i915/display/intel_display_types.h | 9 +-- 4 files changed, 95 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +11
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -208,6 +216,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut);drivers/gpu/drm/i915/display/intel_atomic.c intel_crtc_duplicate_state(struct drm_crtc *crtc) · line 231
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_atomic.c +10
-0+drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state)This is only used in
intel_display.cso should perhaps live there?Quoted 72 lines
drivers/gpu/drm/i915/display/intel_atomic.c +23
-0+{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -223,6 +266,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +11
-0@@ -7110,6 +7110,8 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +intel_crtc_free_hw_state (crtc_state); +memset (&crtc_state->hw,0 ,sizeof (crtc_state->hw));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -12482,22 +12484,50 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void +intel_crtc_copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +intel_crtc_copy_color_blobs (crtc_state); +}Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12502
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +7
-0+ +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode;Why are we not copying the color blobs?
Hmm, we probably should at least copy the gamma blob, but probably all. :)
Missed that because this patch lingered on the ml for so long we added hw readout in the mean time.
Quoted 26 lines
drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12506
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-1+} +static int -clear_intel_crtc_state (struct intel_crtc_state *crtc_state) +intel_crtc_prepare_state (struct intel_crtc_state *crtc_state)Hmm. I was hoping we could make this even simpler, but maybe I'm a bit naive. I guess we really do need to consider
needs_modeset()so as to not clobber the already computed hw state when we're not going to take the full .compute_config() path.drivers/gpu/drm/i915/display/intel_display.c static bool check_digital_port_conflicts(struct intel_atomic_state *state) · line 12513
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0{struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_crtc_state *saved_state; +if (!needs_modeset (crtc_state)) { +/* Only need to update crtc_state->hw color blobs */ That comment is likely to get out of date. Not sure how to word it in a nice way though. Essentially we just want to copy the part of the state that doesn't clobber anything set up by .compute_config() & co.
It would be nice if we had the same level of abstraction for this case as for the full modeset case. Eg.
intel_crtc_copy_hw_state_non_modeset()or something. A bit ugly that name though. Might have think of something better.Quoted 5 lines
Quoted 4 lines
Another thing that's a bit confusing is that we need to do the
intel_crtc_free_hw_state()for the full modeset path, but we don't need it for the non-modeset path. Would be nice it the two paths behaved more uniformly.We'd have to get rid of the
crtc_stateclearing for that. :(I was just thinking we'd have something like:
crtc_state_free_lite()+crtc_state_copy_lite()
andcrtc_state_free_full()+crtc_state_copy_full()With better names probably :)
Then both paths would do the same kind of free+copy and the reader wouldn't have to wonder why they look so different.
Quoted 76 lines
Quoted 76 lines
Quoted 60 lines
drivers/gpu/drm/i915/display/intel_display.c +14
-11+intel_crtc_copy_color_blobs (crtc_state); +return 0 ; + } + saved_state =kzalloc (sizeof (*saved_state),GFP_KERNEL );if (!saved_state)return -ENOMEM ; +/* free the old crtc_state->hw members */ +intel_crtc_free_hw_state (crtc_state); +/* FIXME: before the switch to atomic started, a new pipe_config was * kzalloc'd. Code that depends on any field being zero should be * fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12515,14 +12545,11 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) saved_state->sync_mode_slaves_mask = crtc_state->sync_mode_slaves_mask; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , base)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); - +memcpy (crtc_state, saved_state,sizeof (*crtc_state));kfree (saved_state); + +intel_crtc_copy_uapi_to_hw_state (crtc_state); +return 0 ; }@@ -12538,10 +12565,6 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)int i;bool retry = true; - ret =clear_intel_crtc_state (pipe_config); -if (ret) -return ret; - pipe_config->cpu_transcoder = (enum transcoder )to_intel_crtc (crtc)->pipe;@@ -13361,6 +13384,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 13853
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0@@ -13823,6 +13848,10 @@ static int intel_atomic_check(struct drm_device *dev,for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { + ret =intel_crtc_prepare_state (new_crtc_state); +if (ret) +return ret;I have a feeling this should be its own loop in case we need to insert global stuff after this.
For example, I think the port sync stuff should be there but I can't see it now. Ah, for some reason it's buried deep inside
intel_modeset_pipe_config()which seems wrong. If any (or at least the master) of the genlocked pipes does a full modeset we need to do a full modeset on all of them, which should also mean a full .compute_config() on everything.Quoted 3 lines
Quoted 2 lines
Hmm. And if we do that then combining the
uapi->hwcopy andclear_intel_crtc_state()like this is not going to work.Genlock would be messy either way, with fastset vs modeset. It would need its own second loop to handle correctly.
Hmm. Yeah, this fastset vs. port sync is particularly troublesome because we now copy some state back from the old state.
Not really sure what to do about that other than:
a) don't do fastset with port sync (would be a shame)
b) redo .compute_config() for all tiles if at least one of them still insists on a full modeset after all have gone through the fastset check (a bit yucky)
c) copy even more state to make sure it's all totally consistent (should really do this anyway), and then just force a modeset on all tiles if one needs it but without redoing any .compute_config() stuff (ie. do the modeset with the fastset adjusted state)
Quoted 5 lines
I maybe like c) best. b) would perhaps allow us to not do any port sync things before the .compute_config() loop since we'd redo it anyway if anything affected neds a modeset. But having a retry loop would be a little annoying. Although we're going to need some kind of retry loop for eg. MST bandwidth vs. bpc stuff anyway.
Port sync should probably have its own handling in intel_modeset_checks().
I think it's best to just do a split, perhaps clean up v2 as we no longer pass BAT, and worry about fixing this mess later, else things never move forward.
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/14 drm/i915: Add aliases for uapi and hw to plane_state
In reply to Maarten LankhorstPrepare to split up hw and uapi machinally, by adding a uapi and hw alias. We will remove the base in a bit. This is a split from the original uapi/hw patch, which did it all in one go.
--- .../gpu/drm/i915/display/intel_atomic_plane.c | 16 ++++++++-------- .../gpu/drm/i915/display/intel_display_types.h | 8 ++++++-- 2 files changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +8 -8
@@ -80,22 +80,20 @@ void intel_plane_free(struct intel_plane *plane)struct drm_plane_state *intel_plane_duplicate_state (struct drm_plane *plane) { -struct drm_plane_state *state;struct intel_plane_state *intel_state; - intel_state =kmemdup (plane->state,sizeof (*intel_state),GFP_KERNEL ); + intel_state =to_intel_plane_state (plane->state); + intel_state =kmemdup (intel_state,sizeof (*intel_state),GFP_KERNEL );if (!intel_state)return NULL ; - state = &intel_state->base; - -__drm_atomic_helper_plane_duplicate_state (plane, state); +__drm_atomic_helper_plane_duplicate_state (plane, &intel_state->base); intel_state->vma =NULL ; intel_state->flags =0 ; -return state; +return &intel_state->base; }/**
@@ -110,9 +108,11 @@ void intel_plane_destroy_state(struct drm_plane *plane, struct drm_plane_state *state) { - WARN_ON(to_intel_plane_state(state)->vma); + struct intel_plane_state *plane_state = to_intel_plane_state(state); +WARN_ON (plane_state->vma); -drm_atomic_helper_plane_destroy_state (plane, state); +__drm_atomic_helper_plane_destroy_state (&plane_state->base); +kfree (plane_state); } unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/display/intel_display_types.h +6 -2
@@ -515,7 +515,11 @@ struct intel_atomic_state { };struct intel_plane_state { -struct drm_plane_state base; +union { +struct drm_plane_state base; +struct drm_plane_state uapi; +struct drm_plane_state hw; + };struct i915_ggtt_view view;struct i915_vma *vma;unsigned long flags;
@@ -1131,7 +1135,7 @@ struct cxsr_latency {#define to_intel_encoder (x) container_of(x, struct intel_encoder, base)#define to_intel_framebuffer (x) container_of(x, struct intel_framebuffer, base)#define to_intel_plane (x) container_of(x, struct intel_plane, base) -#define to_intel_plane_state (x) container_of(x, struct intel_plane_state, base) +#define to_intel_plane_state (x) container_of(x, struct intel_plane_state, uapi)#define intel_fb_obj (x) ((x) ? to_intel_bo((x)->obj[0]) : NULL)struct intel_hdmi {
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/14 drm/i915: Perform manual conversions for plane uapi/hw split
In reply to Maarten Lankhorstget_crtc_from_states() is called before plane_state is copied to uapi, so use the uapi state there.
intel_legacy_cursor_update() could probably get away with looking at the hw state, but for clarity look at the uapi state always
--- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 8 ++++---- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +4 -4
@@ -186,11 +186,11 @@ static struct intel_crtc * get_crtc_from_states(const struct intel_plane_state *old_plane_state, const struct intel_plane_state *new_plane_state) { - if (new_plane_state->base.crtc) - return to_intel_crtc(new_plane_state->base.crtc); + if (new_plane_state->uapi.crtc) + return to_intel_crtc(new_plane_state->uapi.crtc); -if (old_plane_state->base.crtc) -return to_intel_crtc (old_plane_state->base.crtc); +if (old_plane_state->uapi.crtc) +return to_intel_crtc (old_plane_state->uapi.crtc);return NULL ; }
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -15173,12 +15173,12 @@ intel_legacy_cursor_update(struct drm_plane *_plane,* take the slowpath. Only changing fb or position should be * in the fastpath. */ -if (old_plane_state->base.crtc != &crtc->base || +if (old_plane_state->uapi.crtc != &crtc->base || old_plane_state->base.src_w != src_w || old_plane_state->base.src_h != src_h || old_plane_state->base.crtc_w != crtc_w || old_plane_state->base.crtc_h != crtc_h || - !old_plane_state->base.fb != !fb) + !old_plane_state->uapi.fb != !fb) goto slow; new_plane_state =to_intel_plane_state (intel_plane_duplicate_state (&plane->base));
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/14 drm/i915: Perform automated conversions for plane uapi/hw split, base -> hw.
In reply to Maarten LankhorstSplit up plane_state->base to hw. This is done using the following patch:
@@
struct intel_plane_state *T;
identifier x =~ "^(crtc|fb|alpha|pixel_blend_mode|rotation|color_encoding|color_range)$"; @@
-T->base.x
+T->hw.x
--- drivers/gpu/drm/i915/display/intel_atomic.c | 6 +- .../gpu/drm/i915/display/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 127 +++++++++--------- drivers/gpu/drm/i915/display/intel_fbc.c | 8 +- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- drivers/gpu/drm/i915/display/intel_sprite.c | 76 +++++------ drivers/gpu/drm/i915/intel_pm.c | 36 ++--- 7 files changed, 131 insertions(+), 130 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +3 -3
@@ -296,9 +296,9 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_stareturn ;/* set scaler mode */ -if (plane_state && plane_state->base.fb && - plane_state->base.fb->format->is_yuv && - plane_state->base.fb->format->num_planes >1 ) { +if (plane_state && plane_state->hw.fb && + plane_state->hw.fb->format->is_yuv && + plane_state->hw.fb->format->num_planes >1 ) {struct intel_plane *plane =to_intel_plane (plane_state->base.plane);if (IS_GEN (dev_priv,9 ) && !IS_GEMINILAKE (dev_priv)) {
drivers/gpu/drm/i915/display/intel_atomic_plane.c +3 -3
@@ -118,7 +118,7 @@ intel_plane_destroy_state(struct drm_plane *plane,unsigned int intel_plane_data_rate (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state) { -const struct drm_framebuffer *fb = plane_state->base.fb; +const struct drm_framebuffer *fb = plane_state->hw.fb;unsigned int cpp;if (!plane_state->base.visible)
@@ -144,7 +144,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ struct intel_plane_state *new_plane_state) {struct intel_plane *plane =to_intel_plane (new_plane_state->base.plane); -const struct drm_framebuffer *fb = new_plane_state->base.fb; +const struct drm_framebuffer *fb = new_plane_state->hw.fb;int ret; new_crtc_state->active_planes &= ~BIT (plane->id);
@@ -153,7 +153,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ new_crtc_state->data_rate[plane->id] =0 ; new_plane_state->base.visible = false; -if (!new_plane_state->base.crtc && !old_plane_state->base.crtc) +if (!new_plane_state->hw.crtc && !old_plane_state->hw.crtc)return 0 ; ret = plane->check_plane (new_crtc_state, new_plane_state);
drivers/gpu/drm/i915/display/intel_display.c +64 -63
393 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_fbc.c +4 -4
@@ -662,7 +662,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_fbc *fbc = &dev_priv->fbc;struct intel_fbc_state_cache *cache = &fbc->state_cache; -struct drm_framebuffer *fb = plane_state->base.fb; +struct drm_framebuffer *fb = plane_state->hw.fb; cache->vma =NULL ; cache->flags =0 ;
@@ -671,7 +671,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate; - cache->plane.rotation = plane_state->base.rotation; + cache->plane.rotation = plane_state->hw.rotation;/* * Src coordinates are already rotated by 270 degrees for * the 90/270 degree plane rotation cases (to match the
@@ -684,7 +684,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->plane.adjusted_y = plane_state->color_plane[0 ].y; cache->plane.y = plane_state->base.src.y1 >>16 ; - cache->plane.pixel_blend_mode = plane_state->base.pixel_blend_mode; + cache->plane.pixel_blend_mode = plane_state->hw.pixel_blend_mode;if (!cache->plane.visible)return ;
@@ -1047,7 +1047,7 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv,* to pipe or plane A. */ for_each_new_intel_plane_in_state (state, plane, plane_state, i) {struct intel_crtc_state *crtc_state; -struct intel_crtc *crtc =to_intel_crtc (plane_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (plane_state->hw.crtc);if (!plane->has_fbc)continue ;
drivers/gpu/drm/i915/display/intel_overlay.c +1 -1
@@ -669,7 +669,7 @@ static void update_colorkey(struct intel_overlay *overlay, flags |=DST_KEY_ENABLE ;if (state->base.visible) - format = state->base.fb->format->format; + format = state->hw.fb->format->format;switch (format) {case DRM_FORMAT_C8 :
drivers/gpu/drm/i915/display/intel_sprite.c +38 -38
238 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +18 -18
@@ -811,7 +811,7 @@ static bool intel_wm_plane_visible(const struct intel_crtc_state *crtc_state,* around this problem with the watermark code. */ if (plane->id ==PLANE_CURSOR ) -return plane_state->base.fb !=NULL ; +return plane_state->hw.fb !=NULL ;else return plane_state->base.visible; }
@@ -1098,7 +1098,7 @@ static u16 g4x_compute_wm(const struct intel_crtc_state *crtc_state,if (!intel_wm_plane_visible (crtc_state, plane_state))return 0 ; - cpp = plane_state->base.fb->format->cpp[0 ]; + cpp = plane_state->hw.fb->format->cpp[0 ];/* * Not 100% sure which way ELK should go here as the
@@ -1318,8 +1318,8 @@ static int g4x_compute_pipe_wm(struct intel_crtc_state *crtc_state)for_each_oldnew_intel_plane_in_state (state, plane, old_plane_state, new_plane_state, i) { -if (new_plane_state->base.crtc != &crtc->base && - old_plane_state->base.crtc != &crtc->base) +if (new_plane_state->hw.crtc != &crtc->base && + old_plane_state->hw.crtc != &crtc->base)continue ;if (g4x_raw_plane_wm_compute (crtc_state, new_plane_state))
@@ -1603,7 +1603,7 @@ static u16 vlv_compute_wm_level(const struct intel_crtc_state *crtc_state,if (!intel_wm_plane_visible (crtc_state, plane_state))return 0 ; - cpp = plane_state->base.fb->format->cpp[0 ]; + cpp = plane_state->hw.fb->format->cpp[0 ]; clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; width = crtc_state->pipe_src_w;
@@ -1839,8 +1839,8 @@ static int vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state)for_each_oldnew_intel_plane_in_state (state, plane, old_plane_state, new_plane_state, i) { -if (new_plane_state->base.crtc != &crtc->base && - old_plane_state->base.crtc != &crtc->base) +if (new_plane_state->hw.crtc != &crtc->base && + old_plane_state->hw.crtc != &crtc->base)continue ;if (vlv_raw_plane_wm_compute (crtc_state, new_plane_state))
@@ -2485,7 +2485,7 @@ static u32 ilk_compute_pri_wm(const struct intel_crtc_state *crtc_state,if (!intel_wm_plane_visible (crtc_state, plane_state))return 0 ; - cpp = plane_state->base.fb->format->cpp[0 ]; + cpp = plane_state->hw.fb->format->cpp[0 ]; method1 =ilk_wm_method1 (crtc_state->pixel_rate, cpp, mem_value);
@@ -2517,7 +2517,7 @@ static u32 ilk_compute_spr_wm(const struct intel_crtc_state *crtc_state,if (!intel_wm_plane_visible (crtc_state, plane_state))return 0 ; - cpp = plane_state->base.fb->format->cpp[0 ]; + cpp = plane_state->hw.fb->format->cpp[0 ]; method1 =ilk_wm_method1 (crtc_state->pixel_rate, cpp, mem_value); method2 = ilk_wm_method2(crtc_state->pixel_rate,
@@ -2543,7 +2543,7 @@ static u32 ilk_compute_cur_wm(const struct intel_crtc_state *crtc_state,if (!intel_wm_plane_visible (crtc_state, plane_state))return 0 ; - cpp = plane_state->base.fb->format->cpp[0 ]; + cpp = plane_state->hw.fb->format->cpp[0 ]; return ilk_wm_method2(crtc_state->pixel_rate, crtc_state->hw.adjusted_mode.crtc_htotal,
@@ -2561,7 +2561,7 @@ static u32 ilk_compute_fbc_wm(const struct intel_crtc_state *crtc_state,if (!intel_wm_plane_visible (crtc_state, plane_state))return 0 ; - cpp = plane_state->base.fb->format->cpp[0 ]; + cpp = plane_state->hw.fb->format->cpp[0 ];return ilk_wm_fbc (pri_val,drm_rect_width (&plane_state->base.dst), cpp); }
@@ -4151,11 +4151,11 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc,if (!intel_wm_plane_visible (crtc_state, plane_state))continue ; -if (WARN_ON (!plane_state->base.fb)) +if (WARN_ON (!plane_state->hw.fb))return -EINVAL ; plane_downscale =skl_plane_downscale_amount (crtc_state, plane_state); - bpp = plane_state->base.fb->format->cpp[0 ] *8 ; + bpp = plane_state->hw.fb->format->cpp[0 ] *8 ;if (bpp ==64 ) plane_downscale =mul_fixed16 (plane_downscale, fp_9_div_8);
@@ -4188,7 +4188,7 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *crtc_state, int color_plane) {struct intel_plane *plane =to_intel_plane (plane_state->base.plane); -const struct drm_framebuffer *fb = plane_state->base.fb; +const struct drm_framebuffer *fb = plane_state->hw.fb;u32 data_rate;u32 width =0 , height =0 ;uint_fixed_16_16_t down_scale_amount;
@@ -4709,7 +4709,7 @@ skl_compute_plane_wm_params(const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state, struct skl_wm_params *wp, int color_plane) { - const struct drm_framebuffer *fb = plane_state->base.fb; + const struct drm_framebuffer *fb = plane_state->hw.fb;int width;/*
@@ -4721,7 +4721,7 @@ skl_compute_plane_wm_params(const struct intel_crtc_state *crtc_state,return skl_compute_wm_params (crtc_state, width, fb->format, fb->modifier, - plane_state->base.rotation, + plane_state->hw.rotation,skl_adjusted_plane_pixel_rate (crtc_state, plane_state), wp, color_plane); }
@@ -5000,7 +5000,7 @@ static int skl_build_plane_wm(struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) {struct intel_plane *plane =to_intel_plane (plane_state->base.plane); -const struct drm_framebuffer *fb = plane_state->base.fb; +const struct drm_framebuffer *fb = plane_state->hw.fb;enum plane_id plane_id = plane->id;int ret;
@@ -5033,7 +5033,7 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,return 0 ;if (plane_state->planar_linked_plane) { -const struct drm_framebuffer *fb = plane_state->base.fb; +const struct drm_framebuffer *fb = plane_state->hw.fb;enum plane_id y_plane_id = plane_state->planar_linked_plane->id;WARN_ON (!intel_wm_plane_visible (crtc_state, plane_state));
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/14 drm/i915: Perform automated conversions for plane uapi/hw split, base -> uapi.
In reply to Maarten LankhorstSplit up plane_state->base to uapi. This is done using the following patch, ran after the previous commit that splits out any hw references:
@@
struct intel_plane_state *T;
identifier x;
@@
-T->base.x
+T->uapi.x
@@
struct intel_plane_state *T;
@@
-T->base
+T->uapi
--- drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- .../gpu/drm/i915/display/intel_atomic_plane.c | 28 +- drivers/gpu/drm/i915/display/intel_display.c | 296 +++++++++--------- drivers/gpu/drm/i915/display/intel_fbc.c | 12 +- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- drivers/gpu/drm/i915/display/intel_sprite.c | 114 +++---- drivers/gpu/drm/i915/intel_pm.c | 57 ++-- 7 files changed, 257 insertions(+), 254 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +1 -1
@@ -299,7 +299,7 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_staif (plane_state && plane_state->hw.fb && plane_state->hw.fb->format->is_yuv && plane_state->hw.fb->format->num_planes >1 ) { -struct intel_plane *plane =to_intel_plane (plane_state->base.plane); +struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane);if (IS_GEN (dev_priv,9 ) && !IS_GEMINILAKE (dev_priv)) { mode =SKL_PS_SCALER_MODE_NV12 ;
drivers/gpu/drm/i915/display/intel_atomic_plane.c +14 -14
@@ -56,7 +56,7 @@ struct intel_plane *intel_plane_alloc(void)return ERR_PTR (-ENOMEM ); } -__drm_atomic_helper_plane_reset (&plane->base, &plane_state->base); +__drm_atomic_helper_plane_reset (&plane->base, &plane_state->uapi); plane_state->scaler_id =-1 ;return plane;
@@ -88,12 +88,12 @@ intel_plane_duplicate_state(struct drm_plane *plane)if (!intel_state)return NULL ; -__drm_atomic_helper_plane_duplicate_state (plane, &intel_state->base); +__drm_atomic_helper_plane_duplicate_state (plane, &intel_state->uapi); intel_state->vma =NULL ; intel_state->flags =0 ; -return &intel_state->base; +return &intel_state->uapi; }/**
@@ -111,7 +111,7 @@ intel_plane_destroy_state(struct drm_plane *plane,struct intel_plane_state *plane_state =to_intel_plane_state (state);WARN_ON (plane_state->vma); -__drm_atomic_helper_plane_destroy_state (&plane_state->base); +__drm_atomic_helper_plane_destroy_state (&plane_state->uapi);kfree (plane_state); }
@@ -121,7 +121,7 @@ unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,const struct drm_framebuffer *fb = plane_state->hw.fb;unsigned int cpp; -if (!plane_state->base.visible) +if (!plane_state->uapi.visible)return 0 ; cpp = fb->format->cpp[0 ];
@@ -143,7 +143,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_const struct intel_plane_state *old_plane_state, struct intel_plane_state *new_plane_state) { - struct intel_plane *plane = to_intel_plane(new_plane_state->base.plane); + struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane);const struct drm_framebuffer *fb = new_plane_state->hw.fb;int ret;
@@ -151,7 +151,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ new_crtc_state->nv12_planes &= ~BIT (plane->id); new_crtc_state->c8_planes &= ~BIT (plane->id); new_crtc_state->data_rate[plane->id] =0 ; - new_plane_state->base.visible = false; + new_plane_state->uapi.visible = false;if (!new_plane_state->hw.crtc && !old_plane_state->hw.crtc)return 0 ;
@@ -161,18 +161,18 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_return ret;/* FIXME pre-g4x don't work like this */ -if (new_plane_state->base.visible) +if (new_plane_state->uapi.visible) new_crtc_state->active_planes |=BIT (plane->id); -if (new_plane_state->base.visible && +if (new_plane_state->uapi.visible &&drm_format_info_is_yuv_semiplanar (fb->format)) new_crtc_state->nv12_planes |=BIT (plane->id); -if (new_plane_state->base.visible && +if (new_plane_state->uapi.visible && fb->format->format ==DRM_FORMAT_C8 ) new_crtc_state->c8_planes |=BIT (plane->id); -if (new_plane_state->base.visible || old_plane_state->base.visible) +if (new_plane_state->uapi.visible || old_plane_state->uapi.visible) new_crtc_state->update_planes |=BIT (plane->id); new_crtc_state->data_rate[plane->id] =
@@ -207,7 +207,7 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state;struct intel_crtc_state *new_crtc_state; - new_plane_state->base.visible = false; + new_plane_state->uapi.visible = false;if (!crtc)return 0 ;
@@ -316,7 +316,7 @@ void skl_update_planes_on_crtc(struct intel_atomic_state *state,struct intel_plane_state *new_plane_state =intel_atomic_get_new_plane_state (state, plane); -if (new_plane_state->base.visible) { +if (new_plane_state->uapi.visible) {intel_update_plane (plane, new_crtc_state, new_plane_state); }else if (new_plane_state->planar_slave) { struct intel_plane *master =
@@ -356,7 +356,7 @@ void i9xx_update_planes_on_crtc(struct intel_atomic_state *state, !(update_mask & BIT(plane->id)))continue ; -if (new_plane_state->base.visible) +if (new_plane_state->uapi.visible)intel_update_plane (plane, new_crtc_state, new_plane_state);else intel_disable_plane (plane, new_crtc_state);
drivers/gpu/drm/i915/display/intel_display.c +149 -147
789 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_fbc.c +6 -6
@@ -430,7 +430,7 @@ static bool multiple_pipes_ok(struct intel_crtc *crtc,if (!no_fbc_on_multiple_pipes (dev_priv))return true; -if (plane_state->base.visible) +if (plane_state->uapi.visible) fbc->visible_pipes_mask |= (1 << pipe);else fbc->visible_pipes_mask &= ~(1 << pipe);
@@ -677,12 +677,12 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,* the 90/270 degree plane rotation cases (to match the * GTT mapping), hence no need to account for rotation here. */ - cache->plane.src_w =drm_rect_width (&plane_state->base.src) >>16 ; - cache->plane.src_h =drm_rect_height (&plane_state->base.src) >>16 ; - cache->plane.visible = plane_state->base.visible; + cache->plane.src_w =drm_rect_width (&plane_state->uapi.src) >>16 ; + cache->plane.src_h =drm_rect_height (&plane_state->uapi.src) >>16 ; + cache->plane.visible = plane_state->uapi.visible; cache->plane.adjusted_x = plane_state->color_plane[0 ].x; cache->plane.adjusted_y = plane_state->color_plane[0 ].y; - cache->plane.y = plane_state->base.src.y1 >>16 ; + cache->plane.y = plane_state->uapi.src.y1 >>16 ; cache->plane.pixel_blend_mode = plane_state->hw.pixel_blend_mode;
@@ -1052,7 +1052,7 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv,if (!plane->has_fbc)continue ; -if (!plane_state->base.visible) +if (!plane_state->uapi.visible)continue ; crtc_state =intel_atomic_get_new_crtc_state (state, crtc);
drivers/gpu/drm/i915/display/intel_overlay.c +1 -1
@@ -668,7 +668,7 @@ static void update_colorkey(struct intel_overlay *overlay,if (overlay->color_key_enabled) flags |=DST_KEY_ENABLE ; -if (state->base.visible) +if (state->uapi.visible) format = state->hw.fb->format->format;switch (format) {
drivers/gpu/drm/i915/display/intel_sprite.c +57 -57
311 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +29 -28
183 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/14 drm/i915: Complete plane hw and uapi split, v2.
In reply to Maarten LankhorstSplitting plane state is easier than splitting crtc_state, before plane check we copy the drm properties to hw so we can do the same in bigjoiner later on.
We copy the state after we did all the modeset handling, but fortunately i915 seems to be split correctly and nothing during modeset looks at plane_state.
Changes since v1:
- Do not clear hw state on duplication.
--- .../gpu/drm/i915/display/intel_atomic_plane.c | 37 ++++++++++++++++++- .../gpu/drm/i915/display/intel_atomic_plane.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 1 + .../drm/i915/display/intel_display_types.h | 23 +++++++++--- 4 files changed, 57 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +36 -1
@@ -93,6 +93,10 @@ intel_plane_duplicate_state(struct drm_plane *plane) intel_state->vma =NULL ; intel_state->flags =0 ; +/* add reference to fb */ +if (intel_state->hw.fb) +drm_framebuffer_get (intel_state->hw.fb); +return &intel_state->uapi; }
@@ -112,6 +116,8 @@ intel_plane_destroy_state(struct drm_plane *plane,WARN_ON (plane_state->vma);__drm_atomic_helper_plane_destroy_state (&plane_state->uapi); +if (plane_state->hw.fb) +drm_framebuffer_put (plane_state->hw.fb);kfree (plane_state); }
@@ -138,15 +144,44 @@ unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,return cpp * crtc_state->pixel_rate; } +static void intel_plane_clear_hw_state (struct intel_plane_state *plane_state) +{ +if (plane_state->hw.fb) +drm_framebuffer_put (plane_state->hw.fb); + +memset (&plane_state->hw,0 ,sizeof (plane_state->hw)); +} + +void intel_plane_copy_uapi_to_hw_state (struct intel_plane_state *plane_state, +const struct intel_plane_state *from_plane_state) +{ +intel_plane_clear_hw_state (plane_state); + + plane_state->hw.crtc = from_plane_state->uapi.crtc; + plane_state->hw.fb = from_plane_state->uapi.fb; +if (plane_state->hw.fb) +drm_framebuffer_get (plane_state->hw.fb); + + plane_state->hw.alpha = from_plane_state->uapi.alpha; + plane_state->hw.pixel_blend_mode = + from_plane_state->uapi.pixel_blend_mode; + plane_state->hw.rotation = from_plane_state->uapi.rotation; + plane_state->hw.color_encoding = from_plane_state->uapi.color_encoding; + plane_state->hw.color_range = from_plane_state->uapi.color_range; +} +int intel_plane_atomic_check_with_state (const struct intel_crtc_state *old_crtc_state,struct intel_crtc_state *new_crtc_state,const struct intel_plane_state *old_plane_state,struct intel_plane_state *new_plane_state) {struct intel_plane *plane =to_intel_plane (new_plane_state->uapi.plane); -const struct drm_framebuffer *fb = new_plane_state->hw.fb; +const struct drm_framebuffer *fb;int ret; +intel_plane_copy_uapi_to_hw_state (new_plane_state, new_plane_state); + fb = new_plane_state->hw.fb; + new_crtc_state->active_planes &= ~BIT (plane->id); new_crtc_state->nv12_planes &= ~BIT (plane->id); new_crtc_state->c8_planes &= ~BIT (plane->id);
drivers/gpu/drm/i915/display/intel_atomic_plane.h +2 -0
@@ -20,6 +20,8 @@ extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;unsigned int intel_plane_data_rate (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); +void intel_plane_copy_uapi_to_hw_state (struct intel_plane_state *plane_state, +const struct intel_plane_state *from_plane_state);void intel_update_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state);
drivers/gpu/drm/i915/display/intel_display.c +1 -0
@@ -3267,6 +3267,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, plane_state->fb = fb; plane_state->crtc = &intel_crtc->base; +intel_plane_copy_uapi_to_hw_state (intel_state, intel_state);atomic_or (to_intel_plane (primary)->frontbuffer_bit, &to_intel_frontbuffer (fb)->bits);
drivers/gpu/drm/i915/display/intel_display_types.h +18 -5
@@ -515,11 +515,24 @@ struct intel_atomic_state { };struct intel_plane_state { -union { -struct drm_plane_state base; -struct drm_plane_state uapi; -struct drm_plane_state hw; - }; +struct drm_plane_state uapi; + +/* +* actual hardware state, the state we program to the hardware. +* The following members are used to verify the hardware state: +* During initial hw readout, they need to be copied from uapi. +*/ +struct { +struct drm_crtc *crtc; +struct drm_framebuffer *fb; + +u16 alpha; +uint16_t pixel_blend_mode; +unsigned int rotation; +enum drm_color_encoding color_encoding; +enum drm_color_range color_range; + } hw; +struct i915_ggtt_view view;struct i915_vma *vma;unsigned long flags;
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/14 drm/i915: Remove special case slave handling during hw programming, v3.
In reply to Maarten LankhorstNow that we split plane_state which I didn't want to do yet, we can program the slave plane without requiring the master plane.
This is useful for programming bigjoiner slave planes as well. We will no longer need the master's plane_state.
Changes since v1:
- set src/dst rectangles after copy_uapi_to_hw_state.
Changes since v2:
- Use the correct color_plane for pre-gen11 by using planar_linked_plane != NULL.
- Use drm_format_info_is_yuv_semiplanar in skl_plane_check() to fix gen11+.
--- .../gpu/drm/i915/display/intel_atomic_plane.c | 30 +--------- .../gpu/drm/i915/display/intel_atomic_plane.h | 3 - drivers/gpu/drm/i915/display/intel_display.c | 18 ++++++ .../drm/i915/display/intel_display_types.h | 6 +- drivers/gpu/drm/i915/display/intel_sprite.c | 57 ++++++------------- 5 files changed, 40 insertions(+), 74 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +2 -28
@@ -309,16 +309,6 @@ void intel_update_plane(struct intel_plane *plane, plane->update_plane (plane, crtc_state, plane_state); } -void intel_update_slave (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); - -trace_intel_update_plane (&plane->base, crtc); - plane->update_slave (plane, crtc_state, plane_state); -} -void intel_disable_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state) {
@@ -351,25 +341,9 @@ void skl_update_planes_on_crtc(struct intel_atomic_state *state,struct intel_plane_state *new_plane_state =intel_atomic_get_new_plane_state (state, plane); -if (new_plane_state->uapi.visible) { +if (new_plane_state->uapi.visible || + new_plane_state->planar_slave) {intel_update_plane (plane, new_crtc_state, new_plane_state); - }else if (new_plane_state->planar_slave) { -struct intel_plane *master = - new_plane_state->planar_linked_plane; - -/* -* We update the slave plane from this function because -* programming it from the master plane's update_plane -* callback runs into issues when the Y plane is -* reassigned, disabled or used by a different plane. -* -* The slave plane is updated with the master plane's -* plane_state. -*/ - new_plane_state = -intel_atomic_get_new_plane_state (state, master); - -intel_update_slave (plane, new_crtc_state, new_plane_state); }else {intel_disable_plane (plane, new_crtc_state); }
drivers/gpu/drm/i915/display/intel_atomic_plane.h +0 -3
@@ -25,9 +25,6 @@ void intel_plane_copy_uapi_to_hw_state(struct intel_plane_state *plane_state,void intel_update_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); -void intel_update_slave (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state);void intel_disable_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state);struct intel_plane *intel_plane_alloc (void );
drivers/gpu/drm/i915/display/intel_display.c +18 -0
@@ -11911,6 +11911,24 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state) crtc_state->active_planes |=BIT (linked->id); crtc_state->update_planes |=BIT (linked->id);DRM_DEBUG_KMS ("Using %s as Y plane for %s\n" , linked->base.name, plane->base.name); + +/* Copy parameters to slave plane */ + linked_state->ctl = plane_state->ctl |PLANE_CTL_YUV420_Y_PLANE ; + linked_state->color_ctl = plane_state->color_ctl; + linked_state->color_plane[0 ] = plane_state->color_plane[0 ]; + +intel_plane_copy_uapi_to_hw_state (linked_state, plane_state); + linked_state->uapi.src = plane_state->uapi.src; + linked_state->uapi.dst = plane_state->uapi.dst; + +if (icl_is_hdr_plane (dev_priv, plane->id)) { +if (linked->id ==PLANE_SPRITE5 ) + plane_state->cus_ctl |=PLANE_CUS_PLANE_7 ; +else if (linked->id ==PLANE_SPRITE4 ) + plane_state->cus_ctl |=PLANE_CUS_PLANE_6 ; +else +MISSING_CASE (linked->id); + } }return 0 ;
drivers/gpu/drm/i915/display/intel_display_types.h +3 -3
@@ -555,6 +555,9 @@ struct intel_plane_state {/* plane color control register */ u32 color_ctl; +/* chroma upsampler control register */ +u32 cus_ctl; +/* * scaler_id * = -1 : not using a scaler
@@ -1112,9 +1115,6 @@ struct intel_plane {void (*update_plane)(struct intel_plane *plane,const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); -void (*update_slave)(struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state);void (*disable_plane)(struct intel_plane *plane,const struct intel_crtc_state *crtc_state);bool (*get_hw_state)(struct intel_plane *plane,enum pipe *pipe);
drivers/gpu/drm/i915/display/intel_sprite.c +17 -40
107 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 73 lines · Maarten Lankhorst
Instead of unconditionally verifying the cursor plane, handle it in the same way as any other plane, and use our existing api to verify.
While at it, ensure that on gen9+ we verify
active_planesmask as well. This should give the correct results for planar YUV planes too, as we updateactive_planesfor them.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 83 ++++++-------------- 1 file changed, 23 insertions(+), 60 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +6
-37@@ -13183,7 +13183,8 @@ static void verify_wm_state(struct intel_crtc *crtc,struct skl_pipe_wm *sw_wm;struct skl_ddb_entry *hw_ddb_entry, *sw_ddb_entry;const enum pipe pipe = crtc->pipe; -int plane, level, max_level =ilk_wm_max_level (dev_priv); +int level, max_level =ilk_wm_max_level (dev_priv); +struct intel_plane *plane;if (INTEL_GEN (dev_priv) <9 || !new_crtc_state->base.active)return ;@@ -13207,63 +13208,25 @@ static void verify_wm_state(struct intel_crtc *crtc, hw->ddb.enabled_slices);/* planes */ -for_each_universal_plane (dev_priv, pipe, plane) { +for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) {struct skl_plane_wm *hw_plane_wm, *sw_plane_wm; +enum pipe plane_pipe = pipe; - hw_plane_wm = &hw->wm.planes[plane]; - sw_plane_wm = &sw_wm->planes[plane]; - -/* Watermarks */ -for (level =0 ; level <= max_level; level++) { -if (skl_wm_level_equals (&hw_plane_wm->wm[level], - &sw_plane_wm->wm[level])) -continue ; - -DRM_ERROR ("mismatch in WM pipe %c plane %d level %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n" , -pipe_name (pipe), plane +1 , level, - sw_plane_wm->wm[level].plane_en, - sw_plane_wm->wm[level].plane_res_b, - sw_plane_wm->wm[level].plane_res_l, - hw_plane_wm->wm[level].plane_en, - hw_plane_wm->wm[level].plane_res_b, - hw_plane_wm->wm[level].plane_res_l); - } + hw_plane_wm = &hw->wm.planes[plane->id]; + sw_plane_wm = &sw_wm->planes[plane->id]; -if (!skl_wm_level_equals (&hw_plane_wm->trans_wm, - &sw_plane_wm->trans_wm)) { -DRM_ERROR ("mismatch in trans WM pipe %c plane %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n" , -pipe_name (pipe), plane +1 , - sw_plane_wm->trans_wm.plane_en, - sw_plane_wm->trans_wm.plane_res_b, - sw_plane_wm->trans_wm.plane_res_l, - hw_plane_wm->trans_wm.plane_en, - hw_plane_wm->trans_wm.plane_res_b, - hw_plane_wm->trans_wm.plane_res_l); - } - -/* DDB */ - hw_ddb_entry = &hw->ddb_y[plane]; - sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb_y[plane]; - -if (!skl_ddb_entry_equal (hw_ddb_entry, sw_ddb_entry)) {
drivers/gpu/drm/i915/display/intel_display.c static void verify_wm_state(struct intel_crtc *crtc, · line 13223
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +5
-4-DRM_ERROR ("mismatch in DDB state pipe %c plane %d (expected (%u,%u), found (%u,%u))\n" , -pipe_name (pipe), plane +1 , - sw_ddb_entry->start, sw_ddb_entry->end, - hw_ddb_entry->start, hw_ddb_entry->end); +if (!plane->get_hw_state (plane, &plane_pipe)) { +WARN (new_crtc_state->active_planes &BIT (plane->id), +"pipe %c %s should be visible, but isn't\n" , +pipe_name (pipe), plane->base.name); +continue ; }
As mentioned the idea was to make sure we validate this stuff even for disabled planes. A bit of paranoia is good since ddb overlaps can be so dangerous. So I don't want such a check in this function.
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-6- } -/* -* cursor -* If the cursor plane isn't active, we may not have updated it's ddb -* allocation. In that case since the ddb allocation will be updated -* once the plane becomes visible, we can skip this check
drivers/gpu/drm/i915/display/intel_display.c static void verify_wm_state(struct intel_crtc *crtc, · line 13229
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-5-*/ -if (1 ) { -struct skl_plane_wm *hw_plane_wm, *sw_plane_wm; +WARN_ON (plane_pipe != pipe); - hw_plane_wm = &hw->wm.planes[PLANE_CURSOR ]; - sw_plane_wm = &sw_wm->planes[PLANE_CURSOR ]; +WARN (!(new_crtc_state->active_planes &BIT (plane->id)), +"pipe %c %s should be invisible, but visible.\n" , +pipe_name (pipe), plane->base.name);
Still the wrong place for it.
Quoted 49 lines
drivers/gpu/drm/i915/display/intel_display.c +8
-8/* Watermarks */ for (level =0 ; level <= max_level; level++) {@@ -13271,8 +13234,8 @@ static void verify_wm_state(struct intel_crtc *crtc, &sw_plane_wm->wm[level]))continue ; - DRM_ERROR("mismatch in WM pipe %c cursor level %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", - pipe_name(pipe), level, + DRM_ERROR("mismatch in WM pipe %c %s level %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", + pipe_name(pipe), plane->base.name, level, sw_plane_wm->wm[level].plane_en, sw_plane_wm->wm[level].plane_res_b, sw_plane_wm->wm[level].plane_res_l,@@ -13283,8 +13246,8 @@ static void verify_wm_state(struct intel_crtc *crtc,if (!skl_wm_level_equals (&hw_plane_wm->trans_wm, &sw_plane_wm->trans_wm)) { - DRM_ERROR("mismatch in trans WM pipe %c cursor (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", - pipe_name(pipe), + DRM_ERROR("mismatch in trans WM pipe %c %s (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n", + pipe_name(pipe), plane->base.name, sw_plane_wm->trans_wm.plane_en, sw_plane_wm->trans_wm.plane_res_b, sw_plane_wm->trans_wm.plane_res_l,@@ -13294,12 +13257,12 @@ static void verify_wm_state(struct intel_crtc *crtc, }/* DDB */ - hw_ddb_entry = &hw->ddb_y[PLANE_CURSOR ]; - sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb_y[PLANE_CURSOR ]; + hw_ddb_entry = &hw->ddb_y[plane->id]; + sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb_y[plane->id];if (!skl_ddb_entry_equal (hw_ddb_entry, sw_ddb_entry)) { -DRM_ERROR ("mismatch in DDB state pipe %c cursor (expected (%u,%u), found (%u,%u))\n" , -pipe_name (pipe), +DRM_ERROR ("mismatch in DDB state pipe %c %s (expected (%u,%u), found (%u,%u))\n" , +pipe_name (pipe), plane->base.name, sw_ddb_entry->start, sw_ddb_entry->end, hw_ddb_entry->start, hw_ddb_entry->end); }Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Op 24-10-2019 om 16:33 schreef Ville Syrjälä:
Quoted 79 lines · Maarten Lankhorst
Quoted 78 lines
Instead of unconditionally verifying the cursor plane, handle it in the same way as any other plane, and use our existing api to verify.
While at it, ensure that on gen9+ we verify
active_planesmask as well. This should give the correct results for planar YUV planes too, as we updateactive_planesfor them.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 83 ++++++-------------- 1 file changed, 23 insertions(+), 60 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +7
-41@@ -13183,7 +13183,8 @@ static void verify_wm_state(struct intel_crtc *crtc,struct skl_pipe_wm *sw_wm;struct skl_ddb_entry *hw_ddb_entry, *sw_ddb_entry;const enum pipe pipe = crtc->pipe; -int plane, level, max_level =ilk_wm_max_level (dev_priv); +int level, max_level =ilk_wm_max_level (dev_priv); +struct intel_plane *plane;if (INTEL_GEN (dev_priv) <9 || !new_crtc_state->base.active)return ;@@ -13207,63 +13208,25 @@ static void verify_wm_state(struct intel_crtc *crtc, hw->ddb.enabled_slices);/* planes */ -for_each_universal_plane (dev_priv, pipe, plane) { +for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) {struct skl_plane_wm *hw_plane_wm, *sw_plane_wm; +enum pipe plane_pipe = pipe; - hw_plane_wm = &hw->wm.planes[plane]; - sw_plane_wm = &sw_wm->planes[plane]; - -/* Watermarks */ -for (level =0 ; level <= max_level; level++) { -if (skl_wm_level_equals (&hw_plane_wm->wm[level], - &sw_plane_wm->wm[level])) -continue ; - -DRM_ERROR ("mismatch in WM pipe %c plane %d level %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n" , -pipe_name (pipe), plane +1 , level, - sw_plane_wm->wm[level].plane_en, - sw_plane_wm->wm[level].plane_res_b, - sw_plane_wm->wm[level].plane_res_l, - hw_plane_wm->wm[level].plane_en, - hw_plane_wm->wm[level].plane_res_b, - hw_plane_wm->wm[level].plane_res_l); - } + hw_plane_wm = &hw->wm.planes[plane->id]; + sw_plane_wm = &sw_wm->planes[plane->id]; -if (!skl_wm_level_equals (&hw_plane_wm->trans_wm, - &sw_plane_wm->trans_wm)) { -DRM_ERROR ("mismatch in trans WM pipe %c plane %d (expected e=%d b=%u l=%u, got e=%d b=%u l=%u)\n" , -pipe_name (pipe), plane +1 , - sw_plane_wm->trans_wm.plane_en, - sw_plane_wm->trans_wm.plane_res_b, - sw_plane_wm->trans_wm.plane_res_l, - hw_plane_wm->trans_wm.plane_en, - hw_plane_wm->trans_wm.plane_res_b, - hw_plane_wm->trans_wm.plane_res_l); - } - -/* DDB */ - hw_ddb_entry = &hw->ddb_y[plane]; - sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb_y[plane]; - -if (!skl_ddb_entry_equal (hw_ddb_entry, sw_ddb_entry)) { -DRM_ERROR ("mismatch in DDB state pipe %c plane %d (expected (%u,%u), found (%u,%u))\n" , -pipe_name (pipe), plane +1 , - sw_ddb_entry->start, sw_ddb_entry->end, - hw_ddb_entry->start, hw_ddb_entry->end); +if (!plane->get_hw_state (plane, &plane_pipe)) {
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static void verify_wm_state(struct intel_crtc *crtc, · line 13223
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0+WARN (new_crtc_state->active_planes &BIT (plane->id), +"pipe %c %s should be visible, but isn't\n" , +pipe_name (pipe), plane->base.name); +continue ; }As mentioned the idea was to make sure we validate this stuff even for disabled planes. A bit of paranoia is good since ddb overlaps can be so dangerous. So I don't want such a check in this function.
Yeah should be ok.
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-9- } -/* -* cursor -* If the cursor plane isn't active, we may not have updated it's ddb -* allocation. In that case since the ddb allocation will be updated -* once the plane becomes visible, we can skip this check -*/ -if (1 ) { -struct skl_plane_wm *hw_plane_wm, *sw_plane_wm; +WARN_ON (plane_pipe != pipe);
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c static void verify_wm_state(struct intel_crtc *crtc, · line 13229
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-2- hw_plane_wm = &hw->wm.planes[PLANE_CURSOR ]; - sw_plane_wm = &sw_wm->planes[PLANE_CURSOR ]; +WARN (!(new_crtc_state->active_planes &BIT (plane->id)), +"pipe %c %s should be invisible, but visible.\n" , +pipe_name (pipe), plane->base.name);Still the wrong place for it.
Derp, blindly resent the patch. :(
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for series starting with [01/14] drm/i915: Rework watermark readout to use plane api
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [01/14] drm/i915: Rework watermark readout to use plane api
URL : https://patchwork.freedesktop.org/series/68519/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 22333473c76c drm/i915: Rework watermark readout to use plane api 198f3ae74f1a drm/i915: Introduce intel_atomic_get_plane_state_after_check(), v2. -:10: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #10: In case of intel_modeset_all_pipes() this is not yet done after atomic_check,
-:87: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #87: FILE: drivers/gpu/drm/i915/display/intel_atomic.c:387:
+ DRM_DEBUG_KMS("Failed to add [PLANE:%d] to drm_state: %li\n",
+ plane->base.base.id, PTR_ERR(plane_state));
total: 0 errors, 1 warnings, 1 checks, 185 lines checked 083b2450c140 drm/i915: Handle a few more cases for crtc hw/uapi split, v3. b48dff12ef91 drm/i915: Add aliases for uapi and hw to crtc_state -:67: WARNING:LONG_LINE: line over 100 characters
#67: FILE: drivers/gpu/drm/i915/display/intel_display.h:453:
+ to_intel_plane_state(__drm_atomic_get_current_plane_state((crtc_state)->uapi.state, &plane->base))))
total: 0 errors, 1 warnings, 0 checks, 83 lines checked6d9fcb9131c2 drm/i915: Perform manual conversions for crtc uapi/hw split, v2.1e26da0561d3 drm/i915: Perform automated conversions for crtc uapi/hw split, base -> hw. -:10: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #10:
Split up crtc_state->base to hw where appropriate. This is done using the following patch:
-:1424: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #1424: FILE: drivers/gpu/drm/i915/display/intel_display.c:17104:
+ crtc_state->hw.active = crtc_state->hw.enable =
total: 0 errors, 1 warnings, 1 checks, 2089 lines checked702358ac8359 drm/i915: Perform automated conversions for crtc uapi/hw split, base -> uapi. -:2409: ERROR:CODE_INDENT: code indent should use tabs where possible #2409: FILE: drivers/gpu/drm/i915/display/intel_sprite.c:211:
+^I^I^I^I new_crtc_state->uapi.event);$
-:2409: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2409: FILE: drivers/gpu/drm/i915/display/intel_sprite.c:211:
+ drm_crtc_arm_vblank_event(&crtc->base,
+ new_crtc_state->uapi.event);
total: 1 errors, 0 warnings, 1 checks, 2568 lines checkedbab1c99201bb drm/i915: Complete crtc hw/uapi split, v3.
-:15: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #15:
- Clear crtc_state->hw on disable, instead of using clear_intel_crtc_state().
total: 0 errors, 1 warnings, 0 checks, 217 lines checked ca8f0c896f5f drm/i915: Add aliases for uapi and hw to plane_state -:49: WARNING:LINE_SPACING: Missing a blank line after declarations #49: FILE: drivers/gpu/drm/i915/display/intel_atomic_plane.c:112:
+ struct intel_plane_state *plane_state = to_intel_plane_state(state);
+ WARN_ON(plane_state->vma);
total: 0 errors, 1 warnings, 0 checks, 59 lines checkedd999f2905a18 drm/i915: Perform manual conversions for plane uapi/hw split5fe68e3dbc52 drm/i915: Perform automated conversions for plane uapi/hw split, base -> hw. -:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #11:
identifier x =~ "^(crtc|fb|alpha|pixel_blend_mode|rotation|color_encoding|color_range)$";
-:832: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "plane_state->hw.fb" #832: FILE: drivers/gpu/drm/i915/intel_pm.c:814:
+ return plane_state->hw.fb != NULL;
total: 0 errors, 1 warnings, 1 checks, 836 lines checked511cefb79332 drm/i915: Perform automated conversions for plane uapi/hw split, base -> uapi. -:731: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #731: FILE: drivers/gpu/drm/i915/display/intel_display.c:11105:
+ unsigned width = drm_rect_width(&plane_state->uapi.dst);
-:732: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #732: FILE: drivers/gpu/drm/i915/display/intel_display.c:11106:
+ unsigned height = drm_rect_height(&plane_state->uapi.dst);
-:800: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #800: FILE: drivers/gpu/drm/i915/display/intel_display.c:11708:
+ plane_state->uapi.visible = visible = false;
-:1528: WARNING:LONG_LINE: line over 100 characters #1528: FILE: drivers/gpu/drm/i915/intel_pm.c:3113:
+ (drm_rect_width(&sprstate->uapi.dst) != drm_rect_width(&sprstate->uapi.src) >> 16 ||
-:1529: WARNING:LONG_LINE: line over 100 characters #1529: FILE: drivers/gpu/drm/i915/intel_pm.c:3114:
+ drm_rect_height(&sprstate->uapi.dst) != drm_rect_height(&sprstate->uapi.src) >> 16);
total: 0 errors, 4 warnings, 1 checks, 1431 lines checked 6d89b589ae93 drm/i915: Complete plane hw and uapi split, v2. -:139: CHECK:PREFER_KERNEL_TYPES: Prefer kernel type 'u16' over 'uint16_t' #139: FILE: drivers/gpu/drm/i915/display/intel_display_types.h:530:
+ uint16_t pixel_blend_mode;
total: 0 errors, 0 warnings, 1 checks, 107 lines checkedd85928cc4a61 drm/i915: Remove special case slave handling during hw programming, v3.
-:16: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #16:
- Use the correct color_plane for pre-gen11 by using planar_linked_plane != NULL.
total: 0 errors, 1 warnings, 0 checks, 201 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [01/14] drm/i915: Rework watermark readout to use plane api
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [01/14] drm/i915: Rework watermark readout to use plane api
URL : https://patchwork.freedesktop.org/series/68519/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7174 -> Patchwork_14968
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14968 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_14968, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_14968:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_suspend@basic-s3:
- fi-bdw-5557u: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-bdw-5557u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-bdw-5557u/igt@[email protected]
- fi-kbl-r: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-kbl-r/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-kbl-r/igt@[email protected]
- fi-byt-n2820: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-byt-n2820/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-byt-n2820/igt@[email protected]
- fi-snb-2600: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-snb-2600/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-snb-2600/igt@[email protected]
- fi-ilk-650: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-ilk-650/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-ilk-650/igt@[email protected]
- fi-elk-e7500: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-elk-e7500/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-elk-e7500/igt@[email protected]
- fi-bdw-gvtdvm: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-bdw-gvtdvm/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-bdw-gvtdvm/igt@[email protected]
- fi-glk-dsi: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-glk-dsi/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-glk-dsi/igt@[email protected]
- fi-snb-2520m: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-snb-2520m/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-snb-2520m/igt@[email protected]
- fi-pnv-d510: NOTRUN -> [DMESG-WARN][19]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-pnv-d510/igt@[email protected]
- fi-kbl-x1275: [PASS][20] -> [DMESG-WARN][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-kbl-x1275/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-kbl-x1275/igt@[email protected]
- fi-kbl-soraka: [PASS][22] -> [DMESG-WARN][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-kbl-soraka/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-kbl-soraka/igt@[email protected]
- fi-bxt-dsi: [PASS][24] -> [DMESG-WARN][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-bxt-dsi/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-bxt-dsi/igt@[email protected]
- fi-cml-u2: [PASS][26] -> [DMESG-WARN][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-cml-u2/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-cml-u2/igt@[email protected]
- fi-bsw-n3050: [PASS][28] -> [DMESG-WARN][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-bsw-n3050/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-bsw-n3050/igt@[email protected]
- fi-byt-j1900: [PASS][30] -> [DMESG-WARN][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-byt-j1900/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-byt-j1900/igt@[email protected]
- fi-hsw-4770: [PASS][32] -> [DMESG-WARN][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-hsw-4770/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-hsw-4770/igt@[email protected]
- fi-ivb-3770: [PASS][34] -> [DMESG-WARN][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-ivb-3770/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-ivb-3770/igt@[email protected]
- fi-blb-e6850: [PASS][36] -> [DMESG-WARN][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-blb-e6850/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-blb-e6850/igt@[email protected]
- fi-skl-6600u: [PASS][38] -> [DMESG-WARN][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-skl-6600u/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-skl-6600u/igt@[email protected]
* igt@kms_force_connector_basic@force-connector-state:
- fi-kbl-guc: [PASS][40] -> [DMESG-WARN][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-kbl-guc/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-kbl-guc/igt@[email protected]
* igt@runner@aborted:
- fi-pnv-d510: NOTRUN -> [FAIL][42]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-pnv-d510/igt@[email protected]
- fi-hsw-peppy: NOTRUN -> [FAIL][43]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-hsw-peppy/igt@[email protected]
- fi-hsw-4770: NOTRUN -> [FAIL][44]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-hsw-4770/igt@[email protected]
- fi-whl-u: NOTRUN -> [FAIL][45]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-whl-u/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][46]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-ivb-3770/igt@[email protected]
- fi-bxt-dsi: NOTRUN -> [FAIL][47]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-bxt-dsi/igt@[email protected]
- fi-byt-j1900: NOTRUN -> [FAIL][48]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-byt-j1900/igt@[email protected]
- fi-blb-e6850: NOTRUN -> [FAIL][49]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-blb-e6850/igt@[email protected]
- fi-bsw-kefka: NOTRUN -> [FAIL][50]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-bsw-kefka/igt@[email protected]
- fi-byt-n2820: NOTRUN -> [FAIL][51]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-byt-n2820/igt@[email protected]
- fi-kbl-guc: NOTRUN -> [FAIL][52]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-kbl-guc/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_suspend@basic-s3:
- {fi-tgl-u}: [PASS][53] -> [DMESG-WARN][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-tgl-u/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-tgl-u/igt@[email protected]
- {fi-icl-guc}: [PASS][55] -> [DMESG-WARN][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-icl-guc/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-icl-guc/igt@[email protected]
- {fi-cml-s}: [PASS][57] -> [DMESG-WARN][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-cml-s/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-cml-s/igt@[email protected]
* igt@runner@aborted:
- {fi-tgl-u}: NOTRUN -> [FAIL][59]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-tgl-u/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_14968 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-gtt-read:
- fi-glk-dsi: [PASS][60] -> [DMESG-WARN][61] ([fdo#106107]) +1 similar issue
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-glk-dsi/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-glk-dsi/igt@[email protected]
* igt@gem_exec_suspend@basic-s3:
- fi-skl-6770hq: [PASS][62] -> [INCOMPLETE][63] ([fdo#104108])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-skl-6770hq/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-skl-6770hq/igt@[email protected]
- fi-skl-lmem: [PASS][64] -> [INCOMPLETE][65] ([fdo#104108])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-skl-lmem/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-skl-lmem/igt@[email protected]
- fi-whl-u: [PASS][66] -> [DMESG-WARN][67] ([fdo#106350])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-whl-u/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-whl-u/igt@[email protected]
- fi-cfl-guc: [PASS][68] -> [INCOMPLETE][69] ([fdo#108126] / [fdo#108743])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-cfl-guc/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-cfl-guc/igt@[email protected]
- fi-skl-iommu: [PASS][70] -> [INCOMPLETE][71] ([fdo#104108])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-skl-iommu/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-skl-iommu/igt@[email protected]
- fi-cfl-8700k: [PASS][72] -> [INCOMPLETE][73] ([fdo#108126])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-cfl-8700k/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-cfl-8700k/igt@[email protected]
- fi-icl-u2: [PASS][74] -> [DMESG-WARN][75] ([fdo#107724])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-icl-u2/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-icl-u2/igt@[email protected]
- fi-kbl-7500u: [PASS][76] -> [INCOMPLETE][77] ([fdo#107859])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-kbl-7500u/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-kbl-7500u/igt@[email protected]
- fi-icl-u3: [PASS][78] -> [DMESG-WARN][79] ([fdo#107724]) +1 similar issue
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-icl-u3/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-icl-u3/igt@[email protected]
- fi-skl-6700k2: [PASS][80] -> [INCOMPLETE][81] ([fdo#104108])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-skl-6700k2/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-skl-6700k2/igt@[email protected]
- fi-apl-guc: [PASS][82] -> [INCOMPLETE][83] ([fdo#103927] / [fdo#108743])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-apl-guc/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-apl-guc/igt@[email protected]
#### Possible fixes ####
* {igt@i915_selftest@live_gt_heartbeat}:
- fi-kbl-8809g: [DMESG-FAIL][84] ([fdo#112096]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7174/fi-kbl-8809g/igt@i915_selftest@live_gt_heartbeat.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/fi-kbl-8809g/igt@i915_selftest@live_gt_heartbeat.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#106350]: https://bugs.freedesktop.org/show_bug.cgi?id=106350
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107859]: https://bugs.freedesktop.org/show_bug.cgi?id=107859
[fdo#108126]: https://bugs.freedesktop.org/show_bug.cgi?id=108126
[fdo#108743]: https://bugs.freedesktop.org/show_bug.cgi?id=108743
[fdo#111735]: https://bugs.freedesktop.org/show_bug.cgi?id=111735
[fdo#112096]: https://bugs.freedesktop.org/show_bug.cgi?id=112096
Participating hosts (50 -> 41)
------------------------------
Additional (2): fi-hsw-peppy fi-pnv-d510
Missing (11): fi-ilk-m540 fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-byt-clapper fi-gdg-551 fi-icl-y fi-icl-dsi fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7174 -> Patchwork_14968
CI-20190529: 20190529
CI_DRM_7174: c320b9b5667a773952b1d6dfdc0fff5aac2d0fb1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5237: 9a46404de7c42c8cc2d492176e956597ef28d7c4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14968: d85928cc4a6114dcc4e9c88b5c71b8ac9265533e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d85928cc4a61 drm/i915: Remove special case slave handling during hw programming, v3. 6d89b589ae93 drm/i915: Complete plane hw and uapi split, v2.511cefb79332 drm/i915: Perform automated conversions for plane uapi/hw split, base -> uapi. 5fe68e3dbc52 drm/i915: Perform automated conversions for plane uapi/hw split, base -> hw. d999f2905a18 drm/i915: Perform manual conversions for plane uapi/hw split ca8f0c896f5f drm/i915: Add aliases for uapi and hw to plane_state bab1c99201bb drm/i915: Complete crtc hw/uapi split, v3.702358ac8359 drm/i915: Perform automated conversions for crtc uapi/hw split, base -> uapi. 1e26da0561d3 drm/i915: Perform automated conversions for crtc uapi/hw split, base -> hw. 6d9fcb9131c2 drm/i915: Perform manual conversions for crtc uapi/hw split, v2. b48dff12ef91 drm/i915: Add aliases for uapi and hw to crtc_state 083b2450c140 drm/i915: Handle a few more cases for crtc hw/uapi split, v3. 198f3ae74f1a drm/i915: Introduce intel_atomic_get_plane_state_after_check(), v2. 22333473c76c drm/i915: Rework watermark readout to use plane api
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14968/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx