From faabafad2b7818f6c40ad9392096f9e7766819a9 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Mon, 22 Jun 2026 07:54:05 +1000
Subject: [PATCH] [mipi_rgb] Fix offsets for Wave 5 1024x600 (#17057)

---
 esphome/components/mipi/__init__.py              | 5 +++++
 tests/components/mipi_rgb/test.esp32-s3-idf.yaml | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/esphome/components/mipi/__init__.py b/esphome/components/mipi/__init__.py
index 129befe600..caa33cd834 100644
--- a/esphome/components/mipi/__init__.py
+++ b/esphome/components/mipi/__init__.py
@@ -322,6 +322,9 @@ class DriverChip:
                     - defaults.get(CONF_OFFSET_WIDTH, 0)
                     - defaults.get(CONF_PAD_WIDTH, 0)
                 )
+            elif defaults[CONF_WIDTH] > defaults[CONF_NATIVE_WIDTH]:
+                defaults[CONF_NATIVE_WIDTH] = defaults[CONF_WIDTH]
+
         else:
             native_width = (
                 defaults.get(CONF_WIDTH, 0)
@@ -337,6 +340,8 @@ class DriverChip:
                     - defaults.get(CONF_OFFSET_HEIGHT, 0)
                     - defaults.get(CONF_PAD_HEIGHT, 0)
                 )
+            elif defaults[CONF_HEIGHT] > defaults[CONF_NATIVE_HEIGHT]:
+                defaults[CONF_NATIVE_HEIGHT] = defaults[CONF_HEIGHT]
         else:
             native_height = (
                 defaults.get(CONF_HEIGHT, 0)
diff --git a/tests/components/mipi_rgb/test.esp32-s3-idf.yaml b/tests/components/mipi_rgb/test.esp32-s3-idf.yaml
index 399c25c1d0..b56ebee21e 100644
--- a/tests/components/mipi_rgb/test.esp32-s3-idf.yaml
+++ b/tests/components/mipi_rgb/test.esp32-s3-idf.yaml
@@ -1,7 +1,11 @@
 packages:
-  spi: !include ../../test_build_components/common/spi/esp32-s3-idf.yaml
+  - !include ../../test_build_components/common/i2c/esp32-s3-idf.yaml
 
 psram:
   mode: octal
 
-<<: !include common.yaml
+ch422g:
+
+display:
+  - platform: mipi_rgb
+    model: WAVESHARE-5-1024X600