Commit 9aba9c18 authored by Lionel Landwerlin's avatar Lionel Landwerlin
Browse files

drm/i915/perf: remove generated code 



A little bit of history :

   Back when i915-perf was introduced (4.13), there was no way to
   dynamically add new OA configurations to i915. Only the generated
   configs baked in at build time were allowed.

   It quickly became obvious that we would need to allow applications
   to upload their own configurations, for instance to be able to test
   new ones, and so by the next stable version (4.14) we added uAPIs
   to allow uploading new configurations.

   When adding that capability, we took the opportunity to remove most
   HW configurations except the TestOa one which is a configuration
   IGT would rely on to verify that the HW is outputting correct
   values. At the time it made sense to have that confiuration in at
   the same time a given HW platform added to the i915-perf driver.

Now that IGT has become the reference point for HW configurations (see
commit 53f8f541ca ("lib: Add i915_perf library"), previously this was
located in the GPUTop repository), the need for having those
configurations in i915-perf is gone.

On the Mesa side, we haven't relied on this test configuration for a
while. The MDAPI library always required 4.14 feature level and always
loaded its configuration into i915.

I'm sure nobody will miss this generated stuff in i915 :)

v2: Fix selftests by creating an empty config

v3: Fix unlocking on allocation error (Dan Carpenter)

v4: Fixup checkpatch warnings

v5: Fix incorrect unlock in error path (Umesh)

Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200317132222.2638719-1-lionel.g.landwerlin@intel.com
parent a22f3478

drivers/gpu/drm/i915/Makefile

+0 −17
Original line number Diff line number Diff line
@@ -243,23 +243,6 @@ i915-y += \ 
	display/vlv_dsi.o \

	display/vlv_dsi_pll.o



# perf code

i915-y += \

	oa/i915_oa_hsw.o \

	oa/i915_oa_bdw.o \

	oa/i915_oa_chv.o \

	oa/i915_oa_sklgt2.o \

	oa/i915_oa_sklgt3.o \

	oa/i915_oa_sklgt4.o \

	oa/i915_oa_bxt.o \

	oa/i915_oa_kblgt2.o \

	oa/i915_oa_kblgt3.o \

	oa/i915_oa_glk.o \

	oa/i915_oa_cflgt2.o \

	oa/i915_oa_cflgt3.o \

	oa/i915_oa_cnl.o \

	oa/i915_oa_icl.o \

	oa/i915_oa_tgl.o

i915-y += i915_perf.o



# Post-mortem debug and GPU hang state capture

drivers/gpu/drm/i915/i915_perf.c

+1 −80
Original line number Diff line number Diff line
@@ -204,21 +204,6 @@ 


#include "i915_drv.h"

#include "i915_perf.h"

#include "oa/i915_oa_hsw.h"

#include "oa/i915_oa_bdw.h"

#include "oa/i915_oa_chv.h"

#include "oa/i915_oa_sklgt2.h"

#include "oa/i915_oa_sklgt3.h"

#include "oa/i915_oa_sklgt4.h"

#include "oa/i915_oa_bxt.h"

#include "oa/i915_oa_kblgt2.h"

#include "oa/i915_oa_kblgt3.h"

#include "oa/i915_oa_glk.h"

#include "oa/i915_oa_cflgt2.h"

#include "oa/i915_oa_cflgt3.h"

#include "oa/i915_oa_cnl.h"

#include "oa/i915_oa_icl.h"

#include "oa/i915_oa_tgl.h"



/* HW requires this to be a power of two, between 128k and 16M, though driver

 * is currently generally designed assuming the largest 16M size is used such
@@ -409,9 +394,6 @@ i915_perf_get_oa_config(struct i915_perf *perf, int metrics_set) 
	struct i915_oa_config *oa_config;



	rcu_read_lock();

	if (metrics_set == 1)

		oa_config = &perf->test_config;

	else

	oa_config = idr_find(&perf->metrics_idr, metrics_set);

	if (oa_config)

		oa_config = i915_oa_config_get(oa_config);
@@ -3716,7 +3698,6 @@ int i915_perf_open_ioctl(struct drm_device *dev, void *data, 
void i915_perf_register(struct drm_i915_private *i915)

{

	struct i915_perf *perf = &i915->perf;

	int ret;



	if (!perf->i915)

		return;
@@ -3730,64 +3711,7 @@ void i915_perf_register(struct drm_i915_private *i915) 
	perf->metrics_kobj =

		kobject_create_and_add("metrics",

				       &i915->drm.primary->kdev->kobj);

	if (!perf->metrics_kobj)

		goto exit;



	sysfs_attr_init(&perf->test_config.sysfs_metric_id.attr);



	if (IS_TIGERLAKE(i915)) {

		i915_perf_load_test_config_tgl(i915);

	} else if (INTEL_GEN(i915) >= 11) {

		i915_perf_load_test_config_icl(i915);

	} else if (IS_CANNONLAKE(i915)) {

		i915_perf_load_test_config_cnl(i915);

	} else if (IS_COFFEELAKE(i915)) {

		if (IS_CFL_GT2(i915))

			i915_perf_load_test_config_cflgt2(i915);

		if (IS_CFL_GT3(i915))

			i915_perf_load_test_config_cflgt3(i915);

	} else if (IS_GEMINILAKE(i915)) {

		i915_perf_load_test_config_glk(i915);

	} else if (IS_KABYLAKE(i915)) {

		if (IS_KBL_GT2(i915))

			i915_perf_load_test_config_kblgt2(i915);

		else if (IS_KBL_GT3(i915))

			i915_perf_load_test_config_kblgt3(i915);

	} else if (IS_BROXTON(i915)) {

		i915_perf_load_test_config_bxt(i915);

	} else if (IS_SKYLAKE(i915)) {

		if (IS_SKL_GT2(i915))

			i915_perf_load_test_config_sklgt2(i915);

		else if (IS_SKL_GT3(i915))

			i915_perf_load_test_config_sklgt3(i915);

		else if (IS_SKL_GT4(i915))

			i915_perf_load_test_config_sklgt4(i915);

	} else if (IS_CHERRYVIEW(i915)) {

		i915_perf_load_test_config_chv(i915);

	} else if (IS_BROADWELL(i915)) {

		i915_perf_load_test_config_bdw(i915);

	} else if (IS_HASWELL(i915)) {

		i915_perf_load_test_config_hsw(i915);

	}



	if (perf->test_config.id == 0)

		goto sysfs_error;



	ret = sysfs_create_group(perf->metrics_kobj,

				 &perf->test_config.sysfs_metric);

	if (ret)

		goto sysfs_error;



	perf->test_config.perf = perf;

	kref_init(&perf->test_config.ref);



	goto exit;



sysfs_error:

	kobject_put(perf->metrics_kobj);

	perf->metrics_kobj = NULL;



exit:

	mutex_unlock(&perf->lock);

}
@@ -3807,9 +3731,6 @@ void i915_perf_unregister(struct drm_i915_private *i915) 
	if (!perf->metrics_kobj)

		return;



	sysfs_remove_group(perf->metrics_kobj,

			   &perf->test_config.sysfs_metric);



	kobject_put(perf->metrics_kobj);

	perf->metrics_kobj = NULL;

}

drivers/gpu/drm/i915/i915_perf_types.h

+0 −2
Original line number Diff line number Diff line
@@ -413,8 +413,6 @@ struct i915_perf { 
	 */

	struct ratelimit_state spurious_report_rs;



	struct i915_oa_config test_config;



	u32 gen7_latched_oastatus1;

	u32 ctx_oactxctrl_offset;

	u32 ctx_flexeu0_offset;

drivers/gpu/drm/i915/oa/i915_oa_bdw.c

deleted100644 → 0
+0 −90
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright © 2018-2019 Intel Corporation

 *

 * Autogenerated file by GPU Top : https://github.com/rib/gputop

 * DO NOT EDIT manually!

 */



#include <linux/sysfs.h>



#include "i915_drv.h"

#include "i915_oa_bdw.h"



static const struct i915_oa_reg b_counter_config_test_oa[] = {

	{ _MMIO(0x2740), 0x00000000 },

	{ _MMIO(0x2744), 0x00800000 },

	{ _MMIO(0x2714), 0xf0800000 },

	{ _MMIO(0x2710), 0x00000000 },

	{ _MMIO(0x2724), 0xf0800000 },

	{ _MMIO(0x2720), 0x00000000 },

	{ _MMIO(0x2770), 0x00000004 },

	{ _MMIO(0x2774), 0x00000000 },

	{ _MMIO(0x2778), 0x00000003 },

	{ _MMIO(0x277c), 0x00000000 },

	{ _MMIO(0x2780), 0x00000007 },

	{ _MMIO(0x2784), 0x00000000 },

	{ _MMIO(0x2788), 0x00100002 },

	{ _MMIO(0x278c), 0x0000fff7 },

	{ _MMIO(0x2790), 0x00100002 },

	{ _MMIO(0x2794), 0x0000ffcf },

	{ _MMIO(0x2798), 0x00100082 },

	{ _MMIO(0x279c), 0x0000ffef },

	{ _MMIO(0x27a0), 0x001000c2 },

	{ _MMIO(0x27a4), 0x0000ffe7 },

	{ _MMIO(0x27a8), 0x00100001 },

	{ _MMIO(0x27ac), 0x0000ffe7 },

};



static const struct i915_oa_reg flex_eu_config_test_oa[] = {

};



static const struct i915_oa_reg mux_config_test_oa[] = {

	{ _MMIO(0x9840), 0x000000a0 },

	{ _MMIO(0x9888), 0x198b0000 },

	{ _MMIO(0x9888), 0x078b0066 },

	{ _MMIO(0x9888), 0x118b0000 },

	{ _MMIO(0x9888), 0x258b0000 },

	{ _MMIO(0x9888), 0x21850008 },

	{ _MMIO(0x9888), 0x0d834000 },

	{ _MMIO(0x9888), 0x07844000 },

	{ _MMIO(0x9888), 0x17804000 },

	{ _MMIO(0x9888), 0x21800000 },

	{ _MMIO(0x9888), 0x4f800000 },

	{ _MMIO(0x9888), 0x41800000 },

	{ _MMIO(0x9888), 0x31800000 },

	{ _MMIO(0x9840), 0x00000080 },

};



static ssize_t

show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "1\n");

}



void

i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv)

{

	strlcpy(dev_priv->perf.test_config.uuid,

		"d6de6f55-e526-4f79-a6a6-d7315c09044e",

		sizeof(dev_priv->perf.test_config.uuid));

	dev_priv->perf.test_config.id = 1;



	dev_priv->perf.test_config.mux_regs = mux_config_test_oa;

	dev_priv->perf.test_config.mux_regs_len = ARRAY_SIZE(mux_config_test_oa);



	dev_priv->perf.test_config.b_counter_regs = b_counter_config_test_oa;

	dev_priv->perf.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_test_oa);



	dev_priv->perf.test_config.flex_regs = flex_eu_config_test_oa;

	dev_priv->perf.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_test_oa);



	dev_priv->perf.test_config.sysfs_metric.name = "d6de6f55-e526-4f79-a6a6-d7315c09044e";

	dev_priv->perf.test_config.sysfs_metric.attrs = dev_priv->perf.test_config.attrs;



	dev_priv->perf.test_config.attrs[0] = &dev_priv->perf.test_config.sysfs_metric_id.attr;



	dev_priv->perf.test_config.sysfs_metric_id.attr.name = "id";

	dev_priv->perf.test_config.sysfs_metric_id.attr.mode = 0444;

	dev_priv->perf.test_config.sysfs_metric_id.show = show_test_oa_id;

}

drivers/gpu/drm/i915/oa/i915_oa_bdw.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2018-2019 Intel Corporation

 *

 * Autogenerated file by GPU Top : https://github.com/rib/gputop

 * DO NOT EDIT manually!

 */



#ifndef __I915_OA_BDW_H__

#define __I915_OA_BDW_H__



struct drm_i915_private;



void i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE