Merge "msm: kgsl: Fix incomplete sync timeline name description" (52470bc3) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/msm/kgsl_sync.c

+6 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/file.h>
		@@ -309,8 +309,7 @@ int kgsl_sync_timeline_create(struct kgsl_context *context)
		}

		kref_init(&ktimeline->kref);
		snprintf(ktimeline->name, sizeof(ktimeline->name),
		"%s_%d-%.15s(%d)-%.15s(%d)",
		ktimeline->name = kasprintf(GFP_KERNEL, "%s_%d-%.15s(%d)-%.15s(%d)",
		context->device->name, context->id,
		current->group_leader->comm, current->group_leader->pid,
		current->comm, current->pid);
		@@ -354,7 +353,10 @@ static void kgsl_sync_timeline_signal(struct kgsl_sync_timeline *ktimeline,

		void kgsl_sync_timeline_destroy(struct kgsl_context *context)
		{
		kfree(context->ktimeline);
		struct kgsl_sync_timeline *ktimeline = context->ktimeline;

		kfree(ktimeline->name);
		kfree(ktimeline);
		}

		static void kgsl_sync_timeline_release(struct kref *kref)

+2 −2

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2012-2014,2018-2019 The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2014,2018-2020 The Linux Foundation. All rights reserved.
		*/
		#ifndef __KGSL_SYNC_H
		#define __KGSL_SYNC_H
		@@ -21,7 +21,7 @@
		*/
		struct kgsl_sync_timeline {
		struct kref kref;
		char name[32];
		char *name;

		u64 fence_context;