drm/i915: Convert most of atomic commit to take more intel state
Instead of passing along drm_crtc_state and drm_atomic_state, pass along more intel_atomic_state and intel_crtc_state. This will make the code more readable by not casting between drm state and intel state all the time. While at it, rename old_state to state, with the get_new/old helpers there is no point in distinguishing between state before and after swapping state any more. (Ville) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190628085517.31886-3-maarten.lankhorst@linux.intel.com
此提交包含在:
@@ -3736,11 +3736,10 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool intel_can_enable_sagv(struct drm_atomic_state *state)
|
||||
bool intel_can_enable_sagv(struct intel_atomic_state *state)
|
||||
{
|
||||
struct drm_device *dev = state->dev;
|
||||
struct drm_device *dev = state->base.dev;
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
|
||||
struct intel_crtc *crtc;
|
||||
struct intel_plane *plane;
|
||||
struct intel_crtc_state *cstate;
|
||||
@@ -3761,18 +3760,18 @@ bool intel_can_enable_sagv(struct drm_atomic_state *state)
|
||||
/*
|
||||
* If there are no active CRTCs, no additional checks need be performed
|
||||
*/
|
||||
if (hweight32(intel_state->active_crtcs) == 0)
|
||||
if (hweight32(state->active_crtcs) == 0)
|
||||
return true;
|
||||
|
||||
/*
|
||||
* SKL+ workaround: bspec recommends we disable SAGV when we have
|
||||
* more then one pipe enabled
|
||||
*/
|
||||
if (hweight32(intel_state->active_crtcs) > 1)
|
||||
if (hweight32(state->active_crtcs) > 1)
|
||||
return false;
|
||||
|
||||
/* Since we're now guaranteed to only have one active CRTC... */
|
||||
pipe = ffs(intel_state->active_crtcs) - 1;
|
||||
pipe = ffs(state->active_crtcs) - 1;
|
||||
crtc = intel_get_crtc_for_pipe(dev_priv, pipe);
|
||||
cstate = to_intel_crtc_state(crtc->base.state);
|
||||
|
||||
|
新增問題並參考
封鎖使用者