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

Commit 6357c812 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2019-03-01' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Three final fixes, one for a feature that is new in this kernel, one
  bochs fix for qemu riscv and one atomic modesetting fix.

  I've left a few of the other late fixes until next as I didn't want to
  throw in anything that wasn't really necessary"

* tag 'drm-fixes-2019-03-01' of git://anongit.freedesktop.org/drm/drm:
  drm/bochs: Fix the ID mismatch error
  drm: Block fb changes for async plane updates
  drm/amd/display: Use vrr friendly pageflip throttling in DC.
parents bf23aba1 17fb465f

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ struct amdgpu_crtc { 
	struct amdgpu_flip_work *pflip_works;

	enum amdgpu_flip_status pflip_status;

	int deferred_flip_completion;

	u64 last_flip_vblank;

	/* pll sharing */

	struct amdgpu_atom_ss ss;

	bool ss_enabled;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+23 −4
Original line number Diff line number Diff line
@@ -303,12 +303,11 @@ static void dm_pflip_high_irq(void *interrupt_params) 
		return;

	}



	/* Update to correct count(s) if racing with vblank irq */

	amdgpu_crtc->last_flip_vblank = drm_crtc_accurate_vblank_count(&amdgpu_crtc->base);



	/* wake up userspace */

	if (amdgpu_crtc->event) {

		/* Update to correct count(s) if racing with vblank irq */

		drm_crtc_accurate_vblank_count(&amdgpu_crtc->base);



		drm_crtc_send_vblank_event(&amdgpu_crtc->base, amdgpu_crtc->event);



		/* page flip completed. clean up */
@@ -4828,6 +4827,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			to_dm_crtc_state(drm_atomic_get_old_crtc_state(state, pcrtc));

	int planes_count = 0;

	unsigned long flags;

	u64 last_flip_vblank;

	bool vrr_active = acrtc_state->freesync_config.state == VRR_STATE_ACTIVE_VARIABLE;



	/* update planes when needed */

	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
@@ -4859,6 +4860,16 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			/* In commit tail framework this cannot happen */

			WARN_ON(1);

		}



		/* For variable refresh rate mode only:

		 * Get vblank of last completed flip to avoid > 1 vrr flips per

		 * video frame by use of throttling, but allow flip programming

		 * anywhere in the possibly large variable vrr vblank interval

		 * for fine-grained flip timing control and more opportunity to

		 * avoid stutter on late submission of amdgpu_dm_do_flip() calls.

		 */

		last_flip_vblank = acrtc_attach->last_flip_vblank;



		spin_unlock_irqrestore(&crtc->dev->event_lock, flags);



		if (!pflip_needed || plane->type == DRM_PLANE_TYPE_OVERLAY) {
@@ -4882,10 +4893,18 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			if (plane->type == DRM_PLANE_TYPE_PRIMARY)

				drm_crtc_vblank_get(crtc);



			/* Use old throttling in non-vrr fixed refresh rate mode

			 * to keep flip scheduling based on target vblank counts

			 * working in a backwards compatible way, e.g., clients

			 * using GLX_OML_sync_control extension.

			 */

			if (!vrr_active)

				last_flip_vblank = drm_crtc_vblank_count(crtc);



			amdgpu_dm_do_flip(

				crtc,

				fb,

				(uint32_t)drm_crtc_vblank_count(crtc) + *wait_for_vblank,

				(uint32_t) last_flip_vblank + *wait_for_vblank,

				dc_state);

		}

drivers/gpu/drm/bochs/bochs_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ static int bochs_pci_probe(struct pci_dev *pdev, 
	if (IS_ERR(dev))

		return PTR_ERR(dev);



	ret = pci_enable_device(pdev);

	if (ret)

		goto err_free_dev;



	dev->pdev = pdev;

	pci_set_drvdata(pdev, dev);

drivers/gpu/drm/drm_atomic_helper.c

+9 −0
Original line number Diff line number Diff line
@@ -1602,6 +1602,15 @@ int drm_atomic_helper_async_check(struct drm_device *dev, 
	    old_plane_state->crtc != new_plane_state->crtc)

		return -EINVAL;



	/*

	 * FIXME: Since prepare_fb and cleanup_fb are always called on

	 * the new_plane_state for async updates we need to block framebuffer

	 * changes. This prevents use of a fb that's been cleaned up and

	 * double cleanups from occuring.

	 */

	if (old_plane_state->fb != new_plane_state->fb)

		return -EINVAL;



	funcs = plane->helper_private;

	if (!funcs->atomic_async_update)

		return -EINVAL;