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

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

Merge "msm: kgsl: Make the "scratch" global buffer use a random GPU address"

parents 0a53b405 f7f87a61

drivers/gpu/msm/adreno_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int adreno_ringbuffer_probe(struct adreno_device *adreno_dev, bool nopreempt) 


	if (!adreno_is_a3xx(adreno_dev)) {

		status = kgsl_allocate_global(device, &device->scratch,

				PAGE_SIZE, 0, 0, "scratch");

				PAGE_SIZE, 0, KGSL_MEMDESC_RANDOM, "scratch");

		if (status != 0)

			return status;

	}

drivers/gpu/msm/kgsl.h

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -197,6 +197,8 @@ struct kgsl_memdesc_ops { 
#define KGSL_MEMDESC_TZ_LOCKED BIT(7)

/* The memdesc is allocated through contiguous memory */

#define KGSL_MEMDESC_CONTIG BIT(8)

/* For global buffers, randomly assign an address from the region */

#define KGSL_MEMDESC_RANDOM BIT(9)



/**

 * struct kgsl_memdesc - GPU memory object descriptor

drivers/gpu/msm/kgsl_iommu.c

+21 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/msm_kgsl.h>

#include <linux/ratelimit.h>

#include <linux/of_platform.h>

#include <linux/random.h>

#include <soc/qcom/scm.h>

#include <soc/qcom/secure_buffer.h>

#include <linux/compat.h>
@@ -224,7 +225,7 @@ static void kgsl_iommu_remove_global(struct kgsl_mmu *mmu, 
static void kgsl_iommu_add_global(struct kgsl_mmu *mmu,

		struct kgsl_memdesc *memdesc, const char *name)

{

	int bit;

	u32 bit, start = 0;

	u64 size = kgsl_memdesc_footprint(memdesc);



	if (memdesc->gpuaddr != 0)
@@ -233,10 +234,26 @@ static void kgsl_iommu_add_global(struct kgsl_mmu *mmu, 
	if (WARN_ON(global_pt_count >= GLOBAL_PT_ENTRIES))

		return;



	if (WARN_ON(size > KGSL_IOMMU_GLOBAL_MEM_SIZE))

		return;



	if (memdesc->priv & KGSL_MEMDESC_RANDOM) {

		u32 range = GLOBAL_MAP_PAGES - (size >> PAGE_SHIFT);



		start = get_random_int() % range;

	}



	while (start >= 0) {

		bit = bitmap_find_next_zero_area(global_map, GLOBAL_MAP_PAGES,

		0, size >> PAGE_SHIFT, 0);

			start, size >> PAGE_SHIFT, 0);



		if (bit < GLOBAL_MAP_PAGES)

			break;



		start--;

	}



	if (WARN_ON(bit >= GLOBAL_MAP_PAGES))

	if (WARN_ON(start < 0))

		return;



	memdesc->gpuaddr =