diff --git a/.pick_status.json b/.pick_status.json index ae072662d65..5ed4d468d60 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -164,7 +164,7 @@ "description": "pan/kmod: fix priority query logic", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f04dbf0bc0bf34818c7cdb1852154b396c81de99", "notes": null diff --git a/src/panfrost/lib/kmod/panfrost_kmod.c b/src/panfrost/lib/kmod/panfrost_kmod.c index 82587c90ca4..df69090f319 100644 --- a/src/panfrost/lib/kmod/panfrost_kmod.c +++ b/src/panfrost/lib/kmod/panfrost_kmod.c @@ -215,14 +215,14 @@ panfrost_dev_query_props(const struct pan_kmod_dev *dev, * priority as medium if the param doesn't exist. */ uint64_t prios = panfrost_query_raw(fd, DRM_PANFROST_PARAM_ALLOWED_JM_CTX_PRIORITIES, - false, PANFROST_JM_CTX_PRIORITY_MEDIUM); + false, BITFIELD_BIT(PANFROST_JM_CTX_PRIORITY_MEDIUM)); - if (prios & PANFROST_JM_CTX_PRIORITY_LOW) + if (prios & BITFIELD_BIT(PANFROST_JM_CTX_PRIORITY_LOW)) props->allowed_group_priorities_mask |= PAN_KMOD_GROUP_ALLOW_PRIORITY_LOW; - if (prios & PANFROST_JM_CTX_PRIORITY_MEDIUM) + if (prios & BITFIELD_BIT(PANFROST_JM_CTX_PRIORITY_MEDIUM)) props->allowed_group_priorities_mask |= PAN_KMOD_GROUP_ALLOW_PRIORITY_MEDIUM; - if (prios & PANFROST_JM_CTX_PRIORITY_HIGH) + if (prios & BITFIELD_BIT(PANFROST_JM_CTX_PRIORITY_HIGH)) props->allowed_group_priorities_mask |= PAN_KMOD_GROUP_ALLOW_PRIORITY_HIGH; }