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

Commit 90065a17 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Increase the size of snapshot for SM8150"

parents 7706411c 3fc25584

arch/arm64/boot/dts/qcom/sm8150-gpu.dtsi

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

/* Copyright (c) 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
@@ -90,7 +90,7 @@ 


		qcom,ubwc-mode = <3>;



		qcom,snapshot-size = <1048576>; //bytes

		qcom,snapshot-size = <1310720>; //bytes



		qcom,gpu-qdss-stm = <0x161c0000 0x40000>; // base addr, size

drivers/gpu/msm/adreno.h

+2 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,8 @@ struct adreno_gpudev { 
	int (*perfcounter_update)(struct adreno_device *adreno_dev,

				struct adreno_perfcount_register *reg,

				bool update_reg);

	size_t (*snapshot_preemption)(struct kgsl_device *, u8 *,

				 size_t, void *);

};



/**

drivers/gpu/msm/adreno_a5xx.c

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

/* Copyright (c) 2014-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
@@ -3635,4 +3635,5 @@ struct adreno_gpudev adreno_a5xx_gpudev = { 
	.preemption_schedule = a5xx_preemption_schedule,

	.enable_64bit = a5xx_enable_64bit,

	.clk_set_options = a5xx_clk_set_options,

	.snapshot_preemption = a5xx_snapshot_preemption,

};

drivers/gpu/msm/adreno_a5xx.h

+2 −1
Original line number Diff line number Diff line
@@ -237,5 +237,6 @@ unsigned int a5xx_preemption_pre_ibsubmit( 




void a5xx_preempt_callback(struct adreno_device *adreno_dev, int bit);



size_t a5xx_snapshot_preemption(struct kgsl_device *device, u8 *buf,

		size_t remain, void *priv);

#endif

drivers/gpu/msm/adreno_a5xx_snapshot.c

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

/* Copyright (c) 2015-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
@@ -739,7 +739,7 @@ static size_t a5xx_snapshot_registers(struct kgsl_device *device, u8 *buf, 
}



/* Snapshot a preemption record buffer */

static size_t snapshot_preemption_record(struct kgsl_device *device, u8 *buf,

size_t a5xx_snapshot_preemption(struct kgsl_device *device, u8 *buf,

	size_t remain, void *priv)

{

	struct kgsl_memdesc *memdesc = priv;
@@ -865,8 +865,7 @@ void a5xx_snapshot(struct adreno_device *adreno_dev, 
	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	struct adreno_snapshot_data *snap_data = gpudev->snapshot_data;

	unsigned int reg, i;

	struct adreno_ringbuffer *rb;

	unsigned int reg;

	struct registers regs;



	/* Disable Clock gating temporarily for the debug bus to work */
@@ -965,16 +964,6 @@ void a5xx_snapshot(struct adreno_device *adreno_dev, 
	/* Debug bus */

	a5xx_snapshot_debugbus(device, snapshot);



	/* Preemption record */

	if (adreno_is_preemption_enabled(adreno_dev)) {

		FOR_EACH_RINGBUFFER(adreno_dev, rb, i) {

			kgsl_snapshot_add_section(device,

				KGSL_SNAPSHOT_SECTION_GPU_OBJECT_V2,

				snapshot, snapshot_preemption_record,

				&rb->preemption_desc);

		}

	}



}



static int _a5xx_crashdump_init_shader(struct a5xx_shader_block *block,