diff --git a/.pick_status.json b/.pick_status.json index ecd85578329..3f26f535fcd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -324,7 +324,7 @@ "description": "panfrost: fix panfrost drm-shim", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "91fe8a0d2859e0b869edf83a56c463cf548ac10a", "notes": null diff --git a/src/panfrost/drm-shim/panfrost_noop.c b/src/panfrost/drm-shim/panfrost_noop.c index bf3e97d17fb..dd25ed66295 100644 --- a/src/panfrost/drm-shim/panfrost_noop.c +++ b/src/panfrost/drm-shim/panfrost_noop.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2021 Icecream95 * Copyright (C) 2019 Google LLC + * Copyright (C) 2024 Collabora, Ltd. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -75,6 +76,14 @@ pan_ioctl_get_param(int fd, unsigned long request, void *arg) case DRM_PANFROST_PARAM_AFBC_FEATURES: gp->value = 0; return 0; + case DRM_PANFROST_PARAM_MEM_FEATURES: + /* lazy default, but works for the purposes of drm_shim */ + gp->value = 0x0; + return 0; + case DRM_PANFROST_PARAM_MMU_FEATURES: + /* default for most hardware so far */ + gp->value = 0x00280030; + return 0; default: fprintf(stderr, "Unknown DRM_IOCTL_PANFROST_GET_PARAM %d\n", gp->param); return -1;