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

Merge tag 'drm-fixes-2022-07-01' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Bit quieter this week, the main thing is it pulls in the fixes for the
  sysfb resource issue you were seeing. these had been queued for next
  so should have had some decent testing.

  Otherwise amdgpu, i915 and msm each have a few fixes, and vc4 has one.

  fbdev:
   - sysfb fixes/conflicting fb fixes

  amdgpu:
   - GPU recovery fix

   - Fix integer type usage in fourcc header for AMD modifiers

   - KFD TLB flush fix for gfx9 APUs

   - Display fix

  i915:
   - Fix ioctl argument error return

   - Fix d3cold disable to allow PCI upstream bridge D3 transition

   - Fix setting cache_dirty for dma-buf objects on discrete

  msm:
   - Fix to increment vsync_cnt before calling drm_crtc_handle_vblank so
     that userspace sees the value *after* it is incremented if waiting
     for vblank events

   - Fix to reset drm_dev to NULL in dp_display_unbind to avoid a crash
     in probe/bind error paths

   - Fix to resolve the smatch error of de-referencing before NULL check
     in dpu_encoder_phys_wb.c

   - Fix error return to userspace if fence-id allocation fails in
     submit ioctl

  vc4:
   - NULL ptr dereference fix"

* tag 'drm-fixes-2022-07-01' of git://anongit.freedesktop.org/drm/drm:
  Revert "drm/amdgpu/display: set vblank_disable_immediate for DC"
  drm/amdgpu: To flush tlb for MMHUB of RAVEN series
  drm/fourcc: fix integer type usage in uapi header
  drm/amdgpu: fix adev variable used in amdgpu_device_gpu_recover()
  fbdev: Disable sysfb device registration when removing conflicting FBs
  firmware: sysfb: Add sysfb_disable() helper function
  firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer
  drm/msm/gem: Fix error return on fence id alloc fail
  drm/i915: tweak the ordering in cpu_write_needs_clflush
  drm/i915/dgfx: Disable d3cold at gfx root port
  drm/i915/gem: add missing else
  drm/vc4: perfmon: Fix variable dereferenced before check
  drm/msm/dpu: Fix variable dereferenced before check
  drm/msm/dp: reset drm_dev to NULL at dp_display_unbind()
  drm/msm/dpu: Increment vsync_cnt before waking up userspace
parents 5e837935 b8f0009b

Documentation/driver-api/firmware/other_interfaces.rst

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ EDD Interfaces 
.. kernel-doc:: drivers/firmware/edd.c

   :internal:



Generic System Framebuffers Interface

-------------------------------------



.. kernel-doc:: drivers/firmware/sysfb.c

   :export:



Intel Stratix10 SoC Service Layer

---------------------------------

Some features of the Intel Stratix10 SoC require a level of privilege

drivers/firmware/sysfb.c

+50 −8
Original line number Diff line number Diff line
@@ -34,21 +34,59 @@ 
#include <linux/screen_info.h>

#include <linux/sysfb.h>



static struct platform_device *pd;

static DEFINE_MUTEX(disable_lock);

static bool disabled;



static bool sysfb_unregister(void)

{

	if (IS_ERR_OR_NULL(pd))

		return false;



	platform_device_unregister(pd);

	pd = NULL;



	return true;

}



/**

 * sysfb_disable() - disable the Generic System Framebuffers support

 *

 * This disables the registration of system framebuffer devices that match the

 * generic drivers that make use of the system framebuffer set up by firmware.

 *

 * It also unregisters a device if this was already registered by sysfb_init().

 *

 * Context: The function can sleep. A @disable_lock mutex is acquired to serialize

 *          against sysfb_init(), that registers a system framebuffer device.

 */

void sysfb_disable(void)

{

	mutex_lock(&disable_lock);

	sysfb_unregister();

	disabled = true;

	mutex_unlock(&disable_lock);

}

EXPORT_SYMBOL_GPL(sysfb_disable);



static __init int sysfb_init(void)

{

	struct screen_info *si = &screen_info;

	struct simplefb_platform_data mode;

	struct platform_device *pd;

	const char *name;

	bool compatible;

	int ret;

	int ret = 0;



	mutex_lock(&disable_lock);

	if (disabled)

		goto unlock_mutex;



	/* try to create a simple-framebuffer device */

	compatible = sysfb_parse_mode(si, &mode);

	if (compatible) {

		ret = sysfb_create_simplefb(si, &mode);

		if (!ret)

			return 0;

		pd = sysfb_create_simplefb(si, &mode);

		if (!IS_ERR(pd))

			goto unlock_mutex;

	}



	/* if the FB is incompatible, create a legacy framebuffer device */
@@ -60,8 +98,10 @@ static __init int sysfb_init(void) 
		name = "platform-framebuffer";



	pd = platform_device_alloc(name, 0);

	if (!pd)

		return -ENOMEM;

	if (!pd) {

		ret = -ENOMEM;

		goto unlock_mutex;

	}



	sysfb_apply_efi_quirks(pd);
@@ -73,9 +113,11 @@ static __init int sysfb_init(void) 
	if (ret)

		goto err;



	return 0;

	goto unlock_mutex;

err:

	platform_device_put(pd);

unlock_mutex:

	mutex_unlock(&disable_lock);

	return ret;

}

drivers/firmware/sysfb_simplefb.c

+8 −8
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ __init bool sysfb_parse_mode(const struct screen_info *si, 
	return false;

}



__init int sysfb_create_simplefb(const struct screen_info *si,

__init struct platform_device *sysfb_create_simplefb(const struct screen_info *si,

						     const struct simplefb_platform_data *mode)

{

	struct platform_device *pd;
@@ -76,7 +76,7 @@ __init int sysfb_create_simplefb(const struct screen_info *si, 
		base |= (u64)si->ext_lfb_base << 32;

	if (!base || (u64)(resource_size_t)base != base) {

		printk(KERN_DEBUG "sysfb: inaccessible VRAM base\n");

		return -EINVAL;

		return ERR_PTR(-EINVAL);

	}



	/*
@@ -93,7 +93,7 @@ __init int sysfb_create_simplefb(const struct screen_info *si, 
	length = mode->height * mode->stride;

	if (length > size) {

		printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n");

		return -EINVAL;

		return ERR_PTR(-EINVAL);

	}

	length = PAGE_ALIGN(length);
@@ -104,11 +104,11 @@ __init int sysfb_create_simplefb(const struct screen_info *si, 
	res.start = base;

	res.end = res.start + length - 1;

	if (res.end <= res.start)

		return -EINVAL;

		return ERR_PTR(-EINVAL);



	pd = platform_device_alloc("simple-framebuffer", 0);

	if (!pd)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);



	sysfb_apply_efi_quirks(pd);
@@ -124,10 +124,10 @@ __init int sysfb_create_simplefb(const struct screen_info *si, 
	if (ret)

		goto err_put_device;



	return 0;

	return pd;



err_put_device:

	platform_device_put(pd);



	return ret;

	return ERR_PTR(ret);

}

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

+2 −1
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
{

	bool all_hub = false;



	if (adev->family == AMDGPU_FAMILY_AI)

	if (adev->family == AMDGPU_FAMILY_AI ||

	    adev->family == AMDGPU_FAMILY_RV)

		all_hub = true;



	return amdgpu_gmc_flush_gpu_tlb_pasid(adev, pasid, flush_type, all_hub);

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

+1 −1
Original line number Diff line number Diff line
@@ -5164,7 +5164,7 @@ int amdgpu_device_gpu_recover_imp(struct amdgpu_device *adev, 
		 */

		amdgpu_unregister_gpu_instance(tmp_adev);



		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(tmp_adev)->fb_helper, true);



		/* disable ras on ALL IPs */

		if (!need_emergency_restart &&