drm/i915/gvt: Add missing symbol export.
Subsystems (2)
PATCH 1/1 drm/i915/gvt: Add missing symbol export.
When CONFIG_DRM_I915_DEBUG_RUNTIME and CONFIG_DRM_I915_DEBUG_PM are enabled, two more extra symols in i915 are required to be exported.
--- drivers/gpu/drm/i915/intel_gvt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_gvt.c +2 -0
@@ -309,6 +309,7 @@ EXPORT_SYMBOL_NS_GPL(__intel_context_do_pin, I915_GVT);EXPORT_SYMBOL_NS_GPL (__intel_context_do_unpin,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_ring_begin,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_get,I915_GVT ); +EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_put,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_put_unchecked,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_uncore_forcewake_for_reg,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_uncore_forcewake_get,I915_GVT );
@@ -316,3 +317,4 @@ EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_put, I915_GVT);EXPORT_SYMBOL_NS_GPL (shmem_pin_map,I915_GVT );EXPORT_SYMBOL_NS_GPL (shmem_unpin_map,I915_GVT );EXPORT_SYMBOL_NS_GPL (__px_dma,I915_GVT ); +EXPORT_SYMBOL_NS_GPL (i915_fence_ops,I915_GVT );
Signature · 1 line
2.17.1
Quoted 24 lines · Zhi Wang
When
CONFIG_DRM_I915_DEBUG_RUNTIMEandCONFIG_DRM_I915_DEBUG_PMare enabled, two more extra symols in i915 are required to be exported.Cc Jani Nikula <[email protected]>Signed-off-by Zhi Wang <[email protected]>--- drivers/gpu/drm/i915/intel_gvt.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_gvt.c +1
-0@@ -309,6 +309,7 @@ EXPORT_SYMBOL_NS_GPL(__intel_context_do_pin, I915_GVT);EXPORT_SYMBOL_NS_GPL (__intel_context_do_unpin,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_ring_begin,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_get,I915_GVT ); +EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_put,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_put_unchecked,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_uncore_forcewake_for_reg,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_uncore_forcewake_get,I915_GVT );
drivers/gpu/drm/i915/intel_gvt.c EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_put, I915_GVT); · line 320
Quoted 4 lines
drivers/gpu/drm/i915/intel_gvt.c +1
-0@@ -316,3 +317,4 @@ EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_put, I915_GVT);EXPORT_SYMBOL_NS_GPL (shmem_pin_map,I915_GVT );EXPORT_SYMBOL_NS_GPL (shmem_unpin_map,I915_GVT );EXPORT_SYMBOL_NS_GPL (__px_dma,I915_GVT ); +EXPORT_SYMBOL_NS_GPL (i915_fence_ops,I915_GVT );
Jani:
Can you give this an rb? As I can't give myself a rb.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gvt: Add missing symbol export.
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: drm/i915/gvt: Add missing symbol export.
URL : https://patchwork.freedesktop.org/series/103101/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/103101/revisions/1/mbox/ not applied
Applying: drm/i915/gvt: Add missing symbol export.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_gvt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_gvt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_gvt.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/gvt: Add missing symbol export.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Quoted 6 lines · Zhi Wang
When
CONFIG_DRM_I915_DEBUG_RUNTIMEandCONFIG_DRM_I915_DEBUG_PMare enabled, two more extra symols in i915 are required to be exported.Cc Jani Nikula <[email protected]>Signed-off-by Zhi Wang <[email protected]>
Quoted 21 lines
--- drivers/gpu/drm/i915/intel_gvt.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_gvt.c +2
-0@@ -309,6 +309,7 @@ EXPORT_SYMBOL_NS_GPL(__intel_context_do_pin, I915_GVT);EXPORT_SYMBOL_NS_GPL (__intel_context_do_unpin,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_ring_begin,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_get,I915_GVT ); +EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_put,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_runtime_pm_put_unchecked,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_uncore_forcewake_for_reg,I915_GVT );EXPORT_SYMBOL_NS_GPL (intel_uncore_forcewake_get,I915_GVT );@@ -316,3 +317,4 @@ EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_put, I915_GVT);EXPORT_SYMBOL_NS_GPL (shmem_pin_map,I915_GVT );EXPORT_SYMBOL_NS_GPL (shmem_unpin_map,I915_GVT );EXPORT_SYMBOL_NS_GPL (__px_dma,I915_GVT ); +EXPORT_SYMBOL_NS_GPL (i915_fence_ops,I915_GVT );
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center