Commit 8aa2d2ef authored by Gwan-gyeong Mun's avatar Gwan-gyeong Mun Committed by Lucas De Marchi

drm/i915/display: Replace dc3co_enabled with dc3co_exitline on intel_psr struct

It replaces dc3co_enabled with dc3co_exitline on intel_psr struct.  And
it saves dc3co_exitline, not dc3co_enabled, so we can use dc3co_exitline
without intel_crtc_state on other psr internal function like as
intel_psr_enable_source().

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarGwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210519000625.3184321-12-lucas.demarchi@intel.com
parent 510b2814
...@@ -1498,7 +1498,7 @@ struct intel_psr { ...@@ -1498,7 +1498,7 @@ struct intel_psr {
bool sink_not_reliable; bool sink_not_reliable;
bool irq_aux_error; bool irq_aux_error;
u16 su_x_granularity; u16 su_x_granularity;
bool dc3co_enabled; u32 dc3co_exitline;
u32 dc3co_exit_delay; u32 dc3co_exit_delay;
struct delayed_work dc3co_work; struct delayed_work dc3co_work;
struct drm_dp_vsc_sdp vsc; struct drm_dp_vsc_sdp vsc;
......
...@@ -638,7 +638,7 @@ static void tgl_dc3co_disable_work(struct work_struct *work) ...@@ -638,7 +638,7 @@ static void tgl_dc3co_disable_work(struct work_struct *work)
static void tgl_disallow_dc3co_on_psr2_exit(struct intel_dp *intel_dp) static void tgl_disallow_dc3co_on_psr2_exit(struct intel_dp *intel_dp)
{ {
if (!intel_dp->psr.dc3co_enabled) if (!intel_dp->psr.dc3co_exitline)
return; return;
cancel_delayed_work(&intel_dp->psr.dc3co_work); cancel_delayed_work(&intel_dp->psr.dc3co_work);
...@@ -1010,7 +1010,7 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, ...@@ -1010,7 +1010,7 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
psr_irq_control(intel_dp); psr_irq_control(intel_dp);
if (crtc_state->dc3co_exitline) { if (intel_dp->psr.dc3co_exitline) {
u32 val; u32 val;
/* /*
...@@ -1019,7 +1019,7 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, ...@@ -1019,7 +1019,7 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
*/ */
val = intel_de_read(dev_priv, EXITLINE(cpu_transcoder)); val = intel_de_read(dev_priv, EXITLINE(cpu_transcoder));
val &= ~EXITLINE_MASK; val &= ~EXITLINE_MASK;
val |= crtc_state->dc3co_exitline << EXITLINE_SHIFT; val |= intel_dp->psr.dc3co_exitline << EXITLINE_SHIFT;
val |= EXITLINE_ENABLE; val |= EXITLINE_ENABLE;
intel_de_write(dev_priv, EXITLINE(cpu_transcoder), val); intel_de_write(dev_priv, EXITLINE(cpu_transcoder), val);
} }
...@@ -1044,11 +1044,11 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp, ...@@ -1044,11 +1044,11 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp,
intel_dp->psr.psr2_enabled = crtc_state->has_psr2; intel_dp->psr.psr2_enabled = crtc_state->has_psr2;
intel_dp->psr.busy_frontbuffer_bits = 0; intel_dp->psr.busy_frontbuffer_bits = 0;
intel_dp->psr.pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe; intel_dp->psr.pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
intel_dp->psr.dc3co_enabled = !!crtc_state->dc3co_exitline;
intel_dp->psr.transcoder = crtc_state->cpu_transcoder; intel_dp->psr.transcoder = crtc_state->cpu_transcoder;
/* DC5/DC6 requires at least 6 idle frames */ /* DC5/DC6 requires at least 6 idle frames */
val = usecs_to_jiffies(intel_get_frame_time_us(crtc_state) * 6); val = usecs_to_jiffies(intel_get_frame_time_us(crtc_state) * 6);
intel_dp->psr.dc3co_exit_delay = val; intel_dp->psr.dc3co_exit_delay = val;
intel_dp->psr.dc3co_exitline = crtc_state->dc3co_exitline;
intel_dp->psr.psr2_sel_fetch_enabled = crtc_state->enable_psr2_sel_fetch; intel_dp->psr.psr2_sel_fetch_enabled = crtc_state->enable_psr2_sel_fetch;
/* /*
...@@ -1818,7 +1818,7 @@ tgl_dc3co_flush(struct intel_dp *intel_dp, unsigned int frontbuffer_bits, ...@@ -1818,7 +1818,7 @@ tgl_dc3co_flush(struct intel_dp *intel_dp, unsigned int frontbuffer_bits,
{ {
mutex_lock(&intel_dp->psr.lock); mutex_lock(&intel_dp->psr.lock);
if (!intel_dp->psr.dc3co_enabled) if (!intel_dp->psr.dc3co_exitline)
goto unlock; goto unlock;
if (!intel_dp->psr.psr2_enabled || !intel_dp->psr.active) if (!intel_dp->psr.psr2_enabled || !intel_dp->psr.active)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment