Methods and systems are described for controlling engine combustion during a mixed-mode combustion modality. A target exhaust valve timing is determined based on a first combination of engine speed and load. An amount of trapped residual in an engine cylinder after an exhaust valve is closed during a first combustion cycle is also determined. Based at least in part on the amount of trapped residual, an amount of gas that will be drawn into the engine cylinder when the intake valve is opened during a second combustion cycle is determined. The target exhaust valve timing is then adjusted during the second combustion cycle in order to adjust the amount of gas that will be drawn into the engine cylinder when the intake valve is opened during a third combustion cycle.