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

Commit 9852d543 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Test all fw tables during mock selftests 



In addition to just testing the fw table we load, during the initial
mock testing we can test that all tables are valid (so the testing is
not limited to just the platforms that load that particular table).

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170213171558.20942-23-chris@chris-wilson.co.uk
parent 26e7a2a1

drivers/gpu/drm/i915/selftests/i915_mock_selftests.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

 */

selftest(sanitycheck, i915_mock_sanitycheck) /* keep first (igt selfcheck) */

selftest(sanitycheck, i915_mock_sanitycheck) /* keep first (igt selfcheck) */

selftest(scatterlist, scatterlist_mock_selftests)

selftest(scatterlist, scatterlist_mock_selftests)

selftest(uncore, intel_uncore_mock_selftests)

selftest(breadcrumbs, intel_breadcrumbs_mock_selftests)

selftest(breadcrumbs, intel_breadcrumbs_mock_selftests)

selftest(requests, i915_gem_request_mock_selftests)

selftest(requests, i915_gem_request_mock_selftests)

selftest(objects, i915_gem_object_mock_selftests)
 
selftest(objects, i915_gem_object_mock_selftests)

drivers/gpu/drm/i915/selftests/intel_uncore.c

+36 −13
Original line number Original line Diff line number Diff line
@@ -24,20 +24,16 @@ 




#include "../i915_selftest.h"

#include "../i915_selftest.h"





static int intel_fw_table_check(struct drm_i915_private *i915)

static int intel_fw_table_check(const struct intel_forcewake_range *ranges,

				unsigned int num_ranges,

				bool is_watertight)

{

{

	const struct intel_forcewake_range *ranges;

	unsigned int i;

	unsigned int num_ranges, i;

	s32 prev;

	s32 prev;





	ranges = i915->uncore.fw_domains_table;

	if (!ranges)

		return 0;



	num_ranges = i915->uncore.fw_domains_table_entries;

	for (i = 0, prev = -1; i < num_ranges; i++, ranges++) {

	for (i = 0, prev = -1; i < num_ranges; i++, ranges++) {

		/* Check that the table is watertight */

		/* Check that the table is watertight */

		if (IS_GEN9(i915) && (prev + 1) != (s32)ranges->start) {

		if (is_watertight && (prev + 1) != (s32)ranges->start) {

			pr_err("%s: entry[%d]:(%x, %x) is not watertight to previous (%x)\n",

			pr_err("%s: entry[%d]:(%x, %x) is not watertight to previous (%x)\n",

			       __func__, i, ranges->start, ranges->end, prev);

			       __func__, i, ranges->start, ranges->end, prev);

			return -EINVAL;

			return -EINVAL;
@@ -84,13 +80,26 @@ static int intel_shadow_table_check(void) 
	return 0;

	return 0;

}

}





int intel_uncore_live_selftests(struct drm_i915_private *i915)

int intel_uncore_mock_selftests(void)

{

{

	int err;

	struct {



		const struct intel_forcewake_range *ranges;

	err = intel_fw_table_check(i915);

		unsigned int num_ranges;

		bool is_watertight;

	} fw[] = {

		{ __vlv_fw_ranges, ARRAY_SIZE(__vlv_fw_ranges), false },

		{ __chv_fw_ranges, ARRAY_SIZE(__chv_fw_ranges), false },

		{ __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true },

	};

	int err, i;



	for (i = 0; i < ARRAY_SIZE(fw); i++) {

		err = intel_fw_table_check(fw[i].ranges,

					   fw[i].num_ranges,

					   fw[i].is_watertight);

		if (err)

		if (err)

			return err;

			return err;

	}





	err = intel_shadow_table_check();

	err = intel_shadow_table_check();

	if (err)

	if (err)
@@ -98,3 +107,17 @@ int intel_uncore_live_selftests(struct drm_i915_private *i915) 




	return 0;

	return 0;

}

}



int intel_uncore_live_selftests(struct drm_i915_private *i915)

{

	int err;



	/* Confirm the table we load is still valid */

	err = intel_fw_table_check(i915->uncore.fw_domains_table,

				   i915->uncore.fw_domains_table_entries,

				   INTEL_GEN(i915) >= 9);

	if (err)

		return err;



	return 0;

}