From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE6BD43C058 for ; Fri, 15 May 2026 09:03:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778835812; cv=none; b=joDQjuKqH6OOjc+bpZeUrAMQ/S1wc8YGfGCsj/Dx/imMNWvJEf1Cu1u+OxsOLiVf6h5uyAlmyGBxuUlybVpfWcvKYpF85nrjC+p/6RtfstTWs0j4DKh1CRXdNdTS4NRx8sz/hlGQN1AJdGjeNicN8ARbAHIUD84vaH+hvindZeI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778835812; c=relaxed/simple; bh=d/4BPf727dgjBLLrAD2ItflvfvirRZYjEqYhr61QS5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dt8GCnJdYRmhWrQ9AeBWoFv50EZd4Nz6PvEyzvvci2VUEHyJ8qTIkTiy/NIUzfBCw8WhTgnJpLEx/TmUBeFh6sARqG3Vrw0ka325K9oWv8PdYdD1SZ4dj1nEmM8f5H5N9BVQhh51mAl5AzEYdTSxYngq5fPeGhQWA1LyLQja9bI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Hs+dxzUa; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=al/R5Iss; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Hs+dxzUa"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="al/R5Iss" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778835809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5MCG+fM5A/Si4GdqqrKoi0Lqzyly0wOM9ZpNecCUS1U=; b=Hs+dxzUaCcClJMn3qzznX12pc0Uc5D8KMr1xWneDWy2DtQjkNakIdzna9NClOxgVLDz070 xVlrWvkLF+L9cOQXC5xhcZhLh3hsCno9IqYmIljE86lB+F9iBlDpqpeJSEhyur+lhBynxz QneynWoz3vdRb4muBSNhd3awibjpsac= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-rhvnp9UaM2CsMmjNKPqKcg-1; Fri, 15 May 2026 05:03:28 -0400 X-MC-Unique: rhvnp9UaM2CsMmjNKPqKcg-1 X-Mimecast-MFC-AGG-ID: rhvnp9UaM2CsMmjNKPqKcg_1778835807 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-48fe24773c8so6359095e9.3 for ; Fri, 15 May 2026 02:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778835806; x=1779440606; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5MCG+fM5A/Si4GdqqrKoi0Lqzyly0wOM9ZpNecCUS1U=; b=al/R5Isszj9GW3FNsc5RuEfy53G0ptTmKQAslJbBEC3svEu3NUioT4mHyN7ZEbBy3N xexzuEzsfdWCyDxhkuZBnaOh4A/6743Bxb46Aq/IOhtoC+fSPq5YI2CxXWTNARTyRcjW sPBMyNRsHi4EzTKyQV9J41zpGZQ6QP7kpvzZ7n/TCfkQiaBJs/WlCruVlnJUhQYN9mJk 3nS/zr99/KwE4t6ZLuPiQjtY79Nv8Yw6DSoCDcdTkFc9KXCg6ptkBKVIIysFCoecaSim +Bqsk/IzYIHNp77e+29/w0OufD8JiB3w8caozBxQB/9nddHjeV9h3hCaTVD8PeJZQrb6 wW7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778835806; x=1779440606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5MCG+fM5A/Si4GdqqrKoi0Lqzyly0wOM9ZpNecCUS1U=; b=e2vFDD3jzIfdnHofGYlPj08jkHcXJWohpif+zGSh1PoDExm0FACdBAQvE/YiitYCni qacLDGTBHtJDtmSW7m5i+zyS2//u2WFjyQ3pS0rgKgbAQ5fumCjqoqm4Ft9+g8T53R4I glFwh8uJFydkKWgdLYoLO/CPIUogGyxmKfMa35E/tALHVdqKS0Q+TMZoi42qhiQqIyTQ ilCRFDQ3yi5cdcCYlbEc4vzjH5XBUrzRVNxN/yR2ZymyD2c1CE6BPF4omzkcL9/anu03 Icv6X+2L3BvdHC3HenEZ2UUnGRU/XrrKM01B0ij4JCSEwb8MZjyb7jptcFRlMf4v/YkF lpNA== X-Gm-Message-State: AOJu0YwyGn2yO/T5pOE0ok/BMPL5LiGaUd5zuiBDCVdsdCufiHbRjCvW 12Fes6vdg43pQ3GcbuyEoHQauDTA6R8ZbrrD1AfxH7AgCLmZy9gyr5jyGbMBY5wApjP7hB/lxAP tjmf+GCKiuOQouWqg/8zmn5s4U3ncs/kTGoGlPzFMV59UIkEieDy/MFrsGT0RqQuyKjj8e2K09f GAvm6VZzPagrFaixyy4/yEBg7DWg7I5s8SJWcOxxGRFgtHJXZc X-Gm-Gg: Acq92OFzRF2dJSxM/ZnVlL+Z9+j0hpoK4I2tgtRhJq7O9jfni2oWHtQtwsWCb3nn3OA nU03CEajq2n5IxoxVW/n/YvWDC/H0iokWrQwHXQK/xkLtPJSw+tu/r7G6iPfy6ioZZ/etbkqJTT zlTqrAQO+IXV3yD357WDtusk8q0oJrtEFdwgrgZ9seqj5wmA0/z1p+yBD7J0cHwKXNpgrjp9k7o 0gQw6DdCsfElT38LU4F72qViKdX/SeV2PPsN37cxVCJ7+bcr0vcubYnHLb96YlsTqev4vUdp6h6 y1DQjGb7gFcWY6wWF08LM5Dvbgdf/32gs0mxMj96R9BnZKikyzcC4Jr7aRJugrY5GVgUNQePKkZ PTQwwV94qrMk/eIYa+6Rl+ge5Iz6YEFFGkU//Rw7X82JnwdU= X-Received: by 2002:a05:600c:c096:b0:48f:d1b8:9aad with SMTP id 5b1f17b1804b1-48fe5fd5357mr29233085e9.2.1778835805899; Fri, 15 May 2026 02:03:25 -0700 (PDT) X-Received: by 2002:a05:600c:c096:b0:48f:d1b8:9aad with SMTP id 5b1f17b1804b1-48fe5fd5357mr29232435e9.2.1778835805183; Fri, 15 May 2026 02:03:25 -0700 (PDT) Received: from localhost (62-151-111-63.jazzfree.ya.com. [62.151.111.63]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fead18659sm10952375e9.7.2026.05.15.02.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 02:03:24 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Maxime Ripard , Andrzej Hajda , David Airlie , Jernej Skrabec , Jonas Karlman , Laurent Pinchart , Luca Ceresoli , Maarten Lankhorst , Neil Armstrong , Phong LE , Robert Foss , Simona Vetter , Thomas Zimmermann , dri-devel@lists.freedesktop.org Subject: [PATCH v4 2/3] drm/bridge: ite-it66121: Move logic .mode_set setup to .atomic_enable Date: Fri, 15 May 2026 11:02:10 +0200 Message-ID: <20260515090220.809830-3-javierm@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515090220.809830-1-javierm@redhat.com> References: <20260515090220.809830-1-javierm@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move the existing .mode_set logic to the .atomic_enable callback. The former is deprecated and drivers are supposed to use the latter instead. Suggested-by: Maxime Ripard Signed-off-by: Javier Martinez Canillas --- Changes in v4: - New patch for v4 drivers/gpu/drm/bridge/ite-it66121.c | 79 +++++++++++++++------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c index 947b7a0f0a45..c8795247cfa8 100644 --- a/drivers/gpu/drm/bridge/ite-it66121.c +++ b/drivers/gpu/drm/bridge/ite-it66121.c @@ -654,6 +654,47 @@ static int it66121_bridge_attach(struct drm_bridge *bridge, return 0; } +static void it66121_set_mode(struct it66121_ctx *ctx, + struct drm_atomic_commit *state) +{ + struct drm_connector *connector = ctx->connector; + const struct drm_crtc_state *crtc_state; + const struct drm_display_mode *mode; + struct drm_crtc *crtc; + + crtc = drm_atomic_get_new_connector_state(state, connector)->crtc; + crtc_state = drm_atomic_get_new_crtc_state(state, crtc); + mode = &crtc_state->adjusted_mode; + + mutex_lock(&ctx->lock); + + /* Set TX mode to HDMI */ + if (regmap_write(ctx->regmap, IT66121_HDMI_MODE_REG, IT66121_HDMI_MODE_HDMI)) + goto unlock; + + if ((ctx->id == ID_IT66121 || ctx->id == ID_IT66122) && + regmap_write_bits(ctx->regmap, IT66121_CLK_BANK_REG, + IT66121_CLK_BANK_PWROFF_TXCLK, + IT66121_CLK_BANK_PWROFF_TXCLK)) { + goto unlock; + } + + if (it66121_configure_input(ctx)) + goto unlock; + + if (it66121_configure_afe(ctx, mode)) + goto unlock; + + if ((ctx->id == ID_IT66121 || ctx->id == ID_IT66122) && + regmap_write_bits(ctx->regmap, IT66121_CLK_BANK_REG, + IT66121_CLK_BANK_PWROFF_TXCLK, 0)) { + goto unlock; + } + +unlock: + mutex_unlock(&ctx->lock); +} + static int it66121_set_mute(struct it66121_ctx *ctx, bool mute) { int ret; @@ -733,6 +774,7 @@ static void it66121_bridge_enable(struct drm_bridge *bridge, drm_atomic_helper_connector_hdmi_update_infoframes(ctx->connector, state); + it66121_set_mode(ctx, state); it66121_set_mute(ctx, false); } @@ -764,42 +806,6 @@ static int it66121_bridge_check(struct drm_bridge *bridge, return 0; } -static -void it66121_bridge_mode_set(struct drm_bridge *bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode) -{ - struct it66121_ctx *ctx = container_of(bridge, struct it66121_ctx, bridge); - - mutex_lock(&ctx->lock); - - /* Set TX mode to HDMI */ - if (regmap_write(ctx->regmap, IT66121_HDMI_MODE_REG, IT66121_HDMI_MODE_HDMI)) - goto unlock; - - if ((ctx->id == ID_IT66121 || ctx->id == ID_IT66122) && - regmap_write_bits(ctx->regmap, IT66121_CLK_BANK_REG, - IT66121_CLK_BANK_PWROFF_TXCLK, - IT66121_CLK_BANK_PWROFF_TXCLK)) { - goto unlock; - } - - if (it66121_configure_input(ctx)) - goto unlock; - - if (it66121_configure_afe(ctx, adjusted_mode)) - goto unlock; - - if ((ctx->id == ID_IT66121 || ctx->id == ID_IT66122) && - regmap_write_bits(ctx->regmap, IT66121_CLK_BANK_REG, - IT66121_CLK_BANK_PWROFF_TXCLK, 0)) { - goto unlock; - } - -unlock: - mutex_unlock(&ctx->lock); -} - static enum drm_connector_status it66121_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector) { @@ -935,7 +941,6 @@ static const struct drm_bridge_funcs it66121_bridge_funcs = { .atomic_enable = it66121_bridge_enable, .atomic_disable = it66121_bridge_disable, .atomic_check = it66121_bridge_check, - .mode_set = it66121_bridge_mode_set, .detect = it66121_bridge_detect, .edid_read = it66121_bridge_edid_read, .hpd_enable = it66121_bridge_hpd_enable, -- 2.54.0