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

Unverified Commit 5d910122 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge remote-tracking branch 'sm8250/lineage-20' into lineage-20 

* sm8250/lineage-20:
  techpack: camera: Remove duplicate check
  techpack: audio: Add missing FM recording mixer setup
  techpack: display: drm/msm: add idle state sysfs node
  input: touchscreen: Fix error due to assumption of CONFIG_FB always being set
  qcacld-3.0: Fix OOB in wma_scan_roam.c
  page_alloc: fix invalid watermark check on a negative value

Change-Id: I0e64b52e6ae2991108dce53fe7235df4d3397d77
parents 2902d335 899c0059

drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_rmi_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/gpio.h>

#include <linux/uaccess.h>

#include <linux/cdev.h>

#include <linux/sched/signal.h>

#include <linux/platform_device.h>

#include <linux/input/synaptics_dsx.h>

#include "synaptics_dsx_core.h"

drivers/staging/qcacld-3.0/core/wma/src/wma_scan_roam.c

+1 −1
Original line number Diff line number Diff line
@@ -4965,7 +4965,7 @@ int wma_extscan_hotlist_match_event_handler(void *handle, 
		return -ENOMEM;



	dest_ap = &dest_hotlist->ap[0];

	dest_hotlist->numOfAps = event->total_entries;

	dest_hotlist->numOfAps = numap;

	dest_hotlist->requestId = event->config_request_id;



	if (event->first_entry_index +

mm/page_alloc.c

+8 −4
Original line number Diff line number Diff line
@@ -3547,11 +3547,15 @@ static inline bool zone_watermark_fast(struct zone *z, unsigned int order, 
	 * need to be calculated.

	 */

	if (!order) {

		long fast_free;

		long usable_free;

		long reserved;



		fast_free = free_pages;

		fast_free -= __zone_watermark_unusable_free(z, 0, alloc_flags);

		if (fast_free > mark + z->lowmem_reserve[classzone_idx])

		usable_free = free_pages;

		reserved = __zone_watermark_unusable_free(z, 0, alloc_flags);



		/* reserved may over estimate high-atomic reserves. */

		usable_free -= min(usable_free, reserved);

		if (usable_free > mark + z->lowmem_reserve[classzone_idx])

			return true;

	}

techpack/audio/asoc/msm-pcm-routing-v2.c

+5 −0
Original line number Diff line number Diff line
@@ -17902,6 +17902,10 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = { 
	MSM_BACKEND_DAI_SLIMBUS_7_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("SLIM_8_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_SLIMBUS_8_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,

	msm_routing_put_audio_mixer),

	SOC_DOUBLE_EXT("USB_AUDIO_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_USB_TX,

	MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
@@ -26458,6 +26462,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia1 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},

	{"MultiMedia8 Mixer", "SLIM_6_TX", "SLIMBUS_6_TX"},

	{"MultiMedia8 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},

	{"MultiMedia8 Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},

	{"MultiMedia8 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},

	{"MultiMedia4 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia4 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},

techpack/camera/drivers/cam_req_mgr/cam_mem_mgr.c

+0 −5
Original line number Diff line number Diff line
@@ -267,11 +267,6 @@ int cam_mem_get_cpu_buf(int32_t buf_handle, uintptr_t *vaddr_ptr, size_t *len) 
		return -EINVAL;

	}



	if (!atomic_read(&cam_mem_mgr_state)) {

		CAM_ERR(CAM_MEM, "failed. mem_mgr not initialized");

		return -EINVAL;

	}



	if (!buf_handle || !vaddr_ptr || !len)

		return -EINVAL;