Commit e22e9531 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Merge drm-upstream/drm-next into drm-misc-next 



Pull in the malidp writeback implementation for further work on writeback in drm-misc-next.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
parents a0120245 4da1d4c7

Documentation/admin-guide/pm/intel_pstate.rst

+12 −2
Original line number Original line Diff line number Diff line
@@ -324,8 +324,7 @@ Global Attributes 




``intel_pstate`` exposes several global attributes (files) in ``sysfs`` to

``intel_pstate`` exposes several global attributes (files) in ``sysfs`` to

control its functionality at the system level.  They are located in the

control its functionality at the system level.  They are located in the

``/sys/devices/system/cpu/cpufreq/intel_pstate/`` directory and affect all

``/sys/devices/system/cpu/intel_pstate/`` directory and affect all CPUs.

CPUs.





Some of them are not present if the ``intel_pstate=per_cpu_perf_limits``

Some of them are not present if the ``intel_pstate=per_cpu_perf_limits``

argument is passed to the kernel in the command line.

argument is passed to the kernel in the command line.
@@ -379,6 +378,17 @@ argument is passed to the kernel in the command line. 
	but it affects the maximum possible value of per-policy P-state	limits

	but it affects the maximum possible value of per-policy P-state	limits

	(see `Interpretation of Policy Attributes`_ below for details).

	(see `Interpretation of Policy Attributes`_ below for details).





``hwp_dynamic_boost``

	This attribute is only present if ``intel_pstate`` works in the

	`active mode with the HWP feature enabled <Active Mode With HWP_>`_ in

	the processor.  If set (equal to 1), it causes the minimum P-state limit

	to be increased dynamically for a short time whenever a task previously

	waiting on I/O is selected to run on a given logical CPU (the purpose

	of this mechanism is to improve performance).



	This setting has no effect on logical CPUs whose minimum P-state limit

	is directly set to the highest non-turbo P-state or above it.



.. _status_attr:

.. _status_attr:





``status``

``status``

Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
Spreadtrum SC27xx PMIC Vibrator



Required properties:

- compatible: should be "sprd,sc2731-vibrator".

- reg: address of vibrator control register.



Example :



	sc2731_pmic: pmic@0 {

		compatible = "sprd,sc2731";

		reg = <0>;

		spi-max-frequency = <26000000>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-controller;

		#interrupt-cells = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		vibrator@eb4 {

			compatible = "sprd,sc2731-vibrator";

			reg = <0xeb4>;

		};

	};

Documentation/filesystems/Locking

+1 −6
Original line number Original line Diff line number Diff line
@@ -441,8 +441,6 @@ prototypes: 
	int (*iterate) (struct file *, struct dir_context *);

	int (*iterate) (struct file *, struct dir_context *);

	int (*iterate_shared) (struct file *, struct dir_context *);

	int (*iterate_shared) (struct file *, struct dir_context *);

	__poll_t (*poll) (struct file *, struct poll_table_struct *);

	__poll_t (*poll) (struct file *, struct poll_table_struct *);

	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);

	__poll_t (*poll_mask) (struct file *, __poll_t);

	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);

	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);

	int (*mmap) (struct file *, struct vm_area_struct *);

	int (*mmap) (struct file *, struct vm_area_struct *);
@@ -473,7 +471,7 @@ prototypes: 
};

};





locking rules:

locking rules:

	All except for ->poll_mask may block.

	All may block.





->llseek() locking has moved from llseek to the individual llseek

->llseek() locking has moved from llseek to the individual llseek

implementations.  If your fs is not using generic_file_llseek, you

implementations.  If your fs is not using generic_file_llseek, you
@@ -505,9 +503,6 @@ in sys_read() and friends. 
the lease within the individual filesystem to record the result of the

the lease within the individual filesystem to record the result of the

operation

operation





->poll_mask can be called with or without the waitqueue lock for the waitqueue

returned from ->get_poll_head.



--------------------------- dquot_operations -------------------------------

--------------------------- dquot_operations -------------------------------

prototypes:

prototypes:

	int (*write_dquot) (struct dquot *);

	int (*write_dquot) (struct dquot *);

Documentation/filesystems/vfs.txt

+0 −13
Original line number Original line Diff line number Diff line
@@ -857,8 +857,6 @@ struct file_operations { 
	ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);

	ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);

	int (*iterate) (struct file *, struct dir_context *);

	int (*iterate) (struct file *, struct dir_context *);

	__poll_t (*poll) (struct file *, struct poll_table_struct *);

	__poll_t (*poll) (struct file *, struct poll_table_struct *);

	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);

	__poll_t (*poll_mask) (struct file *, __poll_t);

	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);

	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);

	int (*mmap) (struct file *, struct vm_area_struct *);

	int (*mmap) (struct file *, struct vm_area_struct *);
@@ -903,17 +901,6 @@ otherwise noted. 
	activity on this file and (optionally) go to sleep until there

	activity on this file and (optionally) go to sleep until there

	is activity. Called by the select(2) and poll(2) system calls

	is activity. Called by the select(2) and poll(2) system calls





  get_poll_head: Returns the struct wait_queue_head that callers can

  wait on.  Callers need to check the returned events using ->poll_mask

  once woken.  Can return NULL to indicate polling is not supported,

  or any error code using the ERR_PTR convention to indicate that a

  grave error occured and ->poll_mask shall not be called.



  poll_mask: return the mask of EPOLL* values describing the file descriptor

  state.  Called either before going to sleep on the waitqueue returned by

  get_poll_head, or after it has been woken.  If ->get_poll_head and

  ->poll_mask are implemented ->poll does not need to be implement.



  unlocked_ioctl: called by the ioctl(2) system call.

  unlocked_ioctl: called by the ioctl(2) system call.





  compat_ioctl: called by the ioctl(2) system call when 32 bit system calls

  compat_ioctl: called by the ioctl(2) system call when 32 bit system calls

Documentation/kbuild/kconfig-language.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -430,6 +430,12 @@ This sets the config program's title bar if the config program chooses 
to use it. It should be placed at the top of the configuration, before any

to use it. It should be placed at the top of the configuration, before any

other statement.

other statement.





'#' Kconfig source file comment:



An unquoted '#' character anywhere in a source file line indicates

the beginning of a source file comment.  The remainder of that line

is a comment.







Kconfig hints

Kconfig hints

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

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