diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-07-17 10:40:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-07-17 10:41:02 +1000 |
| commit | 2e33bfe53cba8558eb83f3fd327d0a5e21172baa (patch) | |
| tree | 3db3d70d73a6f39d4fbef9482989954a8e4bd696 /drivers/gpu/drm/omapdrm/dss/sdi.c | |
| parent | 295a8c0b0e44760ef7e06c55beacbe0caafe1ce7 (diff) | |
| parent | ec6444a00c49e6c2b5e9a507272a28126677f9ee (diff) | |
Merge tag 'drm-misc-next-2026-07-16' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 7.3:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- blend: allow blend mode property without PREMULTI
- bridges:
- Rename drm_for_each_bridge_in_chain_scoped to
drm_for_each_bridge_in_chain
- Drop legacy bridges support
- gpusvm: Code reorganization to give drivers more flexibility
Driver Changes:
- etnaviv: Check if a reset has been successful
- nouveau: Create instmem iomapping at first use
- panthor: Remove redundant cleanup
- qxl: Convert to a simple encoder to a regular one
- bridges:
- Convert all remaining legacy bridges to atomic
- tc358767: clamp the reported AUX read size to the request
- panels:
- novatek-nt37801: Use mipi_dsi_*_multi() functions
- samsung-s6d16d0: Fix prepare error handling
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20260716-famous-pastel-ostrich-a1aaef@houat
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/sdi.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/sdi.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c index df4cbc683e2c..d4a3c0ecaaf2 100644 --- a/drivers/gpu/drm/omapdrm/dss/sdi.c +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c @@ -16,6 +16,7 @@ #include <linux/regulator/consumer.h> #include <linux/string.h> +#include <drm/drm_atomic_state_helper.h> #include <drm/drm_bridge.h> #include "dss.h" @@ -197,7 +198,8 @@ static void sdi_bridge_mode_set(struct drm_bridge *bridge, sdi->pixelclock = adjusted_mode->clock * 1000; } -static void sdi_bridge_enable(struct drm_bridge *bridge) +static void sdi_bridge_enable(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { struct sdi_device *sdi = drm_bridge_to_sdi(bridge); struct dispc_clock_info dispc_cinfo; @@ -260,7 +262,8 @@ err_get_dispc: regulator_disable(sdi->vdds_sdi_reg); } -static void sdi_bridge_disable(struct drm_bridge *bridge) +static void sdi_bridge_disable(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { struct sdi_device *sdi = drm_bridge_to_sdi(bridge); @@ -274,12 +277,15 @@ static void sdi_bridge_disable(struct drm_bridge *bridge) } static const struct drm_bridge_funcs sdi_bridge_funcs = { + .atomic_create_state = drm_atomic_helper_bridge_create_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .attach = sdi_bridge_attach, .mode_valid = sdi_bridge_mode_valid, .mode_fixup = sdi_bridge_mode_fixup, .mode_set = sdi_bridge_mode_set, - .enable = sdi_bridge_enable, - .disable = sdi_bridge_disable, + .atomic_enable = sdi_bridge_enable, + .atomic_disable = sdi_bridge_disable, }; static void sdi_bridge_init(struct sdi_device *sdi) |