@@ -1620,11 +1620,28 @@ static void *intel_dgfx_alloc_opregion(struct drm_i915_private *i915)
static void *intel_dgfx_alloc_rvda(struct drm_i915_private *i915)
{
- return ERR_PTR(-EOPNOTSUPP);
+ struct intel_opregion *opregion = &i915->opregion;
+ void *opreg_rvda;
+
+ if (!opregion->dgfx_oprom_opreg)
+ return ERR_PTR(-EINVAL);
+
+ opreg_rvda = kmemdup(opregion->dgfx_oprom_opreg + opregion->asle->rvda,
+ opregion->asle->rvds, GFP_KERNEL);
+
+ /* We got RVDA, OPROM opregion + vbt image not nedded anymore */
+ kfree(opregion->dgfx_oprom_opreg);
+ opregion->dgfx_oprom_opreg = NULL;
+
+ return opreg_rvda ?: ERR_PTR(-ENOMEM);
}
static void intel_dgfx_free_rvda(struct drm_i915_private *i915, void *rvda)
{
+ if (IS_ERR(rvda))
+ return;
+
+ kfree(rvda);
}
static void intel_dgfx_free_opregion(struct drm_i915_private *i915, void *opreg)
Since OpRegion ver 2.1 MBOX3 RVDA field is Relative address of Raw VBT data from OpRegion Base. Populate the opreion->rvda accordingly. As Intel DGFX cards supports OpRegion version 2.2 or greater, RVDA as an absolute VBT physical address (Ver 2.0) doesn't applicable to DGFX cards. v2: - Add kzalloc NULL check for opreg_rvda pointer. v3: - Added kmemdup() insead of kzalloc() + memcpy() in intel_dgfx_alloc_rvda(), and added necessary credit to Manasi. v4: - Added IS_ERR(rvda)in free_rvda(). [Jani] - Fix free_{opregion, rvda} abstraction level. [Jani] Cc: Jani Nikula <jani.nikula@intel.com> Cc: Uma Shankar <uma.shankar@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Badal Nilawar <badal.nilawar@intel.com> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> --- drivers/gpu/drm/i915/display/intel_opregion.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)