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

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

Merge "msm: kgsl: Fix compilation errors for 32bit kernel"

parents 4c558414 77e2f884

drivers/gpu/msm/adreno_a6xx.c

+2 −2
Original line number Diff line number Diff line
@@ -1064,8 +1064,8 @@ static int64_t a6xx_read_throttling_counters(struct adreno_device *adreno_dev) 
		 * 91.7% counter does a weighted count by the value of sid used

		 * which are taken into consideration for the final formula.

		 */

		adj *= ((a * 42) + (b * 500) +

			((((int64_t)c - a - b * 12) / 22) * 917)) / 1000;

		adj *= div_s64((a * 42) + (b * 500) +

			(div_s64((int64_t)c - a - b * 12, 22) * 917), 1000);

	else

		adj *= ((a * 5) + (b * 50) + (c * 90)) / 100;

drivers/gpu/msm/adreno_compat.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ long adreno_compat_ioctl(struct kgsl_device_private *dev_priv, 
#else



static inline int adreno_getproperty_compat(struct kgsl_device *device,

		struct kgsL_device_getproperty *param);

		struct kgsl_device_getproperty *param)

{

	return -EINVAL;

}

drivers/gpu/msm/kgsl.h

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

#include <linux/mm.h>

#include <linux/uaccess.h>

#include <linux/compat.h>

#include <uapi/linux/msm_kgsl.h>



#include "kgsl_gmu_core.h"

drivers/gpu/msm/kgsl_compat.h

+0 −15
Original line number Diff line number Diff line
@@ -228,25 +228,10 @@ static inline compat_size_t sizet_to_compat(size_t size) 
	return (compat_size_t)size;

}



struct kgsl_device;

struct kgsl_drawobj;



int kgsl_drawobj_create_compat(struct kgsl_device *device, unsigned int flags,

			struct kgsl_drawobj *drawobj, void __user *cmdlist,

			unsigned int numcmds, void __user *synclist,

			unsigned int numsyncs);



long kgsl_compat_ioctl(struct file *filep, unsigned int cmd,

			unsigned long arg);



#else

static inline int kgsl_drawobj_create_compat(struct kgsl_device *device,

			unsigned int flags, struct kgsl_drawobj *drawobj,

			void __user *cmdlist, unsigned int numcmds,

			void __user *synclist, unsigned int numsyncs)

{

	return -EINVAL;

}



static inline long kgsl_compat_ioctl(struct file *filep, unsigned int cmd,

			unsigned long arg)