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

Commit 311ac00d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more drm updates from Dave Airlie:
 "i915, amd and some core fixes + mediatek color support.

  Some fixes tree came in since the main pull request for rc1, primarily
  i915 and drm-misc and one amd fix. The drm core vblank regression fix
  is probably the most important thing.

  I've also added the mediatek feature pull, it wasn't that big and
  didn't look like it would have any impact outside of mediatek, in fact
  it looks to just be a single feature, and some cleanups"

* tag 'drm-fixes-for-v4.13-rc1' of git://people.freedesktop.org/~airlied/linux: (31 commits)
  drm/i915: Make DP-MST connector info work
  drm/i915/gvt: Use fence error from GVT request for workload status
  drm/i915/gvt: remove scheduler_mutex in per-engine workload_thread
  drm/i915/gvt: Revert "drm/i915/gvt: Fix possible recursive locking issue"
  drm/i915/gvt: Audit the command buffer address
  drm/i915/gvt: Fix a memory leak in intel_gvt_init_gtt()
  drm/rockchip: fix NULL check on devm_kzalloc() return value
  drm/i915/fbdev: Check for existence of ifbdev->vma before operations
  drm/radeon: Fix eDP for single-display iMac10,1 (v2)
  drm/i915: Hold RPM wakelock while initializing OA buffer
  drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming
  drm/i915/cfl: Fix Workarounds.
  drm/i915: Avoid undefined behaviour of "u32 >> 32"
  drm/i915: reintroduce VLV/CHV PFI programming power domain workaround
  drm/i915: Fix an error checking test
  drm/i915: Disable MSI for all pre-gen5
  drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb
  drm: vblank: Fix vblank timestamp update
  drm/i915/gvt: Make function dpy_reg_mmio_readx safe
  drm/mediatek: separate color module to fixup error memory reallocation
  ...
parents 266530b3 6419ec78

drivers/gpu/drm/bridge/panel.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel, 
	int ret;



	if (!panel)

		return ERR_PTR(EINVAL);

		return ERR_PTR(-EINVAL);



	panel_bridge = devm_kzalloc(panel->dev, sizeof(*panel_bridge),

				    GFP_KERNEL);

drivers/gpu/drm/drm_framebuffer.c

+1 −0
Original line number Diff line number Diff line
@@ -832,6 +832,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb) 
		drm_atomic_clean_old_fb(dev, plane_mask, ret);



	if (ret == -EDEADLK) {

		drm_atomic_state_clear(state);

		drm_modeset_backoff(&ctx);

		goto retry;

	}

drivers/gpu/drm/drm_vblank.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe, 
	 * Otherwise reinitialize delayed at next vblank interrupt and assign 0

	 * for now, to mark the vblanktimestamp as invalid.

	 */

	if (!rc && in_vblank_irq)

	if (!rc && !in_vblank_irq)

		t_vblank = (struct timeval) {0, 0};



	store_vblank(dev, pipe, diff, &t_vblank, cur_vblank);

drivers/gpu/drm/i915/gvt/cmd_parser.c

+10 −0
Original line number Diff line number Diff line
@@ -2536,6 +2536,11 @@ static int scan_workload(struct intel_vgpu_workload *workload) 
		gma_head == gma_tail)

		return 0;



	if (!intel_gvt_ggtt_validate_range(s.vgpu, s.ring_start, s.ring_size)) {

		ret = -EINVAL;

		goto out;

	}



	ret = ip_gma_set(&s, gma_head);

	if (ret)

		goto out;
@@ -2579,6 +2584,11 @@ static int scan_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) 
	s.rb_va = wa_ctx->indirect_ctx.shadow_va;

	s.workload = workload;



	if (!intel_gvt_ggtt_validate_range(s.vgpu, s.ring_start, s.ring_size)) {

		ret = -EINVAL;

		goto out;

	}



	ret = ip_gma_set(&s, gma_head);

	if (ret)

		goto out;

drivers/gpu/drm/i915/gvt/display.c

+22 −0
Original line number Diff line number Diff line
@@ -197,6 +197,12 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) 
			(TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |

			(PORT_B << TRANS_DDI_PORT_SHIFT) |

			TRANS_DDI_FUNC_ENABLE);

		if (IS_BROADWELL(dev_priv)) {

			vgpu_vreg(vgpu, PORT_CLK_SEL(PORT_B)) &=

				~PORT_CLK_SEL_MASK;

			vgpu_vreg(vgpu, PORT_CLK_SEL(PORT_B)) |=

				PORT_CLK_SEL_LCPLL_810;

		}

		vgpu_vreg(vgpu, DDI_BUF_CTL(PORT_B)) |= DDI_BUF_CTL_ENABLE;

		vgpu_vreg(vgpu, DDI_BUF_CTL(PORT_B)) &= ~DDI_BUF_IS_IDLE;

		vgpu_vreg(vgpu, SDEISR) |= SDE_PORTB_HOTPLUG_CPT;
@@ -211,6 +217,12 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) 
			(TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |

			(PORT_C << TRANS_DDI_PORT_SHIFT) |

			TRANS_DDI_FUNC_ENABLE);

		if (IS_BROADWELL(dev_priv)) {

			vgpu_vreg(vgpu, PORT_CLK_SEL(PORT_C)) &=

				~PORT_CLK_SEL_MASK;

			vgpu_vreg(vgpu, PORT_CLK_SEL(PORT_C)) |=

				PORT_CLK_SEL_LCPLL_810;

		}

		vgpu_vreg(vgpu, DDI_BUF_CTL(PORT_C)) |= DDI_BUF_CTL_ENABLE;

		vgpu_vreg(vgpu, DDI_BUF_CTL(PORT_C)) &= ~DDI_BUF_IS_IDLE;

		vgpu_vreg(vgpu, SFUSE_STRAP) |= SFUSE_STRAP_DDIC_DETECTED;
@@ -225,6 +237,12 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) 
			(TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |

			(PORT_D << TRANS_DDI_PORT_SHIFT) |

			TRANS_DDI_FUNC_ENABLE);

		if (IS_BROADWELL(dev_priv)) {

			vgpu_vreg(vgpu, PORT_CLK_SEL(PORT_D)) &=

				~PORT_CLK_SEL_MASK;

			vgpu_vreg(vgpu, PORT_CLK_SEL(PORT_D)) |=

				PORT_CLK_SEL_LCPLL_810;

		}

		vgpu_vreg(vgpu, DDI_BUF_CTL(PORT_D)) |= DDI_BUF_CTL_ENABLE;

		vgpu_vreg(vgpu, DDI_BUF_CTL(PORT_D)) &= ~DDI_BUF_IS_IDLE;

		vgpu_vreg(vgpu, SFUSE_STRAP) |= SFUSE_STRAP_DDID_DETECTED;
@@ -244,6 +262,10 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) 


		vgpu_vreg(vgpu, DDI_BUF_CTL(PORT_A)) |= DDI_INIT_DISPLAY_DETECTED;

	}



	/* Clear host CRT status, so guest couldn't detect this host CRT. */

	if (IS_BROADWELL(dev_priv))

		vgpu_vreg(vgpu, PCH_ADPA) &= ~ADPA_CRT_HOTPLUG_MONITOR_MASK;

}



static void clean_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num)