diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-06-08 11:59:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-06-08 11:59:57 +1000 |
| commit | 8d286e2ff4400d313955b4203fc640ca6fd9228b (patch) | |
| tree | 5fe44d3527474d78534cf94830a028c169b41ab3 /drivers/gpu/drm/i915/i915_params.c | |
| parent | fa3fa2228c886435b3eea22cea4767f3fb07671f (diff) | |
| parent | f8665d797b1ce9bd81f7ed7744ef3a18d6b186ea (diff) | |
Merge tag 'drm-intel-next-fixes-2020-06-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-nextdrm-next-2020-06-08
- Includes gvt-next-fixes-2020-05-28
- Use after free fix for display global state.
- Whitelisting context-local timestamp on Gen9
and two scheduler fixes with deps (Cc: stable)
- Removal of write flag from sysfs files where
ineffective
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200604150454.GA59322@jlahtine-desk.ger.corp.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_params.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_params.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index add00ec1f787..a3dde770226d 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -173,7 +173,7 @@ i915_param_named(enable_gvt, bool, 0400, #endif #if IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM) -i915_param_named_unsafe(fake_lmem_start, ulong, 0600, +i915_param_named_unsafe(fake_lmem_start, ulong, 0400, "Fake LMEM start offset (default: 0)"); #endif |