diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-03-13 18:48:23 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-03-27 19:07:28 +0200 |
| commit | d4d7d9ca57a4e41e437cb03e694aa7259507c595 (patch) | |
| tree | 472794a79c90dd127933e67368f7bb4db73096bd /drivers/gpu/drm/i915/display/intel_ddi.c | |
| parent | 02d8ea47dbc30724aaac014ab0a7a31b095f88fb (diff) | |
drm/i915: Use REG_FIELD_PREP() & co. for TRANS_DDI_FUNC_CTL2
Clean up the TRANS_DDI_FUNC_CTL2 programming/readout by
using REG_FIELD_PREP() & co.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200313164831.5980-6-ville.syrjala@linux.intel.com
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index fe2f9b9633764..916a802af788c 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1575,9 +1575,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state) master_select = master_transcoder + 1; ctl2 |= PORT_SYNC_MODE_ENABLE | - (PORT_SYNC_MODE_MASTER_SELECT(master_select) & - PORT_SYNC_MODE_MASTER_SELECT_MASK) << - PORT_SYNC_MODE_MASTER_SELECT_SHIFT; + PORT_SYNC_MODE_MASTER_SELECT(master_select); } intel_de_write(dev_priv, @@ -3871,7 +3869,7 @@ static enum transcoder transcoder_master_readout(struct drm_i915_private *dev_pr if ((ctl2 & PORT_SYNC_MODE_ENABLE) == 0) return INVALID_TRANSCODER; - master_select = ctl2 & PORT_SYNC_MODE_MASTER_SELECT_MASK; + master_select = REG_FIELD_GET(PORT_SYNC_MODE_MASTER_SELECT_MASK, ctl2); if (master_select == 0) return TRANSCODER_EDP; |