diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-01-05 23:28:10 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-01-05 23:28:10 +0300 |
| commit | 4565e042549e320f8d3942ff118ecd27f2b9233b (patch) | |
| tree | d3e1ea331847ee40e0b4dd03f67e49b4ed8357a5 /drivers/gpu/drm/i915/gvt/handlers.c | |
| parent | 6b9663413ba702a5fc969cb496ef7b43f00bd92f (diff) | |
| parent | e056f669dbf76b8752b6cb0b8edd2f75cbdcabb1 (diff) | |
| download | linux-4565e042549e320f8d3942ff118ecd27f2b9233b.tar.xz | |
Merge tag 'gvt-next-fixes-2020-12-25' of https://github.com/intel/gvt-linux into drm-intel-next
gvt-next-fixes-2020-12-25
- Avoid one useless inline (Jani)
- make gvt header self-contained, fix CONFIG_DRM_I915_WERROR (Jani)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201225022009.GF16939@zhen-hp.sh.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/handlers.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/handlers.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index 91245d297950..94aaf945149e 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c @@ -3645,8 +3645,7 @@ void intel_gvt_restore_fence(struct intel_gvt *gvt) } } -static inline int mmio_pm_restore_handler(struct intel_gvt *gvt, - u32 offset, void *data) +static int mmio_pm_restore_handler(struct intel_gvt *gvt, u32 offset, void *data) { struct intel_vgpu *vgpu = data; struct drm_i915_private *dev_priv = gvt->gt->i915; |