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

Commit 1c7637ca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.130 into android-4.9 



Changes in 4.9.130
	NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
	NFC: Fix the number of pipes
	ASoC: cs4265: fix MMTLR Data switch control
	ALSA: bebob: fix memory leak for M-Audio FW1814 and ProjectMix I/O at error path
	ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
	ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
	ALSA: firewire-digi00x: fix memory leak of private data
	ALSA: firewire-tascam: fix memory leak of private data
	ALSA: fireworks: fix memory leak of response buffer at error path
	ALSA: oxfw: fix memory leak for model-dependent data at error path
	ALSA: oxfw: fix memory leak of discovered stream formats at error path
	ALSA: oxfw: fix memory leak of private data
	platform/x86: alienware-wmi: Correct a memory leak
	xen/netfront: don't bug in case of too many frags
	xen/x86/vpmu: Zero struct pt_regs before calling into sample handling code
	Revert "PCI: Add ACS quirk for Intel 300 series"
	ring-buffer: Allow for rescheduling when removing pages
	mm: shmem.c: Correctly annotate new inodes for lockdep
	gso_segment: Reset skb->mac_len after modifying network header
	ipv6: fix possible use-after-free in ip6_xmit()
	net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT
	net: hp100: fix always-true check for link up state
	udp4: fix IP_CMSG_CHECKSUM for connected sockets
	neighbour: confirm neigh entries when ARP packet is received
	scsi: target: iscsi: Use hex2bin instead of a re-implementation
	ocfs2: fix ocfs2 read block panic
	drm/nouveau/drm/nouveau: Fix bogus drm_kms_helper_poll_enable() placement
	drm/nouveau/drm/nouveau: Use pm_runtime_get_noresume() in connector_detect()
	drm/nouveau/drm/nouveau: Prevent handling ACPI HPD events too early
	drm/vc4: Fix the "no scaling" case on multi-planar YUV formats
	tty: vt_ioctl: fix potential Spectre v1
	ext4: check to make sure the rename(2)'s destination is not freed
	ext4: avoid divide by zero fault when deleting corrupted inline directories
	ext4: recalucate superblock checksum after updating free blocks/inodes
	ext4: fix online resize's handling of a too-small final block group
	ext4: fix online resizing for bigalloc file systems with a 1k block size
	ext4: don't mark mmp buffer head dirty
	ext4: show test_dummy_encryption mount option in /proc/mounts
	sched/fair: Fix vruntime_normalized() for remote non-migration wakeup
	HID: sony: Update device ids
	HID: sony: Support DS4 dongle
	PCI: aardvark: Size bridges before resources allocation
	vmw_balloon: include asm/io.h
	iw_cxgb4: only allow 1 flush on user qps
	Linux 4.9.130

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4fc79c48 46f9f7c3

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 129

SUBLEVEL = 130

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/xen/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static void xen_convert_regs(const struct xen_pmu_regs *xen_regs, 
irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id)

{

	int err, ret = IRQ_NONE;

	struct pt_regs regs;

	struct pt_regs regs = {0};

	const struct xen_pmu_data *xenpmu_data = get_xenpmu_data();

	uint8_t xenpmu_flags = get_xenpmu_flags();

drivers/gpu/drm/nouveau/nouveau_connector.c

+11 −9
Original line number Diff line number Diff line
@@ -271,12 +271,16 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) 
		nv_connector->edid = NULL;

	}



	/* Outputs are only polled while runtime active, so acquiring a

	 * runtime PM ref here is unnecessary (and would deadlock upon

	 * runtime suspend because it waits for polling to finish).

	/* Outputs are only polled while runtime active, so resuming the

	 * device here is unnecessary (and would deadlock upon runtime suspend

	 * because it waits for polling to finish). We do however, want to

	 * prevent the autosuspend timer from elapsing during this operation

	 * if possible.

	 */

	if (!drm_kms_helper_is_poll_worker()) {

		ret = pm_runtime_get_sync(connector->dev->dev);

	if (drm_kms_helper_is_poll_worker()) {

		pm_runtime_get_noresume(dev->dev);

	} else {

		ret = pm_runtime_get_sync(dev->dev);

		if (ret < 0 && ret != -EACCES)

			return conn_status;

	}
@@ -354,10 +358,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) 


 out:



	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

		pm_runtime_put_autosuspend(connector->dev->dev);

	}

	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);



	return conn_status;

}

drivers/gpu/drm/nouveau/nouveau_display.c

+25 −8
Original line number Diff line number Diff line
@@ -367,8 +367,6 @@ nouveau_display_hpd_work(struct work_struct *work) 
	pm_runtime_get_sync(drm->dev->dev);



	drm_helper_hpd_irq_event(drm->dev);

	/* enable polling for external displays */

	drm_kms_helper_poll_enable(drm->dev);



	pm_runtime_mark_last_busy(drm->dev->dev);

	pm_runtime_put_sync(drm->dev->dev);
@@ -391,15 +389,29 @@ nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val, 
{

	struct nouveau_drm *drm = container_of(nb, typeof(*drm), acpi_nb);

	struct acpi_bus_event *info = data;

	int ret;



	if (!strcmp(info->device_class, ACPI_VIDEO_CLASS)) {

		if (info->type == ACPI_VIDEO_NOTIFY_PROBE) {

			/*

			 * This may be the only indication we receive of a

			 * connector hotplug on a runtime suspended GPU,

			 * schedule hpd_work to check.

			ret = pm_runtime_get(drm->dev->dev);

			if (ret == 1 || ret == -EACCES) {

				/* If the GPU is already awake, or in a state

				 * where we can't wake it up, it can handle

				 * it's own hotplug events.

				 */

				pm_runtime_put_autosuspend(drm->dev->dev);

			} else if (ret == 0) {

				/* This may be the only indication we receive

				 * of a connector hotplug on a runtime

				 * suspended GPU, schedule hpd_work to check.

				 */

				NV_DEBUG(drm, "ACPI requested connector reprobe\n");

				schedule_work(&drm->hpd_work);

				pm_runtime_put_noidle(drm->dev->dev);

			} else {

				NV_WARN(drm, "Dropped ACPI reprobe event due to RPM error: %d\n",

					ret);

			}



			/* acpi-video should not generate keypresses for this */

			return NOTIFY_BAD;
@@ -422,6 +434,11 @@ nouveau_display_init(struct drm_device *dev) 
	if (ret)

		return ret;



	/* enable connector detection and polling for connectors without HPD

	 * support

	 */

	drm_kms_helper_poll_enable(dev);



	/* enable hotplug interrupts */

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		struct nouveau_connector *conn = nouveau_connector(connector);

drivers/gpu/drm/vc4/vc4_plane.c

+12 −13
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) 
	vc4_state->y_scaling[0] = vc4_get_scaling_mode(vc4_state->src_h[0],

						       vc4_state->crtc_h);



	vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE &&

			       vc4_state->y_scaling[0] == VC4_SCALING_NONE);



	if (num_planes > 1) {

		vc4_state->is_yuv = true;
@@ -342,24 +345,17 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) 
			vc4_get_scaling_mode(vc4_state->src_h[1],

					     vc4_state->crtc_h);



		/* YUV conversion requires that scaling be enabled,

		 * even on a plane that's otherwise 1:1.  Choose TPZ

		 * for simplicity.

		/* YUV conversion requires that horizontal scaling be enabled,

		 * even on a plane that's otherwise 1:1. Looks like only PPF

		 * works in that case, so let's pick that one.

		 */

		if (vc4_state->x_scaling[0] == VC4_SCALING_NONE)

			vc4_state->x_scaling[0] = VC4_SCALING_TPZ;

		if (vc4_state->y_scaling[0] == VC4_SCALING_NONE)

			vc4_state->y_scaling[0] = VC4_SCALING_TPZ;

		if (vc4_state->is_unity)

			vc4_state->x_scaling[0] = VC4_SCALING_PPF;

	} else {

		vc4_state->x_scaling[1] = VC4_SCALING_NONE;

		vc4_state->y_scaling[1] = VC4_SCALING_NONE;

	}



	vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE &&

			       vc4_state->y_scaling[0] == VC4_SCALING_NONE &&

			       vc4_state->x_scaling[1] == VC4_SCALING_NONE &&

			       vc4_state->y_scaling[1] == VC4_SCALING_NONE);



	/* No configuring scaling on the cursor plane, since it gets

	   non-vblank-synced updates, and scaling requires requires

	   LBM changes which have to be vblank-synced.
@@ -614,7 +610,10 @@ static int vc4_plane_mode_set(struct drm_plane *plane, 
		vc4_dlist_write(vc4_state, SCALER_CSC2_ITR_R_601_5);

	}



	if (!vc4_state->is_unity) {

	if (vc4_state->x_scaling[0] != VC4_SCALING_NONE ||

	    vc4_state->x_scaling[1] != VC4_SCALING_NONE ||

	    vc4_state->y_scaling[0] != VC4_SCALING_NONE ||

	    vc4_state->y_scaling[1] != VC4_SCALING_NONE) {

		/* LBM Base Address. */

		if (vc4_state->y_scaling[0] != VC4_SCALING_NONE ||

		    vc4_state->y_scaling[1] != VC4_SCALING_NONE) {