From patchwork Thu Jul 8 12:28:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 471229 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp233618jao; Thu, 8 Jul 2021 05:28:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxew/zqTukzN0gZSAFMJGI9iXyc3M8DxRSzlI4PWDwA6H/KgvppTNJqvglgZb2P6wz3aeG6 X-Received: by 2002:a02:908a:: with SMTP id x10mr25944797jaf.30.1625747332553; Thu, 08 Jul 2021 05:28:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625747332; cv=none; d=google.com; s=arc-20160816; b=F6KclVuK/P5VmU0b37tRLey+z6e6YsDPvtvqlkJyEvhLMr4T5n1IS1imee0sMLr7Zf 1C8OW3P/GadQWGpnFp3i/9AHB+OdgQ1kMfUt5uj4KQr2RyV9054CzSbSY3h+F3ubaxEJ iLyJwzVuznczAxX0WT23wgF7RtQp3q8dGTQCfX8WCDejSozYfUtDN8Z+Vh9WUJTB1yC3 B2x5QU4jM9xMe6t5+zxapVMpM8TuITPg72SVx9QQSgYpp3QrLNR4SwjMrpqYDVB/2xgd KHnRgYW96IXfJxjUfWiam0whVZJdA9YUuf74redmXuTFjKJ0p8Jh9NYwf2epPnPKBW5f 0exg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9dgs04cWZ3Msqx0W8W8q6j1oCvkBtnZBWkKinotEoUY=; b=DfJnEYyQr50R7N7lXEN3j5sMJ+s7LAfZKZ7xxy9Hs/RGerP7SufWzVnOrTnaiVMeWz S/wf1Bg4HQV+f0NRf9qOOXhzVf8cpAWgmG8IQ58h1xvlB2SzpEsY9G0m8EEhK1VZ+Qku lwVW4My5AJOr5fOdPj5iMyXjJaqhKXA73FYED7penmTftVFJoiSH1BBVuWLvmv2OdVuC JV1GNk0Qz/RBEe6drMtpHiZbrS/IJHb/xlpZvvn7K2aEJg182GISY2n0L89KDRupN9xw Qdoq22pe8FFOkAG4/iUZr2fUcpv7yWBqg9USOLx4fCE7yG1d3Ot58WmZ3OTtEX1X+kx0 Te9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B4zG8Ky9; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d6si2222619ilm.75.2021.07.08.05.28.52; Thu, 08 Jul 2021 05:28:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B4zG8Ky9; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231553AbhGHMbd (ORCPT + 17 others); Thu, 8 Jul 2021 08:31:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231449AbhGHMbc (ORCPT ); Thu, 8 Jul 2021 08:31:32 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E23BC061574 for ; Thu, 8 Jul 2021 05:28:50 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id x25so2233876lfu.13 for ; Thu, 08 Jul 2021 05:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9dgs04cWZ3Msqx0W8W8q6j1oCvkBtnZBWkKinotEoUY=; b=B4zG8Ky92qLBbFlZhH+U2h2FVRIBjLTciaEZqKkabPvWU9yPHX5GrQ25COexC/rebA b0f2GFcF2nOlq/HUvn6PVoM7v+tRdBqzlU4zg5sVX1vmDS211dl3cnIJXKHtCNVpmRnt 7Hp9BmdZwatvPcfikCotZm0XkrtLO0LujPQ/WbyzD6JLoteh4QhJcBesHAyyCvTAgIdl bx/Wom/LhH7TnXVV/XkoSKJLU40LDMUz2mbDTNFBr8h+4/EgWOdil4pK/QQoejqqh1j7 a0BlOi3C5MwNrcfR0BsLqTIBEOwFU0RSyj/1f23gn1zglpAZUbW/H+MKS/j3+Y70I4rp IdoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9dgs04cWZ3Msqx0W8W8q6j1oCvkBtnZBWkKinotEoUY=; b=IEu4RkGgrdCgYNWvLndZ5ahjktMqLaZfU8IX0r4RlibbejJzkM7cdrfDY4HLm6LSHE LnZ5UZ4b+/KxUAvEnA6Vx7suNyaYUly9rw5VTeVh21zhZGFZQok8rQYXGY3YwX/jwvkY fb64pLme2BoXuMVhi+dQQTTwgCcMl99LNTzxu35X31fcTeBo3py1bBzYR+LTk1NrgO9l fYcZFSY4/mRYyGsFFDXyMNyh1ovhesLxEmcqfUO2SKnl8w1Y00iWRIwj90cm7UnrYrmJ qNfi93MG+vmbJxqIdlaPdy3WfsYhyJO0LTl6panhg6qE1/956rIKbHlKjfwrbMDbS4yg NE6A== X-Gm-Message-State: AOAM532YHUGg7vx57eFpytXCtceSM5Mn+g8fkvuAl/BcYog+2ErO1OFl MN7Qq3uTTdcP7wm9z9f9x+4MkQ== X-Received: by 2002:ac2:4896:: with SMTP id x22mr15612187lfc.600.1625747328534; Thu, 08 Jul 2021 05:28:48 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id f1sm184368lfs.211.2021.07.08.05.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 05:28:48 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Cc: Jonathan Marek , Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v1 4/7] drm/msm/mdp5: move mdp5_encoder_set_intf_mode after msm_dsi_modeset_init Date: Thu, 8 Jul 2021 15:28:30 +0300 Message-Id: <20210708122833.363451-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210708122833.363451-1-dmitry.baryshkov@linaro.org> References: <20210708122833.363451-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move a call to mdp5_encoder_set_intf_mode() after msm_dsi_modeset_init(), removing set_encoder_mode callback. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 2.30.2 Reviewed-by: Abhinav Kumar diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 15aed45022bc..b3b42672b2d4 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -209,13 +209,6 @@ static int mdp5_set_split_display(struct msm_kms *kms, slave_encoder); } -static void mdp5_set_encoder_mode(struct msm_kms *kms, - struct drm_encoder *encoder, - bool cmd_mode) -{ - mdp5_encoder_set_intf_mode(encoder, cmd_mode); -} - static void mdp5_kms_destroy(struct msm_kms *kms) { struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms)); @@ -287,7 +280,6 @@ static const struct mdp_kms_funcs kms_funcs = { .get_format = mdp_get_format, .round_pixclk = mdp5_round_pixclk, .set_split_display = mdp5_set_split_display, - .set_encoder_mode = mdp5_set_encoder_mode, .destroy = mdp5_kms_destroy, #ifdef CONFIG_DEBUG_FS .debugfs_init = mdp5_kms_debugfs_init, @@ -448,6 +440,9 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, } ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder); + if (!ret) + mdp5_encoder_set_intf_mode(encoder, msm_dsi_is_cmd_mode(priv->dsi[dsi_id])); + break; } default: