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

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

Merge "msm: kgsl: Remove unused bits from the a6xx CP_INIT ordinals"

parents 05e912b7 a81817dd

drivers/gpu/msm/adreno.c

+11 −25
Original line number Diff line number Diff line
@@ -2,43 +2,29 @@ 
/*

 * Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.

 */

#include <linux/module.h>

#include <linux/uaccess.h>

#include <linux/sched.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_fdt.h>

#include <linux/delay.h>

#include <linux/input.h>

#include <linux/io.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_fdt.h>

#include <linux/module.h>

#include <linux/msm_kgsl.h>

#include <linux/regulator/consumer.h>

#include <soc/qcom/scm.h>



#include <linux/msm-bus-board.h>

#include <linux/msm-bus.h>



#include "kgsl.h"

#include "kgsl_gmu_core.h"

#include "kgsl_pwrscale.h"

#include "kgsl_sharedmem.h"

#include "kgsl_iommu.h"

#include "kgsl_trace.h"

#include "adreno_llc.h"



#include "adreno.h"

#include "adreno_iommu.h"

#include "adreno_compat.h"

#include "adreno_pm4types.h"

#include "adreno_trace.h"



#include "adreno_a3xx.h"

#include "adreno_a5xx.h"

#include "adreno_a6xx.h"



#include "adreno_snapshot.h"

#include "adreno_compat.h"

#include "adreno_iommu.h"

#include "adreno_llc.h"

#include "adreno_trace.h"

#include "kgsl_trace.h"



/* Include the master list of GPU cores that are supported */

#include "adreno-gpulist.h"

#include "adreno_dispatch.h"



static void adreno_input_work(struct work_struct *work);

static unsigned int counter_delta(struct kgsl_device *device,

drivers/gpu/msm/adreno.h

+4 −9
Original line number Diff line number Diff line
@@ -5,17 +5,12 @@ 
#ifndef __ADRENO_H

#define __ADRENO_H



#include "kgsl_device.h"

#include "kgsl_sharedmem.h"

#include "adreno_drawctxt.h"

#include "adreno_ringbuffer.h"

#include "adreno_profile.h"

#include "adreno_dispatch.h"

#include "kgsl_iommu.h"

#include "adreno_drawctxt.h"

#include "adreno_perfcounter.h"

#include <linux/stat.h>

#include <linux/delay.h>

#include "kgsl_gmu_core.h"

#include "adreno_profile.h"

#include "adreno_ringbuffer.h"

#include "kgsl_sharedmem.h"



#define DEVICE_3D_NAME "kgsl-3d"

#define DEVICE_3D0_NAME "kgsl-3d0"

drivers/gpu/msm/adreno_a3xx.c

+5 −10
Original line number Diff line number Diff line
@@ -3,22 +3,17 @@ 
 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/firmware.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/msm_kgsl.h>

#include <linux/clk/qcom.h>

#include <linux/firmware.h>

#include <linux/of.h>

#include <linux/slab.h>



#include "kgsl.h"

#include "adreno.h"

#include "kgsl_sharedmem.h"

#include "a3xx_reg.h"

#include "adreno_a3xx.h"

#include "adreno_cp_parser.h"

#include "adreno_trace.h"

#include "adreno_a3xx.h"

#include "adreno_pm4types.h"

#include "adreno_perfcounter.h"

#include "adreno_snapshot.h"

#include "adreno_trace.h"



/*

 * Define registers for a3xx that contain addresses used by the

drivers/gpu/msm/adreno_a3xx_snapshot.c

+3 −4
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
 */



#include <linux/io.h>

#include "kgsl.h"



#include "adreno.h"

#include "kgsl_snapshot.h"

#include "a3xx_reg.h"

#include "adreno_snapshot.h"

#include "adreno_a3xx.h"

#include "adreno_snapshot.h"

#include "kgsl_device.h"



/*

 * Set of registers to dump for A3XX on snapshot.

drivers/gpu/msm/adreno_a5xx.c

+7 −11
Original line number Diff line number Diff line
@@ -3,24 +3,20 @@ 
 * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/clk/qcom.h>

#include <linux/delay.h>

#include <linux/firmware.h>

#include <soc/qcom/subsystem_restart.h>

#include <linux/of.h>

#include <linux/slab.h>

#include <soc/qcom/scm.h>

#include <linux/pm_opp.h>

#include <linux/clk/qcom.h>

#include <soc/qcom/subsystem_restart.h>



#include "adreno.h"

#include "a5xx_reg.h"

#include "adreno_a5xx.h"

#include "adreno_cp_parser.h"

#include "adreno_trace.h"

#include "adreno_a5xx_packets.h"

#include "adreno_pm4types.h"

#include "adreno_perfcounter.h"

#include "adreno_ringbuffer.h"

#include "kgsl_sharedmem.h"

#include "kgsl.h"

#include "adreno_trace.h"

#include "kgsl_trace.h"

#include "adreno_a5xx_packets.h"



static int critical_packet_constructed;