diff options
| author | Dave Airlie <[email protected]> | 2019-10-04 06:31:03 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-10-04 06:31:06 +0000 |
| commit | 07bba341c99694a4fe6b07edfa4f97ca90c8784c (patch) | |
| tree | 691c0abab38c733f7519c9f08d2f93e113a5dbea /drivers/gpu/drm/i915/display/intel_display.h | |
| parent | Merge tag 'drm-misc-fixes-2019-10-03' of git://anongit.freedesktop.org/drm/dr... (diff) | |
| parent | Revert "drm/i915: Fix DP-MST crtc_mask" (diff) | |
| download | kernel-07bba341c99694a4fe6b07edfa4f97ca90c8784c.tar.gz kernel-07bba341c99694a4fe6b07edfa4f97ca90c8784c.zip | |
Merge tag 'drm-intel-fixes-2019-10-03-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
- Fix DP-MST crtc_mask
- Fix dsc dpp calculations
- Fix g4x sprite scaling stride check with GTT remapping
Signed-off-by: Dave Airlie <[email protected]>
From: Rodrigo Vivi <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_display.h')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index e57e6969051d..01fa87ad3270 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -414,7 +414,7 @@ enum phy_fia { void intel_link_compute_m_n(u16 bpp, int nlanes, int pixel_clock, int link_clock, struct intel_link_m_n *m_n, - bool constant_n); + bool constant_n, bool fec_enable); bool is_ccs_modifier(u64 modifier); void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv); u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, |