Merge branch 'master' into for-linus (8400146d) · Commits · e / devices / android_kernel_oneplus_sm8150

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 31
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION

arch/x86/kernel/apic/ipi.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,9 @@ void default_send_IPI_mask_logical(const struct cpumask *cpumask, int vector)
		unsigned long mask = cpumask_bits(cpumask)[0];
		unsigned long flags;

		if (WARN_ONCE(!mask, "empty IPI mask"))
		return;

		local_irq_save(flags);
		WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]);
		__default_send_IPI_dest_field(mask, vector, apic->dest_logical);

arch/x86/mm/tlb.c

+10 −11

Original line number	Diff line number	Diff line
		@@ -183,9 +183,7 @@ static void flush_tlb_others_ipi(const struct cpumask *cpumask,

		f->flush_mm = mm;
		f->flush_va = va;
		cpumask_andnot(to_cpumask(f->flush_cpumask),
		cpumask, cpumask_of(smp_processor_id()));

		if (cpumask_andnot(to_cpumask(f->flush_cpumask), cpumask, cpumask_of(smp_processor_id()))) {
		/*
		* We have to send the IPI only to
		* CPUs affected.
		@@ -195,6 +193,7 @@ static void flush_tlb_others_ipi(const struct cpumask *cpumask,

		while (!cpumask_empty(to_cpumask(f->flush_cpumask)))
		cpu_relax();
		}

		f->flush_mm = NULL;
		f->flush_va = 0;

drivers/gpu/drm/drm_sysfs.c

+29 −22

Original line number	Diff line number	Diff line
		@@ -22,16 +22,21 @@
		#define to_drm_minor(d) container_of(d, struct drm_minor, kdev)
		#define to_drm_connector(d) container_of(d, struct drm_connector, kdev)

		static struct device_type drm_sysfs_device_minor = {
		.name = "drm_minor"
		};

		/**
		* drm_sysfs_suspend - DRM class suspend hook
		* drm_class_suspend - DRM class suspend hook
		* @dev: Linux device to suspend
		* @state: power state to enter
		*
		* Just figures out what the actual struct drm_device associated with
		* @dev is and calls its suspend hook, if present.
		*/
		static int drm_sysfs_suspend(struct device *dev, pm_message_t state)
		static int drm_class_suspend(struct device *dev, pm_message_t state)
		{
		if (dev->type == &drm_sysfs_device_minor) {
		struct drm_minor *drm_minor = to_drm_minor(dev);
		struct drm_device *drm_dev = drm_minor->dev;

		@@ -39,19 +44,20 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state)
		!drm_core_check_feature(drm_dev, DRIVER_MODESET) &&
		drm_dev->driver->suspend)
		return drm_dev->driver->suspend(drm_dev, state);

		}
		return 0;
		}

		/**
		* drm_sysfs_resume - DRM class resume hook
		* drm_class_resume - DRM class resume hook
		* @dev: Linux device to resume
		*
		* Just figures out what the actual struct drm_device associated with
		* @dev is and calls its resume hook, if present.
		*/
		static int drm_sysfs_resume(struct device *dev)
		static int drm_class_resume(struct device *dev)
		{
		if (dev->type == &drm_sysfs_device_minor) {
		struct drm_minor *drm_minor = to_drm_minor(dev);
		struct drm_device *drm_dev = drm_minor->dev;

		@@ -59,7 +65,7 @@ static int drm_sysfs_resume(struct device *dev)
		!drm_core_check_feature(drm_dev, DRIVER_MODESET) &&
		drm_dev->driver->resume)
		return drm_dev->driver->resume(drm_dev);

		}
		return 0;
		}

		@@ -99,8 +105,8 @@ struct class drm_sysfs_create(struct module owner, char *name)
		goto err_out;
		}

		class->suspend = drm_sysfs_suspend;
		class->resume = drm_sysfs_resume;
		class->suspend = drm_class_suspend;
		class->resume = drm_class_resume;

		err = class_create_file(class, &class_attr_version);
		if (err)
		@@ -480,6 +486,7 @@ int drm_sysfs_device_add(struct drm_minor *minor)
		minor->kdev.class = drm_class;
		minor->kdev.release = drm_sysfs_device_release;
		minor->kdev.devt = minor->device;
		minor->kdev.type = &drm_sysfs_device_minor;
		if (minor->type == DRM_MINOR_CONTROL)
		minor_str = "controlD%d";
		else if (minor->type == DRM_MINOR_RENDER)

drivers/gpu/drm/radeon/r100.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1091,6 +1091,16 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
		tmp \|= tile_flags;
		ib[idx] = tmp;
		break;
		case RADEON_RB3D_ZPASS_ADDR:
		r = r100_cs_packet_next_reloc(p, &reloc);
		if (r) {
		DRM_ERROR("No reloc for ib[%d]=0x%04X\n",
		idx, reg);
		r100_cs_dump_packet(p, pkt);
		return r;
		}
		ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);
		break;
		default:
		/* FIXME: we don't want to allow anyothers packet */
		break;