<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26039">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/intel/gma: use soc/intel/common for loading VBT from cbfs<br><br>Change-Id: I8d149c8b480e457a4f3e947f46d49ab45c65ccdc<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/drivers/intel/gma/opregion.c<br>1 file changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/26039/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c</span><br><span>index b939b88..298a657 100644</span><br><span>--- a/src/drivers/intel/gma/opregion.c</span><br><span>+++ b/src/drivers/intel/gma/opregion.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <cbmem.h></span><br><span> #include "intel_bios.h"</span><br><span> #include "opregion.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <soc/intel/common/vbt.h></span><br><span> </span><br><span> /* Write ASLS PCI register and prepare SWSCI register. */</span><br><span> void intel_gma_opregion_register(uintptr_t opregion)</span><br><span>@@ -167,14 +168,17 @@</span><br><span> </span><br><span> static enum cb_err locate_vbt_cbfs(struct region_device *rdev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cbfsf file_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+       size_t vbt_data_size;</span><br><span style="color: hsl(120, 100%, 40%);">+ void *vbt_data = locate_vbt(&vbt_data_size);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* try to locate vbt.bin in CBFS */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (cbfs_boot_locate(&file_desc, "vbt.bin", NULL) == CB_SUCCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">-                cbfs_file_data(rdev, &file_desc);</span><br><span style="color: hsl(0, 100%, 40%);">-           printk(BIOS_INFO, "GMA: Found VBT in CBFS\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                return CB_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-      }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (vbt_data == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+         return CB_ERR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rdev_chain(rdev, &addrspace_32bit.rdev, (uintptr_t)vbt_data,</span><br><span style="color: hsl(120, 100%, 40%);">+      vbt_data_size))</span><br><span style="color: hsl(120, 100%, 40%);">+           return CB_ERR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      printk(BIOS_INFO, "GMA: Found VBT in CBFS\n");</span><br><span> </span><br><span>         return CB_ERR;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26039">change 26039</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26039"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8d149c8b480e457a4f3e947f46d49ab45c65ccdc </div>
<div style="display:none"> Gerrit-Change-Number: 26039 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>