From 2ccee23f2562adac0ea1fb69f925a0d0d5d382fb Mon Sep 17 00:00:00 2001 From: Jay Cornwall Date: Thu, 25 Jan 2018 13:06:56 -0600 Subject: [PATCH 3285/4131] drm/amdkfd: Remove executable permission requirement for gfx9 CP IBs When using ATC addressing for CP IBs the system PTE must be both writable and executable. This violates the requirements of some kernel security systems. Drop the executable requirement for CP IBs on gfx9. Change-Id: I22aee0f8b527be5cccd4530f477e1bb0be4019bc Signed-off-by: Jay Cornwall --- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c index 977fcf9..ed2b9d3 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c @@ -222,7 +222,8 @@ static int update_mqd(struct mqd_manager *mm, void *mqd, pr_debug("cp_hqd_pq_doorbell_control 0x%x\n", m->cp_hqd_pq_doorbell_control); - m->cp_hqd_ib_control = 3 << CP_HQD_IB_CONTROL__MIN_IB_AVAIL_SIZE__SHIFT; + m->cp_hqd_ib_control = 3 << CP_HQD_IB_CONTROL__MIN_IB_AVAIL_SIZE__SHIFT | + 1 << CP_HQD_IB_CONTROL__IB_EXE_DISABLE__SHIFT; /* * HW does not clamp this field correctly. Maximum EOP queue size -- 2.7.4