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

Commit 6107cc58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Intel, nouveau, rockchip, vmwgfx, imx, meson, mediatek and core fixes.

  Bit more spread out fixes this time, fixes for 7 drivers + a couple of
  core fixes.

  i915 and vmwgfx are the main ones. The vmwgfx ones fix a bunch of
  regressions in their atomic rework, and a few fixes destined for
  stable. i915 has some 4.12 regressions and older things that need to
  be fixed in stable as well.

  nouveau also has some runtime pm fixes and a timer list handling fix,
  otherwise a couple of core and small driver regression fixes"

* tag 'drm-fixes-for-v4.12-rc5' of git://people.freedesktop.org/~airlied/linux: (37 commits)
  drm/i915: fix warning for unused variable
  drm/meson: Fix driver bind when only CVBS is available
  drm/i915: Fix 90/270 rotated coordinates for FBC
  drm/i915: Restore has_fbc=1 for ILK-M
  drm/i915: Workaround VLV/CHV DSI scanline counter hardware fail
  drm/i915: Fix logical inversion for gen4 quirking
  drm/i915: Guard against i915_ggtt_disable_guc() being invoked unconditionally
  drm/i915: Always recompute watermarks when distrust_bios_wm is set, v2.
  drm/i915: Prevent the system suspend complete optimization
  drm/i915/psr: disable psr2 for resolution greater than 32X20
  drm/i915: Hold a wakeref for probing the ring registers
  drm/i915: Short-circuit i915_gem_wait_for_idle() if already idle
  drm/i915: Disable decoupled MMIO
  drm/i915/guc: Remove stale comment for q_fail
  drm/vmwgfx: Bump driver minor and date
  drm/vmwgfx: Remove unused legacy cursor functions
  drm/vmwgfx: fix spelling mistake "exeeds" -> "exceeds"
  drm/vmwgfx: Fix large topology crash
  drm/vmwgfx: Make sure to update STDU when FB is updated
  drm/vmwgfx: Make sure backup_handle is always valid
  ...
parents eb4125df 6e88007e

drivers/gpu/drm/drm_atomic_helper.c

+11 −0
Original line number Diff line number Diff line
@@ -508,6 +508,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
		bool has_connectors =

			!!new_crtc_state->connector_mask;



		WARN_ON(!drm_modeset_is_locked(&crtc->mutex));



		if (!drm_mode_equal(&old_crtc_state->mode, &new_crtc_state->mode)) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] mode changed\n",

					 crtc->base.id, crtc->name);
@@ -551,6 +553,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
	for_each_oldnew_connector_in_state(state, connector, old_connector_state, new_connector_state, i) {

		const struct drm_connector_helper_funcs *funcs = connector->helper_private;



		WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));



		/*

		 * This only sets crtc->connectors_changed for routing changes,

		 * drivers must set crtc->connectors_changed themselves when
@@ -650,6 +654,8 @@ drm_atomic_helper_check_planes(struct drm_device *dev, 
	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {

		const struct drm_plane_helper_funcs *funcs;



		WARN_ON(!drm_modeset_is_locked(&plane->mutex));



		funcs = plane->helper_private;



		drm_atomic_helper_plane_changed(state, old_plane_state, new_plane_state, plane);
@@ -2663,7 +2669,12 @@ int drm_atomic_helper_resume(struct drm_device *dev, 


	drm_modeset_acquire_init(&ctx, 0);

	while (1) {

		err = drm_modeset_lock_all_ctx(dev, &ctx);

		if (err)

			goto out;



		err = drm_atomic_helper_commit_duplicated_state(state, &ctx);

out:

		if (err != -EDEADLK)

			break;

drivers/gpu/drm/drm_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -358,7 +358,12 @@ EXPORT_SYMBOL(drm_put_dev); 
void drm_unplug_dev(struct drm_device *dev)

{

	/* for a USB device */

	drm_dev_unregister(dev);

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		drm_modeset_unregister_all(dev);



	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);

	drm_minor_unregister(dev, DRM_MINOR_RENDER);

	drm_minor_unregister(dev, DRM_MINOR_CONTROL);



	mutex_lock(&drm_global_mutex);

drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) 
	 * Get the endpoint node. In our case, dsi has one output port1

	 * to which the external HDMI bridge is connected.

	 */

	ret = drm_of_find_panel_or_bridge(np, 0, 0, NULL, &dsi->bridge);

	ret = drm_of_find_panel_or_bridge(np, 1, 0, NULL, &dsi->bridge);

	if (ret)

		return ret;

drivers/gpu/drm/i915/i915_drv.c

+9 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,15 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_fini;



	pci_set_drvdata(pdev, &dev_priv->drm);

	/*

	 * Disable the system suspend direct complete optimization, which can

	 * leave the device suspended skipping the driver's suspend handlers

	 * if the device was already runtime suspended. This is needed due to

	 * the difference in our runtime and system suspend sequence and

	 * becaue the HDA driver may require us to enable the audio power

	 * domain during system suspend.

	 */

	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;



	ret = i915_driver_init_early(dev_priv, ent);

	if (ret < 0)

drivers/gpu/drm/i915/i915_drv.h

+10 −0
Original line number Diff line number Diff line
@@ -2991,6 +2991,16 @@ static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) 
	return false;

}



static inline bool

intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)

{

#ifdef CONFIG_INTEL_IOMMU

	if (IS_BROXTON(dev_priv) && intel_iommu_gfx_mapped)

		return true;

#endif

	return false;

}



int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,

				int enable_ppgtt);