Commit 772a5803 authored by Umesh Nerlige Ramappa's avatar Umesh Nerlige Ramappa
Browse files

drm/i915/perf: Fail modprobe if i915_perf_init fails on OOM 



i915_perf_init can fail due to OOM. Fail driver init if i915_perf_init
fails.

v2: (Jani)
- Reorder patch in the series

Signed-off-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230323225901.3743681-6-umesh.nerlige.ramappa@intel.com
parent 5f284e9c

drivers/gpu/drm/i915/i915_driver.c

+3 −1
Original line number Diff line number Diff line
@@ -610,7 +610,9 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) 
	if (ret)

		return ret;



	i915_perf_init(dev_priv);

	ret = i915_perf_init(dev_priv);

	if (ret)

		return ret;



	ret = i915_ggtt_probe_hw(dev_priv);

	if (ret)

drivers/gpu/drm/i915/i915_perf.c

+6 −2
Original line number Diff line number Diff line
@@ -4902,7 +4902,7 @@ static void i915_perf_init_info(struct drm_i915_private *i915) 
 * Note: i915-perf initialization is split into an 'init' and 'register'

 * phase with the i915_perf_register() exposing state to userspace.

 */

void i915_perf_init(struct drm_i915_private *i915)

int i915_perf_init(struct drm_i915_private *i915)

{

	struct i915_perf *perf = &i915->perf;
@@ -5018,12 +5018,16 @@ void i915_perf_init(struct drm_i915_private *i915) 
		perf->i915 = i915;



		ret = oa_init_engine_groups(perf);

		if (ret)

		if (ret) {

			drm_err(&i915->drm,

				"OA initialization failed %d\n", ret);

			return ret;

		}



		oa_init_supported_formats(perf);

	}



	return 0;

}



static int destroy_config(int id, void *p, void *data)

drivers/gpu/drm/i915/i915_perf.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ struct i915_oa_config; 
struct intel_context;

struct intel_engine_cs;



void i915_perf_init(struct drm_i915_private *i915);

int i915_perf_init(struct drm_i915_private *i915);

void i915_perf_fini(struct drm_i915_private *i915);

void i915_perf_register(struct drm_i915_private *i915);

void i915_perf_unregister(struct drm_i915_private *i915);