diff options
author | Dave Airlie <airlied@redhat.com> | 2018-08-16 19:26:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-08-16 20:33:48 -0400 |
commit | 0258d7a5e261b3ce0d730f6f8f66f833058ce2b6 (patch) | |
tree | e7f369d5cffca2151284715f98501842694e18eb /drivers/gpu/drm/i915/intel_ddi.c | |
parent | 637319c67849baceea6ba466e62b70f9e674d85b (diff) | |
parent | 4795ac626a2fe5ce99ff788080ace343faf4c886 (diff) |
Merge tag 'drm-intel-next-fixes-2018-08-16-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Fixes for:
- DP full color range.
- selftest for gem_object
- forcewake on suspend
- GPU reset
This also include accumulated fixes from GVT:
- Fix an error code in gvt_dma_map_page() (Dan)
- Fix off by one error in intel_vgpu_write_fence() (Dan)
- Fix potential Spectre v1 (Gustavo)
- Fix workload free in vgpu release (Henry)
- Fix cleanup sequence in intel_gvt_clean_device (Henry)
- dmabuf mutex init place fix (Henry)
- possible memory leak in intel_vgpu_ioctl() err path (Yi)
- return error on cmd access check failure (Yan)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180816190335.GA7765@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 39d66f8493fa..8761513f3532 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c | |||
@@ -1685,6 +1685,10 @@ void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state) | |||
1685 | WARN_ON(transcoder_is_dsi(cpu_transcoder)); | 1685 | WARN_ON(transcoder_is_dsi(cpu_transcoder)); |
1686 | 1686 | ||
1687 | temp = TRANS_MSA_SYNC_CLK; | 1687 | temp = TRANS_MSA_SYNC_CLK; |
1688 | |||
1689 | if (crtc_state->limited_color_range) | ||
1690 | temp |= TRANS_MSA_CEA_RANGE; | ||
1691 | |||
1688 | switch (crtc_state->pipe_bpp) { | 1692 | switch (crtc_state->pipe_bpp) { |
1689 | case 18: | 1693 | case 18: |
1690 | temp |= TRANS_MSA_6_BPC; | 1694 | temp |= TRANS_MSA_6_BPC; |