diff options
author | Dave Airlie <airlied@redhat.com> | 2020-12-03 13:01:44 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-12-03 13:01:44 +1000 |
commit | 46fe37b98ed8f67e3d68177eefe076fdaff643a2 (patch) | |
tree | 5233e024adf6073589b38604f84c6ff33e937282 /drivers/gpu/drm/i915/display/intel_psr.h | |
parent | 22f8c80566c4a29a0d8b5ebf24aa1fd1679b39e5 (diff) | |
parent | b3bf99daaee96a141536ce5c60a0d6dba6ec1d23 (diff) | |
download | linux-46fe37b98ed8f67e3d68177eefe076fdaff643a2.tar.bz2 |
Merge tag 'drm-intel-next-queued-2020-11-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
drm/i915 features for v5.11:
Highlights:
- Enable big joiner to join two pipes to one port to overcome pipe restrictions
(Manasi, Ville, Maarten)
Display:
- More DG1 enabling (Lucas, Aditya)
- Fixes to cases without display (Lucas, José, Jani)
- Initial PSR state improvements (José)
- JSL eDP vswing updates (Tejas)
- Handle EDID declared max 16 bpc (Ville)
- Display refactoring (Ville)
Other:
- GVT features
- Backmerge
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87czzzkk1s.fsf@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_psr.h')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_psr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h index 3eca9dcec3c0..0a517978e8af 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h @@ -43,10 +43,6 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp); int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state, u32 *out_value); bool intel_psr_enabled(struct intel_dp *intel_dp); -void intel_psr_atomic_check(struct drm_connector *connector, - struct drm_connector_state *old_state, - struct drm_connector_state *new_state); -void intel_psr_set_force_mode_changed(struct intel_dp *intel_dp); int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, struct intel_crtc *crtc); void intel_psr2_program_trans_man_trk_ctl(const struct intel_crtc_state *crtc_state); |