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

Commit f073d78e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 

Driver Changes:

- Lift alpha_support protection from Cannonlake (Rodrigo)
	* Meaning the driver should mostly work for the hardware we had
	  at our disposal when testing
	* Used to be preliminary_hw_support
- Add missing Cannonlake PCI device ID of 0x5A4C (Rodrigo)
- Cannonlake port register fix (Mahesh)

- Fix Dell Venue 8 Pro black screen after modeset (Hans)
- Fix for always returning zero out-fence from execbuf (Daniele)
- Fix HDMI audio when no no relevant video output is active (Jani)
- Fix memleak of VBT data on driver_unload (Hans)

- Fix for KASAN found locking issue (Maarten)
- RCU barrier consolidation to improve igt/gem_sync/idle (Chris)
- Optimizations to IRQ handlers (Chris)
- vblank tracking improvements (64-bit resolution, PM) (Dhinakaran)
- Pipe select bit corrections (Ville)
- Reduce runtime computed device_info fields (Chris)
- Tune down some WARN_ONs to GEM_BUG_ON now that CI has good coverage (Chris)
- A bunch of kerneldoc warning fixes (Chris)

* tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-intel: (113 commits)
  drm/i915: Update DRIVER_DATE to 20180221
  drm/i915/fbc: Use PLANE_HAS_FENCE to determine if the plane is fenced
  drm/i915/fbdev: Use the PLANE_HAS_FENCE flags from the time of pinning
  drm/i915: Move the policy for placement of the GGTT vma into the caller
  drm/i915: Also check view->type for a normal GGTT view
  drm/i915: Drop WaDoubleCursorLP3Latency:ivb
  drm/i915: Set the primary plane pipe select bits on gen4
  drm/i915: Don't set cursor pipe select bits on g4x+
  drm/i915: Assert that we don't overflow frontbuffer tracking bits
  drm/i915: Track number of pending freed objects
  drm/i915/: Initialise trans_min for skl_compute_transition_wm()
  drm/i915: Clear the in-use marker on execbuf failure
  drm/i915: Prune gen8_gt_irq_handler
  drm/i915: Track GT interrupt handling using the master iir
  drm/i915: Remove WARN_ONCE for failing to pm_runtime_if_in_use
  drm: intel_dpio_phy: fix kernel-doc comments at nested struct
  drm/i915: Release connector iterator on a digital port conflict.
  drm/i915/execlists: Remove too early assert
  drm/i915: Assert that we always complete a submission to guc/execlists
  drm: move read_domains and write_domain into i915
  ...
parents 0feeb106 fed81658

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
	amdgpu_bo_unreserve(new_abo);



	work->base = base;

	work->target_vblank = target - drm_crtc_vblank_count(crtc) +

	work->target_vblank = target - (uint32_t)drm_crtc_vblank_count(crtc) +

		amdgpu_get_vblank_counter_kms(dev, work->crtc_id);



	/* we borrow the event spin lock for protecting flip_wrok */

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

+2 −2
Original line number Diff line number Diff line
@@ -3842,7 +3842,7 @@ static void amdgpu_dm_do_flip(struct drm_crtc *crtc, 




	/* Prepare wait for target vblank early - before the fence-waits */

	target_vblank = target - drm_crtc_vblank_count(crtc) +

	target_vblank = target - (uint32_t)drm_crtc_vblank_count(crtc) +

			amdgpu_get_vblank_counter_kms(crtc->dev, acrtc->crtc_id);



	/* TODO This might fail and hence better not used, wait
@@ -3988,7 +3988,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			amdgpu_dm_do_flip(

				crtc,

				fb,

				drm_crtc_vblank_count(crtc) + *wait_for_vblank,

				(uint32_t)drm_crtc_vblank_count(crtc) + *wait_for_vblank,

				dm_state->context);

		}

drivers/gpu/drm/drm_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
		if (r)

			return r;



		current_vblank = drm_crtc_vblank_count(crtc);

		current_vblank = (u32)drm_crtc_vblank_count(crtc);



		switch (page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET) {

		case DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE:

drivers/gpu/drm/drm_vblank.c

+73 −12
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe, 
	store_vblank(dev, pipe, diff, t_vblank, cur_vblank);

}



static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)

static u64 drm_vblank_count(struct drm_device *dev, unsigned int pipe)

{

	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
@@ -292,11 +292,11 @@ static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe) 
 * This is mostly useful for hardware that can obtain the scanout position, but

 * doesn't have a hardware frame counter.

 */

u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)

u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	unsigned int pipe = drm_crtc_index(crtc);

	u32 vblank;

	u64 vblank;

	unsigned long flags;



	WARN_ONCE(drm_debug & DRM_UT_VBL && !dev->driver->get_vblank_timestamp,
@@ -347,23 +347,25 @@ void drm_vblank_disable_and_save(struct drm_device *dev, unsigned int pipe) 
	spin_lock_irqsave(&dev->vblank_time_lock, irqflags);



	/*

	 * Only disable vblank interrupts if they're enabled. This avoids

	 * calling the ->disable_vblank() operation in atomic context with the

	 * hardware potentially runtime suspended.

	 * Update vblank count and disable vblank interrupts only if the

	 * interrupts were enabled. This avoids calling the ->disable_vblank()

	 * operation in atomic context with the hardware potentially runtime

	 * suspended.

	 */

	if (vblank->enabled) {

		__disable_vblank(dev, pipe);

		vblank->enabled = false;

	}

	if (!vblank->enabled)

		goto out;



	/*

	 * Always update the count and timestamp to maintain the

	 * Update the count and timestamp to maintain the

	 * appearance that the counter has been ticking all along until

	 * this time. This makes the count account for the entire time

	 * between drm_crtc_vblank_on() and drm_crtc_vblank_off().

	 */

	drm_update_vblank_count(dev, pipe, false);

	__disable_vblank(dev, pipe);

	vblank->enabled = false;



out:

	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);

}
@@ -1055,7 +1057,7 @@ void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe) 
{

	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];

	int ret;

	u32 last;

	u64 last;



	if (WARN_ON(pipe >= dev->num_crtcs))

		return;
@@ -1235,6 +1237,65 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc) 
}

EXPORT_SYMBOL(drm_crtc_vblank_on);



/**

 * drm_vblank_restore - estimated vblanks using timestamps and update it.

 *

 * Power manamement features can cause frame counter resets between vblank

 * disable and enable. Drivers can then use this function in their

 * &drm_crtc_funcs.enable_vblank implementation to estimate the vblanks since

 * the last &drm_crtc_funcs.disable_vblank.

 *

 * This function is the legacy version of drm_crtc_vblank_restore().

 */

void drm_vblank_restore(struct drm_device *dev, unsigned int pipe)

{

	ktime_t t_vblank;

	struct drm_vblank_crtc *vblank;

	int framedur_ns;

	u64 diff_ns;

	u32 cur_vblank, diff = 1;

	int count = DRM_TIMESTAMP_MAXRETRIES;



	if (WARN_ON(pipe >= dev->num_crtcs))

		return;



	assert_spin_locked(&dev->vbl_lock);

	assert_spin_locked(&dev->vblank_time_lock);



	vblank = &dev->vblank[pipe];

	WARN_ONCE((drm_debug & DRM_UT_VBL) && !vblank->framedur_ns,

		  "Cannot compute missed vblanks without frame duration\n");

	framedur_ns = vblank->framedur_ns;



	do {

		cur_vblank = __get_vblank_counter(dev, pipe);

		drm_get_last_vbltimestamp(dev, pipe, &t_vblank, false);

	} while (cur_vblank != __get_vblank_counter(dev, pipe) && --count > 0);



	diff_ns = ktime_to_ns(ktime_sub(t_vblank, vblank->time));

	if (framedur_ns)

		diff = DIV_ROUND_CLOSEST_ULL(diff_ns, framedur_ns);





	DRM_DEBUG_VBL("missed %d vblanks in %lld ns, frame duration=%d ns, hw_diff=%d\n",

		      diff, diff_ns, framedur_ns, cur_vblank - vblank->last);

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

}

EXPORT_SYMBOL(drm_vblank_restore);



/**

 * drm_crtc_vblank_restore - estimate vblanks using timestamps and update it.

 * Power manamement features can cause frame counter resets between vblank

 * disable and enable. Drivers can then use this function in their

 * &drm_crtc_funcs.enable_vblank implementation to estimate the vblanks since

 * the last &drm_crtc_funcs.disable_vblank.

 */

void drm_crtc_vblank_restore(struct drm_crtc *crtc)

{

	drm_vblank_restore(crtc->dev, drm_crtc_index(crtc));

}

EXPORT_SYMBOL(drm_crtc_vblank_restore);



static void drm_legacy_vblank_pre_modeset(struct drm_device *dev,

					  unsigned int pipe)

{

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ subdir-ccflags-y += $(call cc-disable-warning, unused-parameter) 
subdir-ccflags-y += $(call cc-disable-warning, type-limits)

subdir-ccflags-y += $(call cc-disable-warning, missing-field-initializers)

subdir-ccflags-y += $(call cc-disable-warning, implicit-fallthrough)

subdir-ccflags-y += $(call cc-disable-warning, unused-but-set-variable)

subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror



# Fine grained warnings disable