Commit 31462d9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2022-02-04' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular fixes for the week. Daniel has agreed to bring back the fbcon
  hw acceleration under a CONFIG option for the non-drm fbdev users, we
  don't advise turning this on unless you are in the niche that is old
  fbdev drivers, Since it's essentially a revert and shouldn't be high
  impact seemed like a good time to do it now.

  Otherwise, i915 and amdgpu fixes are most of it, along with some minor
  fixes elsewhere.

  fbdev:
   - readd fbcon acceleration

  i915:
   - fix DP monitor via type-c dock
   - fix for engine busyness and read timeout with GuC
   - use ALLOW_FAIL for error capture buffer allocs
   - don't use interruptible lock on error paths
   - smatch fix to reject zero sized overlays.

  amdgpu:
   - mGPU fan boost fix for beige goby
   - S0ix fixes
   - Cyan skillfish hang fix
   - DCN fixes for DCN 3.1
   - DCN fixes for DCN 3.01
   - Apple retina panel fix
   - ttm logic inversion fix

  dma-buf:
   - heaps: fix potential spectre v1 gadget

  kmb:
   - fix potential oob access

  mxsfb:
   - fix NULL ptr deref

  nouveau:
   - fix potential oob access during BIOS decode"

* tag 'drm-fixes-2022-02-04' of git://anongit.freedesktop.org/drm/drm: (24 commits)
  drm: mxsfb: Fix NULL pointer dereference
  drm/amdgpu: fix logic inversion in check
  drm/amd: avoid suspend on dGPUs w/ s2idle support when runtime PM enabled
  drm/amd/display: Force link_rate as LINK_RATE_RBR2 for 2018 15" Apple Retina panels
  drm/amd/display: revert "Reset fifo after enable otg"
  drm/amd/display: watermark latencies is not enough on DCN31
  drm/amd/display: Update watermark values for DCN301
  drm/amdgpu: fix a potential GPU hang on cyan skillfish
  drm/amd: Only run s3 or s0ix if system is configured properly
  drm/amd: add support to check whether the system is set to s3
  fbcon: Add option to enable legacy hardware acceleration
  Revert "fbcon: Disable accelerated scrolling"
  Revert "fbdev: Garbage collect fbdev scrolling acceleration, part 1 (from TODO list)"
  drm/i915/pmu: Fix KMD and GuC race on accessing busyness
  dma-buf: heaps: Fix potential spectre v1 gadget
  drm/amd: Warn users about potential s0ix problems
  drm/amd/pm: correct the MGpuFanBoost support for Beige Goby
  drm/nouveau: fix off by one in BIOS boundary checking
  drm/i915/adlp: Fix TypeC PHY-ready status readout
  drm/i915/pmu: Use PM timestamp instead of RING TIMESTAMP for reference
  ...
parents f9aaa5b0 9ca3d3cd

Documentation/gpu/todo.rst

+0 −24
Original line number Diff line number Diff line
@@ -300,30 +300,6 @@ Contact: Daniel Vetter, Noralf Tronnes 


Level: Advanced



Garbage collect fbdev scrolling acceleration

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



Scroll acceleration has been disabled in fbcon. Now it works as the old

SCROLL_REDRAW mode. A ton of code was removed in fbcon.c and the hook bmove was

removed from fbcon_ops.

Remaining tasks:



- a bunch of the hooks in fbcon_ops could be removed or simplified by calling

  directly instead of the function table (with a switch on p->rotate)



- fb_copyarea is unused after this, and can be deleted from all drivers



- after that, fb_copyarea can be deleted from fb_ops in include/linux/fb.h as

  well as cfb_copyarea



Note that not all acceleration code can be deleted, since clearing and cursor

support is still accelerated, which might be good candidates for further

deletion projects.



Contact: Daniel Vetter



Level: Intermediate



idr_init_base()

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

drivers/dma-buf/dma-heap.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/xarray.h>

#include <linux/list.h>

#include <linux/slab.h>

#include <linux/nospec.h>

#include <linux/uaccess.h>

#include <linux/syscalls.h>

#include <linux/dma-heap.h>
@@ -135,6 +136,7 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd, 
	if (nr >= ARRAY_SIZE(dma_heap_ioctl_cmds))

		return -EINVAL;



	nr = array_index_nospec(nr, ARRAY_SIZE(dma_heap_ioctl_cmds));

	/* Get the kernel ioctl cmd that matches */

	kcmd = dma_heap_ioctl_cmds[nr];

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

+8 −2
Original line number Diff line number Diff line
@@ -1408,12 +1408,10 @@ int amdgpu_acpi_smart_shift_update(struct drm_device *dev, enum amdgpu_ss ss_sta 
int amdgpu_acpi_pcie_notify_device_ready(struct amdgpu_device *adev);



void amdgpu_acpi_get_backlight_caps(struct amdgpu_dm_backlight_caps *caps);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

void amdgpu_acpi_detect(void);

#else

static inline int amdgpu_acpi_init(struct amdgpu_device *adev) { return 0; }

static inline void amdgpu_acpi_fini(struct amdgpu_device *adev) { }

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline void amdgpu_acpi_detect(void) { }

static inline bool amdgpu_acpi_is_power_shift_control_supported(void) { return false; }

static inline int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev,
@@ -1422,6 +1420,14 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 
						 enum amdgpu_ss ss_state) { return 0; }

#endif



#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

#else

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }

#endif



int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,

			   uint64_t addr, struct amdgpu_bo **bo,

			   struct amdgpu_bo_va_mapping **mapping);

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

+32 −5
Original line number Diff line number Diff line
@@ -1031,6 +1031,20 @@ void amdgpu_acpi_detect(void) 
	}

}



#if IS_ENABLED(CONFIG_SUSPEND)

/**

 * amdgpu_acpi_is_s3_active

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if supported, false if not.

 */

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev)

{

	return !(adev->flags & AMD_IS_APU) ||

		(pm_suspend_target_state == PM_SUSPEND_MEM);

}



/**

 * amdgpu_acpi_is_s0ix_active

 *
@@ -1040,11 +1054,24 @@ void amdgpu_acpi_detect(void) 
 */

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev)

{

#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_SUSPEND)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;

	if (!(adev->flags & AMD_IS_APU) ||

	    (pm_suspend_target_state != PM_SUSPEND_TO_IDLE))

		return false;



	if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)) {

		dev_warn_once(adev->dev,

			      "Power consumption will be higher as BIOS has not been configured for suspend-to-idle.\n"

			      "To use suspend-to-idle change the sleep mode in BIOS setup.\n");

		return false;

	}

#endif



#if !IS_ENABLED(CONFIG_AMD_PMC)

	dev_warn_once(adev->dev,

		      "Power consumption will be higher as the kernel has not been compiled with CONFIG_AMD_PMC.\n");

	return false;

#else

	return true;

#endif /* CONFIG_AMD_PMC */

}



#endif /* CONFIG_SUSPEND */

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

+9 −2
Original line number Diff line number Diff line
@@ -2246,13 +2246,20 @@ static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work) 
static int amdgpu_pmops_prepare(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);



	/* Return a positive number here so

	 * DPM_FLAG_SMART_SUSPEND works properly

	 */

	if (amdgpu_device_supports_boco(drm_dev))

		return pm_runtime_suspended(dev) &&

			pm_suspend_via_firmware();

		return pm_runtime_suspended(dev);



	/* if we will not support s3 or s2i for the device

	 *  then skip suspend

	 */

	if (!amdgpu_acpi_is_s0ix_active(adev) &&

	    !amdgpu_acpi_is_s3_active(adev))

		return 1;



	return 0;

}