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

Commit f79dd42b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-4b2b8b99' into msm-4.9"

parents 3c958170 07f9309c

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 59

SUBLEVEL = 60

EXTRAVERSION =

NAME = Roaring Lionus

arch/powerpc/kvm/powerpc.c

+1 −2
Original line number Diff line number Diff line
@@ -601,8 +601,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		break;

#endif

	case KVM_CAP_PPC_HTM:

		r = cpu_has_feature(CPU_FTR_TM_COMP) &&

		    is_kvmppc_hv_enabled(kvm);

		r = cpu_has_feature(CPU_FTR_TM_COMP) && hv_enabled;

		break;

	default:

		r = 0;

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ uint32_t smu7_get_xclk(struct pp_hwmgr *hwmgr) 
{

	uint32_t reference_clock, tmp;

	struct cgs_display_info info = {0};

	struct cgs_mode_info mode_info;

	struct cgs_mode_info mode_info = {0};



	info.mode_info = &mode_info;
@@ -3718,10 +3718,9 @@ int smu7_program_display_gap(struct pp_hwmgr *hwmgr) 
	uint32_t ref_clock;

	uint32_t refresh_rate = 0;

	struct cgs_display_info info = {0};

	struct cgs_mode_info mode_info;

	struct cgs_mode_info mode_info = {0};



	info.mode_info = &mode_info;



	cgs_get_active_displays_info(hwmgr->device, &info);

	num_active_displays = info.display_count;
@@ -3737,6 +3736,7 @@ int smu7_program_display_gap(struct pp_hwmgr *hwmgr) 
	frame_time_in_us = 1000000 / refresh_rate;



	pre_vbi_time_in_us = frame_time_in_us - 200 - mode_info.vblank_time_us;



	data->frame_time_x2 = frame_time_in_us * 2 / 100;



	display_gap2 = pre_vbi_time_in_us * (ref_clock / 100);

drivers/input/mouse/elan_i2c_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ static const struct acpi_device_id elan_acpi_id[] = { 
	{ "ELAN0605", 0 },

	{ "ELAN0609", 0 },

	{ "ELAN060B", 0 },

	{ "ELAN0611", 0 },

	{ "ELAN1000", 0 },

	{ }

};

drivers/input/tablet/gtco.c

+10 −7
Original line number Diff line number Diff line
@@ -230,13 +230,17 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, 


	/* Walk  this report and pull out the info we need */

	while (i < length) {

		prefix = report[i];



		/* Skip over prefix */

		i++;

		prefix = report[i++];



		/* Determine data size and save the data in the proper variable */

		size = PREF_SIZE(prefix);

		size = (1U << PREF_SIZE(prefix)) >> 1;

		if (i + size > length) {

			dev_err(ddev,

				"Not enough data (need %d, have %d)\n",

				i + size, length);

			break;

		}



		switch (size) {

		case 1:

			data = report[i];
@@ -244,8 +248,7 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, 
		case 2:

			data16 = get_unaligned_le16(&report[i]);

			break;

		case 3:

			size = 4;

		case 4:

			data32 = get_unaligned_le32(&report[i]);

			break;

		}