From 2c16092a21da83b89ea61b459eecc387966caf8c Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Fri, 6 Sep 2024 18:39:29 -0500
Subject: [PATCH] mb/google/zork: Add Kconfig to set IGD UMA allocation via
 APCB

Add a Kconfig choice to select the IGD UMA allocation, which selects a
precompiled ACPB binary with the corresponding UMA value set. Default
to the previous value (128MB) for non-ChromeOS builds, and 64MB for
ChromeOS as that is the value used there.

TEST=build/boot google/morphius, verify UMA size changes with selection
via dxdiag tool under Windows.

Change-Id: I6debd10527c33ce37ef3ada20955c8f7b7500039
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84237
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/zork/Kconfig             |  21 ++++++++++++++++++
 src/mainboard/google/zork/spd/Makefile.mk     |  11 ++++++++-
 .../google/zork/{data.apcb => uma_128.apcb}   | Bin 4672 -> 4672 bytes
 src/mainboard/google/zork/uma_256.apcb        | Bin 0 -> 4672 bytes
 src/mainboard/google/zork/uma_512.apcb        | Bin 0 -> 4672 bytes
 src/mainboard/google/zork/uma_64.apcb         | Bin 0 -> 4672 bytes
 6 files changed, 31 insertions(+), 1 deletion(-)
 rename src/mainboard/google/zork/{data.apcb => uma_128.apcb} (97%)
 create mode 100644 src/mainboard/google/zork/uma_256.apcb
 create mode 100644 src/mainboard/google/zork/uma_512.apcb
 create mode 100644 src/mainboard/google/zork/uma_64.apcb

diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 1fcd06ba8e..1b38d270ee 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -301,4 +301,25 @@ config CHROMEOS_WIFI_SAR
 	select SAR_ENABLE
 	select USE_SAR
 
+choice
+	prompt "UMA Memory Allocation"
+	default ZORK_UMA_SIZE_64MB if CHROMEOS
+	default ZORK_UMA_SIZE_128MB
+	help
+	  The amount of system memory allocated for the integrated GPU.
+
+config ZORK_UMA_SIZE_64MB
+	bool "64MB"
+
+config ZORK_UMA_SIZE_128MB
+	bool "128MB"
+
+config ZORK_UMA_SIZE_256MB
+	bool "256MB"
+
+config ZORK_UMA_SIZE_512MB
+	bool "512MB"
+
+endchoice
+
 endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
diff --git a/src/mainboard/google/zork/spd/Makefile.mk b/src/mainboard/google/zork/spd/Makefile.mk
index 3e6509d9ae..1f0b20ce0d 100644
--- a/src/mainboard/google/zork/spd/Makefile.mk
+++ b/src/mainboard/google/zork/spd/Makefile.mk
@@ -5,7 +5,16 @@ SPD_SOURCES_DIR=$(dir $(word 1, $(SPD_SOURCES)))
 APCB_SOURCES=$(foreach f, $(basename $(notdir $(SPD_SOURCES))), $(obj)/APCB_$(f).gen)
 
 # APCB binary with magic numbers to be replaced by apcb_edit tool
-APCB_NAME=data.apcb
+ifeq ($(CONFIG_ZORK_UMA_SIZE_64MB),y)
+APCB_NAME=uma_64.apcb
+else ifeq ($(CONFIG_ZORK_UMA_SIZE_128MB),y)
+APCB_NAME=uma_128.apcb
+else ifeq ($(CONFIG_ZORK_UMA_SIZE_256MB),y)
+APCB_NAME=uma_256.apcb
+else ifeq ($(CONFIG_ZORK_UMA_SIZE_512MB),y)
+APCB_NAME=uma_512.apcb
+endif
+
 APCB_PATH=$(src)/mainboard/$(MAINBOARDDIR)
 
 $(obj)/APCB_%.gen:	$(SPD_SOURCES_DIR)%.hex \
diff --git a/src/mainboard/google/zork/data.apcb b/src/mainboard/google/zork/uma_128.apcb
similarity index 97%
rename from src/mainboard/google/zork/data.apcb
rename to src/mainboard/google/zork/uma_128.apcb
index ee1269494605ccbf2bd5fb43c26a0ebf122c2f8a..fd605b418764478f463a33022ee62f0786ffc59d 100644
GIT binary patch
delta 26
hcmX@0azI7UF~HeLfkA=6L5P8&{mXtWfsKOtLI7c92KfL0

delta 26
hcmX@0azI7UF~HeLfkA=6L5P82&hJ#Nyp4kTLI7a;2KfL0

diff --git a/src/mainboard/google/zork/uma_256.apcb b/src/mainboard/google/zork/uma_256.apcb
new file mode 100644
index 0000000000000000000000000000000000000000..f3bd14fd16cf42c4413c460c55426b2d14fe5e0d
GIT binary patch
literal 4672
zcmeH~zi%8x6oB8{&h4)6Y>yKXHgQaRF(ytz04D_J2LYe$kfVt>Vpf6x!cssd1Sky^
zibM(*bQCnCB8sdu2q`s{h4=#~XyFf_qNZ8Cw>xWZ_TmC0Xza1SeKT+0do%N9ZZ)&i
zUs>)*N4on(zWM%-FP7xd(qHZOOfn$`^%|IDP5Kp+K>qsuw;xKJh%?4D8ZHQ&wXWH8
zVd$dB#jzV1ajlkXx83Nd8yj=u<IZ7z<!Y}J`1qT|4U(q3U5Rf@Af^EUSZG2B5yUV8
zt(#)nFdB$t(-LU;CBi}^{!oKu#0~$GxYu60*0X;6zcL@2MDnR7%NJuJ#y?>EV5v7D
zga~37fflp}j2}4$<KSQd_Q8I5VouCK<dXx|0C@;`7$&J7fhl+jj>0r_;26xn(=ZFq
zz;T#^6L1nv&53yyPQ!EXd?e-tn1?fP7B0X=xHJ&+GV(lJh8N)+EWk^!2(Q4a(2er7
z$W!sqvT^*M$b_z^u8qiMmWg!3ye>v<)l3?NV(Y1I%+al;Rt%0diT85-zvX&f*5mCZ
zU`2}sL*DahUDJHMk$*OS+~?JMVi#v%!_R$tZ<xKkv5WUZb?W!)dxMY1-gl##q1{`5
zFtj)Jz8kxDHxx6s$r+iiBtg#__p&V0)8R%gjodG!d4RM@S8iAAqc+O?Hi6PazR@Tv
zLG`t@8YtFh{WMyMxO3GeeVMJjzC$}d<a)hLu8ZobWu3;imn7Hg{H#aM$oV-rHJjOD
zn%<<Hy^*FLsr(>K2P$u+>BlO+Ow&(Pex0VDsr)WYZ>h`*KdO1L$?8x(wf{RX)UWE2
zcjO_mEXT@<N}r{rx{fm=SIePtU`Qh}gRbG@lzCdN=~O@Kb!uDMU8(6*Z<8DHGy1Zi
z5_zkcpHa1&yj{LTav^oOj>)S;)NB^EZTdx=s!bVhD~=TRW?eUZS3-3=j&$=Wl;f$}
z*yLR~PzLrfbYQ9~eKejH?MH7(N(*klA;{eyGbbIpvZGJ`;A8t~;<M<{_>c7CeKc-4
z?6RL7eQG(tH7`5$W0Uu4`!>Hd;?oW9#&_eQrM(wzo4o&z?60o8-V6Pm{wtz{Nn0-G
zBPt%oOz{<g04y{iyv-+NiXYjuxBQ7=WcZH$Yu}aS)n4Ssu|d=*8I#Ye;~@FwFigUc
zH8C^D<8TU2ceu+V`Cyu})X%{JoTvRJT!&SHF<#w({9l~phZ+PI%%-f1=AJ7yeLCqN
P%VJJody<y=@iqM$EW^J6

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/zork/uma_512.apcb b/src/mainboard/google/zork/uma_512.apcb
new file mode 100644
index 0000000000000000000000000000000000000000..0914c2a6a3bddeacaf2b0104be31e30a5b4a66c9
GIT binary patch
literal 4672
zcmeH~zi%8x6oB8{&h4)6Y)=vrHgQaRaZH?q08R+b4+6f}A*P9P#H<to2ulH-5Fj^{
zkx1c!j+RtJk(CZ9HI;?<11Jz3{0%fTG@I}3&f1&3xBv+n-&o(hnYZt~nRzoF&0Og%
zEq0_M-F+gr{#u*+O`a~jmEN*R_J~2f3MN^VUd1GkzyJ9ChY}~^jB$;I3j$}YYc^dN
zx+rpS>_$dhtL55lH#+LZ#@zV0bC_Sfw%iGP{7vEpNmFiB;u{l)X+QuLnh-(+F^oX#
zj+i!#1|r#%1X_NHun>tq(O?;I!~Z1i^|!AtTR;9^nU75(`9hQBi!l-7?=ya|)SD1O
z1Tl<23)+3gj~s(>aIgpV!ajIzR?Gq9^L^F;c@TLBCa52VNq7N{z!Y@gC``jKn1L7J
zILyKcI0>g_#k>Tk;bnLw67wp|!5KIU7vLgX>Wg^;c^)pqYj6(c;dNMmH{mVlM)_Lg
zsd#MJIQ~zhqwA?_BeI!gBHb{ri&0xOlSZM~`qeMy$W~J;21lF3!(9Jwxt^2tczX$0
z(PF`n54>8}G+%GzpUofldi7B3;tXu~xo__cGu#`yct2F9{;<9`I6Q{uMm0mbxBh5g
zZw$|k-Mbr#ncL)y%vF-0cZ~;Gmg((qBbP=V7ScRI+N3LYEA~+vW&WB#X(Hcfl$D_R
z*;)-0>u>!wT8X%G)h0ceseQgjJHO<5y-jY4>Z)a(#&?$_*X#VONAJk_JvlX-*+QD$
zp`G1G(@#}?oTh!1YiatK%CFP(bCutw>6a?MPt!G(S>Z=DFE&{j$fx#y4+i>GUGly>
zMwaDhSyAb;bfvE2&dAeppzI&eh)knv_&8;r7Hc}y&v>2MmUdTbI@R0cw)~8~ET}}@
zYvy-U?Iv%RACWvrU9MyDDiJlC`E8qC5vOWX#@mV`#k*P8O}~{;-Hs#Od<x}w>NYm{
zK=zk`eGDC#s!AV?r$zhGSCZ0#+i(za_h-yW$FA(?(>w6Yewz3!cr^Y~{dgaZTMoPI
zXGfn}4sgxOPW{;A!`i;hUyb;5!~605xM*qbMcXDH{UiHpOYba){!RZ4QNpAxm-7)7
zKgLXQia-Dsnh@UQNSWlHY|2~y#4s{^NB_0&(&EZ;<j1i=)F>H~ud3r9`Q{Kzz~NOf
z)5zm+3Ql);%Og23%~|T_U>?rXeiv@S3c(n!Zb0_Z#R>jVgW!VMly%YE^Tei4Cmm#2
N%nAHX(o#Q8(<io0zX1RM

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/zork/uma_64.apcb b/src/mainboard/google/zork/uma_64.apcb
new file mode 100644
index 0000000000000000000000000000000000000000..99abf34f1406bd7a7c0a4888c0030b5ae19feb3f
GIT binary patch
literal 4672
zcmeH~&2Lpj6u{5CJNKjSwH-k4LaFVeR0@b%5KBR{j~01s2oLH_6g4(M^J3JnaY-VH
zUAS{AD+y`XnXq=%82<nlZsl)q?dJMB_oKbsM;DUFrf-_xJ2U5=b7tnubTV_Px3b)p
zwsiK1_}@=0K9Q$OZ?)Go@g6a#*TBSU(yN$w^3RjMekpMx&KTEdIL~v|I^TCe;KI;F
zksBFt&8BO$+~}wq8*}61&S8G}O1JG5@i&R<#lC!4iEoT2rU4#U@F9Q@A{c?@Z80qv
z^+eKX@wEIAVj&WJuEA2`2LDUkYwus{+G6~FG9Md<^0g+bD8_`0zt8x=QuiT%5F!|X
zCbasDA2|l&;9w8zg?;eSoR|a1m;0;%@*wgMOi(`zlkf^m!8Ekt2+Y7yn1xs27|g+O
zH~}Z;#JmQl;B|N-6!Rv`!)Z7Ji*Oz;^u@e`JO>xyEjSAc@HQ;LyYL=#!fY+FR6Mq9
zoZ^oZ>3Ztgh-{{*NGHhZV$@d6q>(GOe)Wr)+G=XW;ArD$nClmo>v>s^wwHhv%@+*$
zpit|YX6udo+y8ZMp&p7|oPmvE?%R9A4EM$^-VfEOKdkQ!4v*ovQO(fqtv?#r8^d#B
z_wI&#<~BYp^OYp%UE@KTrg}Tv$fS{nxipWEHtxvXihbBZnY|`Zny_dz%8FP0Y^?^0
z^tXN+twh|pYU7^F);`~(on3MZy^U{*>Z)a(#!nX{)9d_ff!>j`dvann)1@T2O*_4w
zBwwifEJ^w*?<C2WD!)sTuT=h+B;Tm~IZ5uQOmjb~S+VizKt8qqdoa+i>f(>&F|sU2
z%8JS&OPA_8?u<Mw2g?2djmQkTMiHmX({fFx`q@IKwx!+WnojjLz9qk-FAFM>5B%(o
zs@-Jm@*|Q5smpXsUL~Stv#@Q`%i~mS%6MCGB!4&Sy6LwPs@rj-lTD!<Pu<4GAIttS
za1lcXrmE6M<7v@;^p&JE;T9Z(%>5a2(y=Q$`t%MwvmYOyr2>urR6m7}#w~|k_Oqi;
zEeE(}Wv6~@{7G%!X0JwkI>G(uew4Sg_q=W6Pydtsm6faApm@{&K$IYE$;E6$`HwM^
zoFd?X1s{UD94V9hlT8<vzcGvy-_hsxU0Gi3hQ&BGh#JOY@@;h-B;Oo@2{^naW(Ii-
zPQs}+Z+RpKra43XEG)n|+Be`PtP+gzvH?5P&QI`<>UoQ1Q`SXu&l8(IowSi<F~{*c
KK}-EOP5%YeaJ~Tm

literal 0
HcmV?d00001