From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (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 6139718757D for ; Thu, 26 Sep 2024 05:56:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=93.104.207.81 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727330172; cv=none; b=Jt5ZbPrP5nNRCVgju8afyAg4n3GVoJmlYnD/+/VZLAeWuQaWwASGJ9++LtKqh5+R2PGYYoU43iIdOT709/LM5Jnc3wQW8MrAu9JdwQHsUbojfut9Dv+AEwOrdMRnKLqKp+Q8oZvOJaHSOcRO3j6u1LmzBc6iDrSfi9U3tMukVSk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727330172; c=relaxed/simple; bh=uUoxyJz0oYfHN8wv9/YSFlGaqq3CznQwoGzv/HviPek=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pxhYhd2lXdnOFL5IiqDtaWl3cDZhbrJ3qrxv9/DZYpjQSVlXglLnr5GVyC8G+BQdY8h3uvQfPl4Vcsr7hE1pDfURNRmM9psINcsJcs4/CeTRBAgcRrKews8mSXtmRCu+Fwjavac8DMqc7smYG2Db8IyXj/c6OB5OJZi72ki0hXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ew.tq-group.com; spf=pass smtp.mailfrom=ew.tq-group.com; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b=nprVMNWf; dkim=fail (0-bit key) header.d=ew.tq-group.com header.i=@ew.tq-group.com header.b=lLemQXQ3 reason="key not found in DNS"; arc=none smtp.client-ip=93.104.207.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ew.tq-group.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="nprVMNWf"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=ew.tq-group.com header.i=@ew.tq-group.com header.b="lLemQXQ3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1727330170; x=1758866170; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bLzJtbfa2s5QAjm0ipC22hKl20Uv3y0q/Em4v3hXr0c=; b=nprVMNWfGrtywcyIltJHkfZBJ5uqqfgyHnvZoUJnK/hcMHE+hkVZ+1cQ 0aU5SnXBMzWyv2Wma1xWajLYxttm4G+E0znLELgN9aaj1EShHDYbiBZ3W FCZMCkaBH2vf7lZz5LGN6QTHcP8paAVXzdg5/p30DvwGdoGKuHwQzYFwe XcOFnNcxDHoed6XrT3wxGEzr7wxd8t4f/xxNenHKl4r444pbJrBrsvHKB 79f6LVEr68YAT+9JqHQC7NvxDfxAlZucBuiafHIsXSJZeahth+LiJs0pe EyXLAJhalXlicMef77Qi8j93S27nkFYEHVAOQBM1AWet9Rk476rsIc8gK g==; X-CSE-ConnectionGUID: aU/ZGlV9RNKTAdhj5VL7+g== X-CSE-MsgGUID: BALAbA55R4iTxhd71svacw== X-IronPort-AV: E=Sophos;i="6.10,259,1719871200"; d="scan'208";a="39129818" Received: from vmailcow01.tq-net.de ([10.150.86.48]) by mx1.tq-group.com with ESMTP; 26 Sep 2024 07:56:03 +0200 X-CheckPoint: {66F4F773-16-B62731C4-FB8D8F8A} X-MAIL-CPID: 0B3461EE8FD9AE5E753EA9A3C01306C1_3 X-Control-Analysis: str=0001.0A682F27.66F4F773.00E7,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id F06CB160A3D; Thu, 26 Sep 2024 07:55:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ew.tq-group.com; s=dkim; t=1727330159; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=bLzJtbfa2s5QAjm0ipC22hKl20Uv3y0q/Em4v3hXr0c=; b=lLemQXQ3BMrZxixLXAaMhfzBGdx/uHDt++UGsHM032fL6xcM1L7iYRAtkO+4lAWvDG1Wtb 158c7GQmzz9yvpCgrxTM9rxJdliCnTAtgapqi4+SiNpSd83+t06bNba79h/vVNAxZ8ALo0 Ogv7LLiKOaVj7/ZNb1+tPVzoJAmvdAr1EXw9QwFiAMtJxkUnHqR25NuXZo6aWZ4FliSNVa bM0GggHKYRR/t2jWYhyNu8fyJv4cRRbG3QCYUTk7rlDc483CDuEk/TLc3slEcThQt2mS6d F6ebguRBQDuTsAfIGvzPXVwHeBuGzwhGzp+LMplDw69Cv5UsFiazLvnK5cziHQ== From: Alexander Stein To: Stefan Agner , Alison Wang , David Airlie , Daniel Vetter , Matthias Schiffer , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alexander Stein Subject: [PATCH v2 2/2] drm: fsl-dcu: enable PIXCLK on LS1021A Date: Thu, 26 Sep 2024 07:55:51 +0200 Message-Id: <20240926055552.1632448-2-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240926055552.1632448-1-alexander.stein@ew.tq-group.com> References: <20240926055552.1632448-1-alexander.stein@ew.tq-group.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 X-Last-TLS-Session-Version: TLSv1.3 From: Matthias Schiffer The PIXCLK needs to be enabled in SCFG before accessing certain DCU registers, or the access will hang. For simplicity, the PIXCLK is enabled unconditionally, resulting in increased power consumption. Signed-off-by: Matthias Schiffer Signed-off-by: Alexander Stein --- Changes in v2: * Add note about power consumption in commit message * Add note about power consumption in comment * Fix alignment drivers/gpu/drm/fsl-dcu/Kconfig | 1 + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 15 +++++++++++++++ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 3 +++ 3 files changed, 19 insertions(+) diff --git a/drivers/gpu/drm/fsl-dcu/Kconfig b/drivers/gpu/drm/fsl-dcu/Kconfig index 5ca71ef873259..c9ee98693b48a 100644 --- a/drivers/gpu/drm/fsl-dcu/Kconfig +++ b/drivers/gpu/drm/fsl-dcu/Kconfig @@ -8,6 +8,7 @@ config DRM_FSL_DCU select DRM_PANEL select REGMAP_MMIO select VIDEOMODE_HELPERS + select MFD_SYSCON if SOC_LS1021A help Choose this option if you have an Freescale DCU chipset. If M is selected the module will be called fsl-dcu-drm. diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index dd820f19482ad..63da55fe2eaf8 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -100,12 +100,27 @@ static void fsl_dcu_irq_uninstall(struct drm_device *dev) static int fsl_dcu_load(struct drm_device *dev, unsigned long flags) { struct fsl_dcu_drm_device *fsl_dev = dev->dev_private; + struct regmap *scfg; int ret; ret = fsl_dcu_drm_modeset_init(fsl_dev); if (ret < 0) return dev_err_probe(dev->dev, ret, "failed to initialize mode setting\n"); + scfg = syscon_regmap_lookup_by_compatible("fsl,ls1021a-scfg"); + if (PTR_ERR(scfg) != -ENODEV) { + /* + * For simplicity, enable the PIXCLK unconditionally, + * resulting in increased power consumption. Disabling + * the clock in PM or on unload could be implemented as + * a future improvement. + */ + ret = regmap_update_bits(scfg, SCFG_PIXCLKCR, SCFG_PIXCLKCR_PXCEN, + SCFG_PIXCLKCR_PXCEN); + if (ret < 0) + return dev_err_probe(dev->dev, ret, "failed to enable pixclk\n"); + } + ret = drm_vblank_init(dev, dev->mode_config.num_crtc); if (ret < 0) { dev_err(dev->dev, "failed to initialize vblank\n"); diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h index e2049a0e8a92a..566396013c04a 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h @@ -160,6 +160,9 @@ #define FSL_DCU_ARGB4444 12 #define FSL_DCU_YUV422 14 +#define SCFG_PIXCLKCR 0x28 +#define SCFG_PIXCLKCR_PXCEN BIT(31) + #define VF610_LAYER_REG_NUM 9 #define LS1021A_LAYER_REG_NUM 10 -- 2.34.1