Merge branch 'dev' of github.com:JustEnoughLinuxOS/distribution into dev
This commit is contained in:
commit
58a112848b
9 changed files with 129 additions and 57 deletions
|
@ -194,7 +194,7 @@ OutputModule = cubeb
|
|||
Latency = 100
|
||||
SynchMode = 0
|
||||
SpeakerConfiguration = 0
|
||||
BackendName =
|
||||
BackendName =
|
||||
|
||||
[DEV9/Eth]
|
||||
EthEnable = false
|
||||
|
@ -224,16 +224,16 @@ HddSizeSectors = 83886080
|
|||
|
||||
|
||||
[EmuCore/Gamefixes]
|
||||
VuAddSubHack = false
|
||||
FpuMulHack = false
|
||||
VuAddSubHack = true
|
||||
FpuMulHack = true
|
||||
FpuNegDivHack = false
|
||||
XgKickHack = false
|
||||
EETimingHack = false
|
||||
EETimingHack = true
|
||||
SoftwareRendererFMVHack = false
|
||||
SkipMPEGHack = false
|
||||
OPHFlagHack = false
|
||||
DMABusyHack = false
|
||||
VIFFIFOHack = false
|
||||
DMABusyHack = true
|
||||
VIFFIFOHack = true
|
||||
VIF1StallHack = false
|
||||
GIFFIFOHack = false
|
||||
GoemonTlbHack = false
|
||||
|
|
|
@ -40,6 +40,7 @@ fi
|
|||
#Emulation Station Features
|
||||
GAME=$(echo "${1}"| sed "s#^/.*/##")
|
||||
ASPECT=$(get_setting aspect_ratio ps2 "${GAME}")
|
||||
FILTER=$(get_setting bilinear_filtering ps2 "${GAME}")
|
||||
FPS=$(get_setting show_fps ps2 "${GAME}")
|
||||
RATE=$(get_setting ee_cycle_rate ps2 "${GAME}")
|
||||
SKIP=$(get_setting ee_cycle_skip ps2 "${GAME}")
|
||||
|
@ -61,6 +62,24 @@ fi
|
|||
sed -i '/^AspectRatio =/c\AspectRatio = Stretch' /storage/.config/aethersx2/inis/PCSX2.ini
|
||||
fi
|
||||
|
||||
#Bilinear Filtering
|
||||
if [ "$FILTER" = "0" ]
|
||||
then
|
||||
sed -i '/^filter =/c\filter = 0' /storage/.config/aethersx2/inis/PCSX2.ini
|
||||
fi
|
||||
if [ "$FILTER" = "1" ]
|
||||
then
|
||||
sed -i '/^filter =/c\filter = 1' /storage/.config/aethersx2/inis/PCSX2.ini
|
||||
fi
|
||||
if [ "$FILTER" = "2" ]
|
||||
then
|
||||
sed -i '/^filter =/c\filter = 2' /storage/.config/aethersx2/inis/PCSX2.ini
|
||||
fi
|
||||
if [ "$FILTER" = "3" ]
|
||||
then
|
||||
sed -i '/^filter =/c\filter = 3' /storage/.config/aethersx2/inis/PCSX2.ini
|
||||
fi
|
||||
|
||||
#Graphics Backend
|
||||
if [ "$GRENDERER" = "0" ]
|
||||
then
|
||||
|
|
|
@ -77,7 +77,7 @@ Fastmem = True
|
|||
CPUThread = True
|
||||
DSPHLE = True
|
||||
SkipIdle = True
|
||||
SyncOnSkipIdle = True
|
||||
SyncOnSkipIdle = False
|
||||
SyncGPU = False
|
||||
SyncGpuMaxDistance = 200000
|
||||
SyncGpuMinDistance = -200000
|
||||
|
@ -120,9 +120,9 @@ RunCompareServer = False
|
|||
RunCompareClient = False
|
||||
EmulationSpeed = 1.00000000
|
||||
FrameSkip = 0x00000003
|
||||
Overclock = 4.00000000
|
||||
Overclock = 1.0
|
||||
OverclockEnable = False
|
||||
GFXBackend = Vulkan
|
||||
GFXBackend = Vulkan
|
||||
GPUDeterminismMode = auto
|
||||
PerfMapDir =
|
||||
[Movie]
|
||||
|
@ -138,6 +138,7 @@ DumpUCode = False
|
|||
Backend = ALSA
|
||||
Volume = 100
|
||||
CaptureLog = False
|
||||
DSPThread = True
|
||||
[Input]
|
||||
BackgroundInput = False
|
||||
[FifoPlayer]
|
||||
|
|
|
@ -41,6 +41,7 @@ fi
|
|||
GAME=$(echo "${1}"| sed "s#^/.*/##")
|
||||
AA=$(get_setting anti_aliasing gamecube "${GAME}")
|
||||
ASPECT=$(get_setting aspect_ratio gamecube "${GAME}")
|
||||
CLOCK=$(get_setting clock_speed gamecube "${GAME}")
|
||||
RENDERER=$(get_setting graphics_backend gamecube "${GAME}")
|
||||
IRES=$(get_setting internal_resolution gamecube "${GAME}")
|
||||
FPS=$(get_setting show_fps gamecube "${GAME}")
|
||||
|
@ -102,6 +103,34 @@ fi
|
|||
sed -i '/AspectRatio/c\AspectRatio = 3' /storage/.config/dolphin-emu/GFX.ini
|
||||
fi
|
||||
|
||||
#Clock Speed
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
if [ "$CLOCK" = "0" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 0.5' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "1" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 0.75' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "2" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 1.0' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "3" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 1.25' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "4" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 1.5' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
|
||||
#Video Backend
|
||||
if [ "$RENDERER" = "opengl" ]
|
||||
then
|
||||
|
|
|
@ -44,6 +44,7 @@ ln -sf /storage/roms/savestates/wii /storage/.config/dolphin-emu/StateSaves
|
|||
GAME=$(echo "${1}"| sed "s#^/.*/##")
|
||||
AA=$(get_setting anti_aliasing wii "${GAME}")
|
||||
ASPECT=$(get_setting aspect_ratio wii "${GAME}")
|
||||
CLOCK=$(get_setting clock_speed wii "${GAME}")
|
||||
RENDERER=$(get_setting graphics_backend wii "${GAME}")
|
||||
IRES=$(get_setting internal_resolution wii "${GAME}")
|
||||
FPS=$(get_setting show_fps wii "${GAME}")
|
||||
|
@ -105,6 +106,34 @@ ln -sf /storage/roms/savestates/wii /storage/.config/dolphin-emu/StateSaves
|
|||
sed -i '/AspectRatio/c\AspectRatio = 3' /storage/.config/dolphin-emu/GFX.ini
|
||||
fi
|
||||
|
||||
#Clock Speed
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
if [ "$CLOCK" = "0" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 0.5' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "1" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 0.75' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "2" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 1.0' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "3" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 1.25' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
if [ "$CLOCK" = "4" ]
|
||||
then
|
||||
sed -i '/^Overclock =/c\Overclock = 1.5' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
|
||||
fi
|
||||
|
||||
#Video Backend
|
||||
if [ "$RENDERER" = "opengl" ]
|
||||
then
|
||||
|
|
|
@ -4,10 +4,6 @@
|
|||
|
||||
. /etc/profile
|
||||
|
||||
### Set GPU Govorner to powersave during boot
|
||||
|
||||
echo powersave > /sys/devices/platform/soc/ffe40000.gpu/devfreq/ffe40000.gpu/governor
|
||||
|
||||
### Disable blue blinking led
|
||||
|
||||
echo none > /sys/class/leds/blue\:/trigger
|
||||
|
|
|
@ -88,14 +88,14 @@ performance() {
|
|||
ondemand() {
|
||||
set_cpu_gov ondemand
|
||||
set_amdgpu_perf auto
|
||||
set_gpu_gov ondemand
|
||||
set_gpu_gov simple_ondemand
|
||||
set_dmc_gov ondemand
|
||||
}
|
||||
|
||||
schedutil() {
|
||||
set_cpu_gov schedutil
|
||||
set_amdgpu_perf auto
|
||||
set_gpu_gov ondemand
|
||||
set_gpu_gov simple_ondemand
|
||||
set_dmc_gov ondemand
|
||||
}
|
||||
|
||||
|
|
|
@ -62,6 +62,13 @@
|
|||
<choice name="4/3" value="2"/>
|
||||
<choice name="stretch" value="3"/>
|
||||
</feature>
|
||||
<feature name="clock speed">
|
||||
<choice name="50%" value="0"/>
|
||||
<choice name="75%" value="1"/>
|
||||
<choice name="100% (default)" value="2"/>
|
||||
<choice name="125%" value="3"/>
|
||||
<choice name="150%" value="4"/>
|
||||
</feature>
|
||||
<feature name="graphics backend">
|
||||
<choice name="opengl" value="opengl"/>
|
||||
<choice name="vulkan" value="vulkan"/>
|
||||
|
@ -103,6 +110,13 @@
|
|||
<choice name="4/3" value="2"/>
|
||||
<choice name="stretch" value="3"/>
|
||||
</feature>
|
||||
<feature name="clock speed">
|
||||
<choice name="50%" value="0"/>
|
||||
<choice name="75%" value="1"/>
|
||||
<choice name="100% (default)" value="2"/>
|
||||
<choice name="125%" value="3"/>
|
||||
<choice name="150%" value="4"/>
|
||||
</feature>
|
||||
<feature name="graphics backend">
|
||||
<choice name="opengl" value="opengl"/>
|
||||
<choice name="vulkan" value="vulkan"/>
|
||||
|
@ -310,6 +324,12 @@
|
|||
<choice name="16/9" value="1"/>
|
||||
<choice name="stretch" value="2"/>
|
||||
</feature>
|
||||
<feature name="bilinear filtering">
|
||||
<choice name="nearest" value="0"/>
|
||||
<choice name="forced" value="1"/>
|
||||
<choice name="ps2" value="2"/>
|
||||
<choice name="forced exc. srpite" value="3"/>
|
||||
</feature>
|
||||
<feature name="ee cycle rate">
|
||||
<choice name="50% speed" value="0"/>
|
||||
<choice name="60% speed" value="1"/>
|
||||
|
|
|
@ -14,47 +14,23 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/Makefile linux/arch/arm64/boot
|
|||
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-03-22 12:34:07.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-04-20 18:02:52.949549828 +0000
|
||||
@@ -63,31 +63,31 @@
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-04-28 02:33:08.360181317 +0000
|
||||
@@ -61,14 +61,6 @@
|
||||
gpu_opp_table: opp-table-gpu {
|
||||
compatible = "operating-points-v2";
|
||||
|
||||
opp-124999998 {
|
||||
opp-hz = /bits/ 64 <124999998>;
|
||||
- opp-124999998 {
|
||||
- opp-hz = /bits/ 64 <124999998>;
|
||||
- opp-microvolt = <800000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
};
|
||||
opp-249999996 {
|
||||
opp-hz = /bits/ 64 <249999996>;
|
||||
- };
|
||||
- opp-249999996 {
|
||||
- opp-hz = /bits/ 64 <249999996>;
|
||||
- opp-microvolt = <800000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
};
|
||||
- };
|
||||
opp-285714281 {
|
||||
opp-hz = /bits/ 64 <285714281>;
|
||||
- opp-microvolt = <800000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
};
|
||||
opp-399999994 {
|
||||
opp-hz = /bits/ 64 <399999994>;
|
||||
- opp-microvolt = <800000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
};
|
||||
opp-499999992 {
|
||||
opp-hz = /bits/ 64 <499999992>;
|
||||
- opp-microvolt = <800000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
};
|
||||
opp-666666656 {
|
||||
opp-hz = /bits/ 64 <666666656>;
|
||||
- opp-microvolt = <800000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
};
|
||||
opp-799999987 {
|
||||
opp-hz = /bits/ 64 <799999987>;
|
||||
- opp-microvolt = <800000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1694,7 +1694,7 @@
|
||||
opp-microvolt = <800000>;
|
||||
@@ -1694,7 +1686,7 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
|
@ -63,7 +39,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
|
|||
compatible = "ethernet-phy-id0180.3301",
|
||||
"ethernet-phy-ieee802.3-c22";
|
||||
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@@ -1885,6 +1885,15 @@
|
||||
@@ -1885,6 +1877,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -79,7 +55,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
|
|||
uart_ao_a_pins: uart-a-ao {
|
||||
mux {
|
||||
groups = "uart_ao_a_tx",
|
||||
@@ -2395,14 +2404,19 @@
|
||||
@@ -2395,14 +2396,20 @@
|
||||
};
|
||||
|
||||
mali: gpu@ffe40000 {
|
||||
|
@ -91,6 +67,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
|
|||
+ <0 0xFF800000 0 0x01000>,
|
||||
+ <0 0xFF63c000 0 0x01000>,
|
||||
+ <0 0xFFD01000 0 0x01000>;
|
||||
+
|
||||
interrupt-parent = <&gic>;
|
||||
- interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
|
||||
+ interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
@ -106,7 +83,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
|
|||
#cooling-cells = <2>;
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-04-20 19:22:00.692778406 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-04-27 13:36:34.610877356 +0000
|
||||
@@ -0,0 +1,932 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
|
@ -1112,13 +1089,14 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts linu
|
|||
+};
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-22 12:34:07.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-31 19:19:37.633541167 +0000
|
||||
@@ -137,5 +137,5 @@
|
||||
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-04-28 16:33:01.398687793 +0000
|
||||
@@ -137,5 +137,6 @@
|
||||
};
|
||||
|
||||
&mali {
|
||||
- dma-coherent;
|
||||
+ system-coherency=<0>;
|
||||
+ system-coherency = <0>;
|
||||
+ power_policy = "always_on";
|
||||
};
|
||||
diff -rupN linux.orig/drivers/Kconfig linux/drivers/Kconfig
|
||||
--- linux.orig/drivers/Kconfig 2023-03-22 12:34:07.000000000 +0000
|
||||
|
|
Loading…
Reference in a new issue