iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe/gsc: Define GSCCS for MTL

Browse Source 
Add the GSCCS to the media_xelpmp engine list. Note that since the
GSCCS is only used with the GSC FW, we can consider it disabled if we
don't have the FW available.

v2: mark GSCCS as allowed on the media IP in kunit tests

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Daniele Ceraolo Spurio 2023-11-17 14:51:51 -08:00 committed by Rodrigo Vivi
parent 0881cbe040
commit 9897eb8555
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/xe/tests/xe_pci_test.c
View File

@ -33,13 +33,10 @@ static void check_media_ip(const struct xe_media_desc *media)
struct kunit *test = xe_cur_kunit(); struct kunit *test = xe_cur_kunit();
u64 mask = media->hw_engine_mask; u64 mask = media->hw_engine_mask;
/* /* VCS, VECS and GSCCS engines are allowed on the media IP */
* VCS and VECS engines are allowed on the media IP
*
* TODO: Add GSCCS once support is added to the driver.
*/
mask &= ~(XE_HW_ENGINE_VCS_MASK | mask &= ~(XE_HW_ENGINE_VCS_MASK |
XE_HW_ENGINE_VECS_MASK); XE_HW_ENGINE_VECS_MASK |
XE_HW_ENGINE_GSCCS_MASK);
/* Any remaining engines are an error */ /* Any remaining engines are an error */
KUNIT_ASSERT_EQ(test, mask, 0); KUNIT_ASSERT_EQ(test, mask, 0);

20
drivers/gpu/drm/xe/xe_hw_engine.c
View File

@ -26,6 +26,7 @@
#include "xe_rtp.h" #include "xe_rtp.h"
#include "xe_sched_job.h" #include "xe_sched_job.h"
#include "xe_tuning.h" #include "xe_tuning.h"
#include "xe_uc_fw.h"
#include "xe_wa.h" #include "xe_wa.h"
#define MAX_MMIO_BASES 3 #define MAX_MMIO_BASES 3
@ -610,6 +611,24 @@ static void read_compute_fuses(struct xe_gt *gt)
read_compute_fuses_from_dss(gt); read_compute_fuses_from_dss(gt);
} }
static void check_gsc_availability(struct xe_gt *gt)
{
struct xe_device *xe = gt_to_xe(gt);
if (!(gt->info.engine_mask & BIT(XE_HW_ENGINE_GSCCS0)))
return;
/*
* The GSCCS is only used to communicate with the GSC FW, so if we don't
* have the FW there is nothing we need the engine for and can therefore
* skip its initialization.
*/
if (!xe_uc_fw_is_available(&gt->uc.gsc.fw)) {
gt->info.engine_mask &= ~BIT(XE_HW_ENGINE_GSCCS0);
drm_info(&xe->drm, "gsccs disabled due to lack of FW\n");
}
}
int xe_hw_engines_init_early(struct xe_gt *gt) int xe_hw_engines_init_early(struct xe_gt *gt)
{ {
int i; int i;
@ -617,6 +636,7 @@ int xe_hw_engines_init_early(struct xe_gt *gt)
read_media_fuses(gt); read_media_fuses(gt);
read_copy_fuses(gt); read_copy_fuses(gt);
read_compute_fuses(gt); read_compute_fuses(gt);
check_gsc_availability(gt);
BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT < XE_HW_ENGINE_PREEMPT_TIMEOUT_MIN); BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT < XE_HW_ENGINE_PREEMPT_TIMEOUT_MIN);
BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT > XE_HW_ENGINE_PREEMPT_TIMEOUT_MAX); BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT > XE_HW_ENGINE_PREEMPT_TIMEOUT_MAX);

2
drivers/gpu/drm/xe/xe_pci.c
View File

@ -199,7 +199,7 @@ static const struct xe_media_desc media_xelpmp = {
.name = "Xe_LPM+", .name = "Xe_LPM+",
.hw_engine_mask = .hw_engine_mask =
BIT(XE_HW_ENGINE_VCS0) | BIT(XE_HW_ENGINE_VCS2) | BIT(XE_HW_ENGINE_VCS0) | BIT(XE_HW_ENGINE_VCS2) |
BIT(XE_HW_ENGINE_VECS0), /* TODO: add GSC0 */ BIT(XE_HW_ENGINE_VECS0) | BIT(XE_HW_ENGINE_GSCCS0)
}; };
static const struct xe_media_desc media_xe2 = { static const struct xe_media_desc media_xe2 = {