diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2022-04-11 15:01:56 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-04-11 15:01:56 +0200 |
| commit | 83970cd63b9f864525761137b500113ab0b49c94 (patch) | |
| tree | 747b97113d60666cbb44f8a5633b961b7eda3c86 /drivers/gpu/drm/i915/i915_params.c | |
| parent | drm/i915/uncore: Warn only if unclaimed access remains flagged (diff) | |
| parent | Linux 5.18-rc1 (diff) | |
| download | linux-83970cd63b9f864525761137b500113ab0b49c94.tar.xz linux-83970cd63b9f864525761137b500113ab0b49c94.zip | |
Merge drm/drm-next into drm-intel-next
Sync up with v5.18-rc1, in particular to get 5e3094cfd9fb
("drm/i915/xehpsdv: Add has_flat_ccs to device info").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_params.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_params.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 1930487e5f09..5ad071e09301 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -197,11 +197,6 @@ i915_param_named(enable_gvt, bool, 0400, "Enable support for Intel GVT-g graphics virtualization host support(default:false)"); #endif -#if IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM) -i915_param_named_unsafe(fake_lmem_start, ulong, 0400, - "Fake LMEM start offset (default: 0)"); -#endif - #if CONFIG_DRM_I915_REQUEST_TIMEOUT i915_param_named_unsafe(request_timeout_ms, uint, 0600, "Default request/fence/batch buffer expiration timeout."); |