Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db96d585 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.12-rc6' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "This is the main fixes pull for 4.12-rc6, all pretty normal for this
  stage, nothing really stands out. The mxsfb one is probably the
  largest and it's for a black screen boot problem.

  AMD, i915, mgag200, msxfb, tegra fixes"

* tag 'drm-fixes-for-v4.12-rc6' of git://people.freedesktop.org/~airlied/linux:
  drm: mxsfb_crtc: Reset the eLCDIF controller
  drm/mgag200: Fix to always set HiPri for G200e4 V2
  drm/tegra: Correct idr_alloc() minimum id
  drm/tegra: Fix lockup on a use of staging API
  gpu: host1x: Fix error handling
  drm/radeon: Fix overflow of watermark calcs at > 4k resolutions.
  drm/amdgpu: Fix overflow of watermark calcs at > 4k resolutions.
  drm/radeon: fix "force the UVD DPB into VRAM as well"
  drm/i915: Fix GVT-g PVINFO version compatibility check
  drm/i915: Fix SKL+ watermarks for 90/270 rotation
  drm/i915: Fix scaling check for 90/270 degree plane rotation
  drm: dw-hdmi: Fix compilation breakage by selecting REGMAP_MMIO
parents 51ce5f33 7119dbdf

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+5 −2
Original line number Diff line number Diff line
@@ -1207,8 +1207,11 @@ static void dce_v10_0_program_watermarks(struct amdgpu_device *adev, 
	u32 tmp, wm_mask, lb_vblank_lead_lines = 0;



	if (amdgpu_crtc->base.enabled && num_heads && mode) {

		active_time = 1000000UL * (u32)mode->crtc_hdisplay / (u32)mode->clock;

		line_time = min((u32) (1000000UL * (u32)mode->crtc_htotal / (u32)mode->clock), (u32)65535);

		active_time = (u32) div_u64((u64)mode->crtc_hdisplay * 1000000,

					    (u32)mode->clock);

		line_time = (u32) div_u64((u64)mode->crtc_htotal * 1000000,

					  (u32)mode->clock);

		line_time = min(line_time, (u32)65535);



		/* watermark for high clocks */

		if (adev->pm.dpm_enabled) {

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+5 −2
Original line number Diff line number Diff line
@@ -1176,8 +1176,11 @@ static void dce_v11_0_program_watermarks(struct amdgpu_device *adev, 
	u32 tmp, wm_mask, lb_vblank_lead_lines = 0;



	if (amdgpu_crtc->base.enabled && num_heads && mode) {

		active_time = 1000000UL * (u32)mode->crtc_hdisplay / (u32)mode->clock;

		line_time = min((u32) (1000000UL * (u32)mode->crtc_htotal / (u32)mode->clock), (u32)65535);

		active_time = (u32) div_u64((u64)mode->crtc_hdisplay * 1000000,

					    (u32)mode->clock);

		line_time = (u32) div_u64((u64)mode->crtc_htotal * 1000000,

					  (u32)mode->clock);

		line_time = min(line_time, (u32)65535);



		/* watermark for high clocks */

		if (adev->pm.dpm_enabled) {

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

+5 −2
Original line number Diff line number Diff line
@@ -983,8 +983,11 @@ static void dce_v6_0_program_watermarks(struct amdgpu_device *adev, 
	fixed20_12 a, b, c;



	if (amdgpu_crtc->base.enabled && num_heads && mode) {

		active_time = 1000000UL * (u32)mode->crtc_hdisplay / (u32)mode->clock;

		line_time = min((u32) (1000000UL * (u32)mode->crtc_htotal / (u32)mode->clock), (u32)65535);

		active_time = (u32) div_u64((u64)mode->crtc_hdisplay * 1000000,

					    (u32)mode->clock);

		line_time = (u32) div_u64((u64)mode->crtc_htotal * 1000000,

					  (u32)mode->clock);

		line_time = min(line_time, (u32)65535);

		priority_a_cnt = 0;

		priority_b_cnt = 0;

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+5 −2
Original line number Diff line number Diff line
@@ -1091,8 +1091,11 @@ static void dce_v8_0_program_watermarks(struct amdgpu_device *adev, 
	u32 tmp, wm_mask, lb_vblank_lead_lines = 0;



	if (amdgpu_crtc->base.enabled && num_heads && mode) {

		active_time = 1000000UL * (u32)mode->crtc_hdisplay / (u32)mode->clock;

		line_time = min((u32) (1000000UL * (u32)mode->crtc_htotal / (u32)mode->clock), (u32)65535);

		active_time = (u32) div_u64((u64)mode->crtc_hdisplay * 1000000,

					    (u32)mode->clock);

		line_time = (u32) div_u64((u64)mode->crtc_htotal * 1000000,

					  (u32)mode->clock);

		line_time = min(line_time, (u32)65535);



		/* watermark for high clocks */

		if (adev->pm.dpm_enabled) {

drivers/gpu/drm/bridge/synopsys/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DRM_DW_HDMI

	tristate

	select DRM_KMS_HELPER

	select REGMAP_MMIO



config DRM_DW_HDMI_AHB_AUDIO

	tristate "Synopsys Designware AHB Audio interface"