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

Commit 9c35fb4e authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d25ac9b6 on remote branch 

Change-Id: If6ab89298802b72ac55c0d43c29cf3ed1b3c6897
parents 96a1f73c d25ac9b6

drivers/char/diag/diag_dci.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -863,7 +863,7 @@ static void dci_process_ctrl_status(unsigned char *buf, int len, int token) 
	read_len += sizeof(struct diag_ctrl_dci_status);



	for (i = 0; i < header->count; i++) {

		if (read_len > len) {

		if (read_len > (len - 2)) {

			pr_err("diag: In %s, Invalid length len: %d\n",

			       __func__, len);

			return;

drivers/gpu/drm/drm_mm.c

+9 −2
Original line number Diff line number Diff line
@@ -541,6 +541,9 @@ static struct drm_mm_node *get_first_hole(const struct drm_mm *mm, 
	if (flags & DRM_MM_SEARCH_BOTTOM_UP) {

		struct rb_node *node = rb_first(&mm->holes_tree);



		if (!node)

			return NULL;



		return rb_entry(node, struct drm_mm_node, hole_node);

	} else if (flags & DRM_MM_SEARCH_BELOW) {

		return list_entry((mm)->hole_stack.prev,
@@ -555,8 +558,12 @@ static struct drm_mm_node *get_next_hole(struct drm_mm_node *entry, 
		enum drm_mm_search_flags flags)

{

	if (flags & DRM_MM_SEARCH_BOTTOM_UP) {

		return rb_entry(rb_next(&entry->hole_node),

				struct drm_mm_node, hole_node);

		struct rb_node *node = rb_next(&entry->hole_node);



		if (!node)

			return NULL;



		return rb_entry(node, struct drm_mm_node, hole_node);

	} else if (flags & DRM_MM_SEARCH_BELOW) {

		return list_entry(entry->hole_stack.prev,

				struct drm_mm_node, hole_stack);

drivers/gpu/drm/msm/msm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj, 
		obj_remove_domain(domain);



	mutex_unlock(&msm_obj->lock);

	return 0;

	return ret;

}



/* get iova without taking a reference, used in places where you have

drivers/gpu/drm/msm/msm_gem_vma.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ msm_gem_address_space_new(struct msm_mmu *mmu, const char *name, 


	if (aspace->va_len)

		drm_mm_init(&aspace->mm, (start >> PAGE_SHIFT),

			(end >> PAGE_SHIFT) - 1);

			(aspace->va_len >> PAGE_SHIFT));



	kref_init(&aspace->kref);

drivers/gpu/drm/msm/sde/sde_hw_ctl.c

+9 −2
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
	(0x40 + (((lm) - LM_0) * 0x004))

#define   CTL_LAYER_EXT2(lm)             \

	(0x70 + (((lm) - LM_0) * 0x004))

#define   CTL_LAYER_EXT3(lm)             \

	(0xA0 + (((lm) - LM_0) * 0x004))



#define   CTL_TOP                       0x014

#define   CTL_FLUSH                     0x018

#define   CTL_START                     0x01C
@@ -308,8 +311,12 @@ static void sde_hw_ctl_clear_all_blendstages(struct sde_hw_ctl *ctx) 
	int i;



	for (i = 0; i < ctx->mixer_count; i++) {

		SDE_REG_WRITE(c, CTL_LAYER(LM_0 + i), 0);

		SDE_REG_WRITE(c, CTL_LAYER_EXT(LM_0 + i), 0);

		int mixer_id = ctx->mixer_hw_caps[i].id;



		SDE_REG_WRITE(c, CTL_LAYER(mixer_id), 0);

		SDE_REG_WRITE(c, CTL_LAYER_EXT(mixer_id), 0);

		SDE_REG_WRITE(c, CTL_LAYER_EXT2(mixer_id), 0);

		SDE_REG_WRITE(c, CTL_LAYER_EXT3(mixer_id), 0);

	}

}