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

Commit 6a0c16b5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Fix compilation failure for 32-bit platform"

parents ea4a184b f8a617fa

drivers/gpu/msm/adreno.c

+2 −2
Original line number Diff line number Diff line
@@ -3537,8 +3537,8 @@ static void adreno_power_stats(struct kgsl_device *device, 
	} else {

		/* clock sourced from GFX3D */

		s64 freq = kgsl_pwrctrl_active_freq(pwr) / 1000000;



		stats->busy_time = gpu_busy / freq;

		do_div(gpu_busy, freq);

		stats->busy_time = gpu_busy;

	}



	if (device->pwrctrl.bus_control) {

drivers/gpu/msm/adreno_dispatch.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/slab.h>
@@ -2977,7 +2977,7 @@ int adreno_dispatcher_init(struct adreno_device *adreno_dev) 
	if (ret)

		return ret;



	sysfs_create_files(&device->dev->kobj, _preempt_attr_list);

	WARN_ON(sysfs_create_files(&device->dev->kobj, _preempt_attr_list));



	mutex_init(&dispatcher->mutex);

drivers/gpu/msm/adreno_hwsched.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.

 */



#include "adreno.h"
@@ -1371,7 +1371,7 @@ void adreno_hwsched_init(struct adreno_device *adreno_dev) 
		init_llist_head(&hwsched->requeue[i]);

	}



	sysfs_create_files(&device->dev->kobj, _hwsched_attr_list);

	WARN_ON(sysfs_create_files(&device->dev->kobj, _hwsched_attr_list));

}



void adreno_hwsched_mark_drawobj(struct adreno_device *adreno_dev,

drivers/gpu/msm/kgsl.c

+4 −2
Original line number Diff line number Diff line
@@ -3214,6 +3214,7 @@ static inline bool check_full_flush(size_t size, int op) 
	return false;

}

#else

#include <asm/cacheflush.h>

/* Support full flush if the size is bigger than the threshold */

static inline bool check_full_flush(size_t size, int op)

{
@@ -4290,8 +4291,9 @@ static int _register_device(struct kgsl_device *device) 


	set_dma_ops(device->dev, NULL);



	kobject_init_and_add(&device->gpu_sysfs_kobj, &kgsl_gpu_sysfs_ktype,

		kernel_kobj, "gpu");

	if (kobject_init_and_add(&device->gpu_sysfs_kobj, &kgsl_gpu_sysfs_ktype,

		kernel_kobj, "gpu"))

		dev_err(device->dev, "Unable to add sysfs for gpu\n");



	return 0;

}

drivers/gpu/msm/kgsl_iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/random.h>

#include <linux/regulator/consumer.h>

#include <soc/qcom/secure_buffer.h>

#include <linux/io-64-nonatomic-hi-lo.h>



#include "adreno.h"

#include "kgsl_device.h"