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

Commit 96961d17 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 77a5d2b6 on remote branch 

Change-Id: I286b7e0688100fa39ee6ea7f54da0fb696cd6067
parents 88b2b175 77a5d2b6

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
	- "qcom,msm-vidc"

        - "qcom,sdm845-vidc" : Invokes driver specific data for SDM845.

        - "qcom,sdm670-vidc" : Invokes driver specific data for SDM670.

        - "qcom,qcs605-vidc" : Invokes driver specific data for QCS605.



Optional properties:

- reg : offset and length of the register set for the device.

arch/arm/configs/msm8937go-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ CONFIG_UIO=y 
CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_IPA=y

arch/arm/configs/msm8937go_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ CONFIG_UIO=y 
CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_IPA=y

arch/arm64/boot/dts/qcom/qcs605.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ 
	qcom,rmnet-ipa {

		status = "disabled";

	};



	msm_vidc0: qcom,vidc0 {

		compatible = "qcom,msm-vidc", "qcom,qcs605-vidc";

	};

};



&llcc {

drivers/android/binder.c

+10 −25
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ struct binder_device { 
struct binder_work {

	struct list_head entry;



	enum {

	enum binder_work_type {

		BINDER_WORK_TRANSACTION = 1,

		BINDER_WORK_TRANSACTION_COMPLETE,

		BINDER_WORK_RETURN_ERROR,
@@ -938,27 +938,6 @@ static struct binder_work *binder_dequeue_work_head_ilocked( 
	return w;

}



/**

 * binder_dequeue_work_head() - Dequeues the item at head of list

 * @proc:         binder_proc associated with list

 * @list:         list to dequeue head

 *

 * Removes the head of the list if there are items on the list

 *

 * Return: pointer dequeued binder_work, NULL if list was empty

 */

static struct binder_work *binder_dequeue_work_head(

					struct binder_proc *proc,

					struct list_head *list)

{

	struct binder_work *w;



	binder_inner_proc_lock(proc);

	w = binder_dequeue_work_head_ilocked(list);

	binder_inner_proc_unlock(proc);

	return w;

}



static void

binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);

static void binder_free_thread(struct binder_thread *thread);
@@ -4584,13 +4563,17 @@ static void binder_release_work(struct binder_proc *proc, 
				struct list_head *list)

{

	struct binder_work *w;

	enum binder_work_type wtype;



	while (1) {

		w = binder_dequeue_work_head(proc, list);

		binder_inner_proc_lock(proc);

		w = binder_dequeue_work_head_ilocked(list);

		wtype = w ? w->type : 0;

		binder_inner_proc_unlock(proc);

		if (!w)

			return;



		switch (w->type) {

		switch (wtype) {

		case BINDER_WORK_TRANSACTION: {

			struct binder_transaction *t;
@@ -4624,9 +4607,11 @@ static void binder_release_work(struct binder_proc *proc, 
			kfree(death);

			binder_stats_deleted(BINDER_STAT_DEATH);

		} break;

		case BINDER_WORK_NODE:

			break;

		default:

			pr_err("unexpected work type, %d, not freed\n",

			       w->type);

			       wtype);

			break;

		}

	}