From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 056A2CCD18C for ; Sat, 11 Oct 2025 17:03:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CGpHHm2OeNWbay+N+pcaQg7MpMSzJBS+4pVVXcixzcw=; b=UDMLqAAqWXdq2BvazNW8IzYgDn /RUFMzc0i9MVG8YXIMyq9cU0CXyZZzd5eoTOumC0EX8ATXoDLZue2MAY+DeqefF/qQkJR3tt45x7f R52x3aKFQvFCP2UDgTtou4X0hVRhqMK5rSk8P6e9KCcF5E8dSUd5aUWElbUWlmmm7ua/eghey4/KA Bc/827MXRAdfyE1Zeuky5Bn+I4rg6O5ju/3ABlVWrOYMIJmOXrLYNJnFO9A8E5TztS22qrs51Ybbs CVp1L9/05gs3Bc7HYwCqudwJjAl+t34pAviKgIXHipcsS4wA7Wridb5oY6dtqWsd4YW2MUrvD53wB xVFyNZqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v7d0K-0000000ANMf-17tV; Sat, 11 Oct 2025 17:03:36 +0000 Received: from mout-p-102.mailbox.org ([2001:67c:2050:0:465::102]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1v7d0G-0000000ANE6-0ET9 for linux-arm-kernel@lists.infradead.org; Sat, 11 Oct 2025 17:03:34 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4ckVLV1JRhz9tcl; Sat, 11 Oct 2025 19:03:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1760202210; 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=CGpHHm2OeNWbay+N+pcaQg7MpMSzJBS+4pVVXcixzcw=; b=VnSSjRcmgGIhqXhbc7qPXfkAN4n2MXhE2lwZJp7nR8O7AuWUUhzdkfLnoDXc3X/u/EaU7B c2diLqN8JJFyTlhxarf7KZR0KYZGpScgZhCL8wdkmspkQKrtAcx+KzHBLCz8RcZwF+AknH vcXtHLy+eeWlih7+DbQwaF/S9G1/KxAb79Za6vWCKWQy8KmLao767mkugMV1KGMje4BUVo P1cPhpjbQsjfPGNWyv+b7Ep34z8PQKdx6q/k4wbMPhcDuXvgupw/z+OKMrsYalsP53HEPL Xw+/qX7XN0DRkVzFTJlu2ArHf89jsLNjjW/BOx90YLd4FWpWj5S2Vc/6JzEXxg== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1760202208; 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=CGpHHm2OeNWbay+N+pcaQg7MpMSzJBS+4pVVXcixzcw=; b=TRQ1dVXwGLw6e/iUz+yvQqNXdSC9E/jUJDSkp87p2jy4p6qp6wycjPP0M4P/waEFOtW/+R gXc1N3huVsnl1KF4lQ1y/qT4ozjFKOpzKAqCDIYgC1anOLZ+2Cu1thA6bJgwoeT/H+bMEV hKW5df3kzbQdl1nj5pOm2Zkwgh4m9qavI7UnvLRnS+zG+cy0ewIOccGSxN6oGrDle67DBf vpGvBuW8yiaOljxYsd5lOriZ0QbIY+PNiQXPnokkuUWob7jKHxbHZkZ/hM+TRkygdcr3ZX X1HtRrfXDEZwTjlUhTCxX0+PZfhrXs/3HqqVFWWVdNAViaPxRYdGoAAuaO1O7w== To: dri-devel@lists.freedesktop.org Cc: Marek Vasut , Abel Vesa , Conor Dooley , Fabio Estevam , Krzysztof Kozlowski , Laurent Pinchart , Liu Ying , Lucas Stach , Peng Fan , Pengutronix Kernel Team , Rob Herring , Shawn Guo , Thomas Zimmermann , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH 13/39] drm/imx: dc: fu: Describe remaining register offsets Date: Sat, 11 Oct 2025 18:51:28 +0200 Message-ID: <20251011170213.128907-14-marek.vasut@mailbox.org> In-Reply-To: <20251011170213.128907-1-marek.vasut@mailbox.org> References: <20251011170213.128907-1-marek.vasut@mailbox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-META: j5x9ripwfyxub95z31izjnabtfprmzk6 X-MBO-RS-ID: 295e7d99a9ae9ac8446 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251011_100332_258285_80BC96CA X-CRM114-Status: GOOD ( 10.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Describe the rest of register offsets in struct dc_fu { } and use them throughout the driver. This is a preparatory change for i.MX95 addition. No functional change. Signed-off-by: Marek Vasut --- Cc: Abel Vesa Cc: Conor Dooley Cc: Fabio Estevam Cc: Krzysztof Kozlowski Cc: Laurent Pinchart Cc: Liu Ying Cc: Lucas Stach Cc: Peng Fan Cc: Pengutronix Kernel Team Cc: Rob Herring Cc: Shawn Guo Cc: Thomas Zimmermann Cc: devicetree@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: imx@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org --- drivers/gpu/drm/imx/dc/dc-fl.c | 12 ++++++++---- drivers/gpu/drm/imx/dc/dc-fu.c | 6 +++--- drivers/gpu/drm/imx/dc/dc-fu.h | 4 ++++ drivers/gpu/drm/imx/dc/dc-fw.c | 10 +++++++--- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/imx/dc/dc-fl.c b/drivers/gpu/drm/imx/dc/dc-fl.c index d4e746f8c4297..8571871c6a683 100644 --- a/drivers/gpu/drm/imx/dc/dc-fl.c +++ b/drivers/gpu/drm/imx/dc/dc-fl.c @@ -63,20 +63,20 @@ static void dc_fl_set_fmt(struct dc_fu *fu, enum dc_fu_frac frac, dc_fu_set_src_bpp(fu, frac, format->cpp[0] * 8); - regmap_write_bits(fu->reg_cfg, LAYERPROPERTY(frac), + regmap_write_bits(fu->reg_cfg, fu->reg_layerproperty[frac], YUVCONVERSIONMODE_MASK, YUVCONVERSIONMODE(YUVCONVERSIONMODE_OFF)); dc_fu_get_pixel_format_bits(fu, format->format, &bits); dc_fu_get_pixel_format_shifts(fu, format->format, &shifts); - regmap_write(fu->reg_cfg, COLORCOMPONENTBITS(frac), bits); - regmap_write(fu->reg_cfg, COLORCOMPONENTSHIFT(frac), shifts); + regmap_write(fu->reg_cfg, fu->reg_colorcomponentbits[frac], bits); + regmap_write(fu->reg_cfg, fu->reg_colorcomponentshift[frac], shifts); } static void dc_fl_set_framedimensions(struct dc_fu *fu, int w, int h) { - regmap_write(fu->reg_cfg, FRAMEDIMENSIONS, + regmap_write(fu->reg_cfg, fu->reg_framedimensions, FRAMEWIDTH(w) | FRAMEHEIGHT(h)); } @@ -133,12 +133,16 @@ static int dc_fl_bind(struct device *dev, struct device *master, void *data) fu->reg_baseaddr[i] = BASEADDRESS(i); fu->reg_sourcebufferattributes[i] = SOURCEBUFFERATTRIBUTES(i); fu->reg_sourcebufferdimension[i] = SOURCEBUFFERDIMENSION(i); + fu->reg_colorcomponentbits[i] = COLORCOMPONENTBITS(i); + fu->reg_colorcomponentshift[i] = COLORCOMPONENTSHIFT(i); fu->reg_layeroffset[i] = LAYEROFFSET(i); fu->reg_clipwindowoffset[i] = CLIPWINDOWOFFSET(i); fu->reg_clipwindowdimensions[i] = CLIPWINDOWDIMENSIONS(i); fu->reg_constantcolor[i] = CONSTANTCOLOR(i); fu->reg_layerproperty[i] = LAYERPROPERTY(i); } + fu->reg_burstbuffermanagement = BURSTBUFFERMANAGEMENT; + fu->reg_framedimensions = FRAMEDIMENSIONS; snprintf(fu->name, sizeof(fu->name), "FetchLayer%d", id); dc_fl_set_ops(fu); diff --git a/drivers/gpu/drm/imx/dc/dc-fu.c b/drivers/gpu/drm/imx/dc/dc-fu.c index f94c591c81589..cc8b0d05891fd 100644 --- a/drivers/gpu/drm/imx/dc/dc-fu.c +++ b/drivers/gpu/drm/imx/dc/dc-fu.c @@ -113,13 +113,13 @@ void dc_fu_shdldreq_sticky(struct dc_fu *fu, u8 layer_mask) static inline void dc_fu_set_linemode(struct dc_fu *fu, enum dc_linemode mode) { - regmap_write_bits(fu->reg_cfg, BURSTBUFFERMANAGEMENT, LINEMODE_MASK, + regmap_write_bits(fu->reg_cfg, fu->reg_burstbuffermanagement, LINEMODE_MASK, mode); } static inline void dc_fu_set_numbuffers(struct dc_fu *fu, unsigned int num) { - regmap_write_bits(fu->reg_cfg, BURSTBUFFERMANAGEMENT, + regmap_write_bits(fu->reg_cfg, fu->reg_burstbuffermanagement, SETNUMBUFFERS_MASK, SETNUMBUFFERS(num)); } @@ -132,7 +132,7 @@ static void dc_fu_set_burstlength(struct dc_fu *fu, dma_addr_t baddr) burst_size = min(burst_size, 128U); burst_length = burst_size / 8; - regmap_write_bits(fu->reg_cfg, BURSTBUFFERMANAGEMENT, + regmap_write_bits(fu->reg_cfg, fu->reg_burstbuffermanagement, SETBURSTLENGTH_MASK, SETBURSTLENGTH(burst_length)); } diff --git a/drivers/gpu/drm/imx/dc/dc-fu.h b/drivers/gpu/drm/imx/dc/dc-fu.h index e016e1ea5b4e0..2a330c0abf6a1 100644 --- a/drivers/gpu/drm/imx/dc/dc-fu.h +++ b/drivers/gpu/drm/imx/dc/dc-fu.h @@ -105,11 +105,15 @@ struct dc_fu { u32 reg_baseaddr[DC_FETCHUNIT_FRAC_NUM]; u32 reg_sourcebufferattributes[DC_FETCHUNIT_FRAC_NUM]; u32 reg_sourcebufferdimension[DC_FETCHUNIT_FRAC_NUM]; + u32 reg_colorcomponentbits[DC_FETCHUNIT_FRAC_NUM]; + u32 reg_colorcomponentshift[DC_FETCHUNIT_FRAC_NUM]; u32 reg_layeroffset[DC_FETCHUNIT_FRAC_NUM]; u32 reg_clipwindowoffset[DC_FETCHUNIT_FRAC_NUM]; u32 reg_clipwindowdimensions[DC_FETCHUNIT_FRAC_NUM]; u32 reg_constantcolor[DC_FETCHUNIT_FRAC_NUM]; u32 reg_layerproperty[DC_FETCHUNIT_FRAC_NUM]; + u32 reg_burstbuffermanagement; + u32 reg_framedimensions; unsigned int id; enum dc_link_id link_id; struct dc_fu_ops ops; diff --git a/drivers/gpu/drm/imx/dc/dc-fw.c b/drivers/gpu/drm/imx/dc/dc-fw.c index c1131b7b17c2f..dc036121f0d23 100644 --- a/drivers/gpu/drm/imx/dc/dc-fw.c +++ b/drivers/gpu/drm/imx/dc/dc-fw.c @@ -91,15 +91,15 @@ static void dc_fw_set_fmt(struct dc_fu *fu, enum dc_fu_frac frac, regmap_write_bits(fu->reg_cfg, CONTROL, RASTERMODE_MASK, RASTERMODE(RASTERMODE_NORMAL)); - regmap_write_bits(fu->reg_cfg, LAYERPROPERTY(frac), + regmap_write_bits(fu->reg_cfg, fu->reg_layerproperty[frac], YUVCONVERSIONMODE_MASK, YUVCONVERSIONMODE(YUVCONVERSIONMODE_OFF)); dc_fu_get_pixel_format_bits(fu, format->format, &bits); dc_fu_get_pixel_format_shifts(fu, format->format, &shifts); - regmap_write(fu->reg_cfg, COLORCOMPONENTBITS(frac), bits); - regmap_write(fu->reg_cfg, COLORCOMPONENTSHIFT(frac), shifts); + regmap_write(fu->reg_cfg, fu->reg_colorcomponentbits[frac], bits); + regmap_write(fu->reg_cfg, fu->reg_colorcomponentshift[frac], shifts); } static void dc_fw_set_framedimensions(struct dc_fu *fu, int w, int h) @@ -170,12 +170,16 @@ static int dc_fw_bind(struct device *dev, struct device *master, void *data) fu->reg_baseaddr[i] = BASEADDRESS(i); fu->reg_sourcebufferattributes[i] = SOURCEBUFFERATTRIBUTES(i); fu->reg_sourcebufferdimension[i] = SOURCEBUFFERDIMENSION(i); + fu->reg_colorcomponentbits[i] = COLORCOMPONENTBITS(i); + fu->reg_colorcomponentshift[i] = COLORCOMPONENTSHIFT(i); fu->reg_layeroffset[i] = LAYEROFFSET(i); fu->reg_clipwindowoffset[i] = CLIPWINDOWOFFSET(i); fu->reg_clipwindowdimensions[i] = CLIPWINDOWDIMENSIONS(i); fu->reg_constantcolor[i] = CONSTANTCOLOR(i); fu->reg_layerproperty[i] = LAYERPROPERTY(i); } + fu->reg_burstbuffermanagement = BURSTBUFFERMANAGEMENT; + fu->reg_framedimensions = FRAMEDIMENSIONS; snprintf(fu->name, sizeof(fu->name), "FetchWarp%d", id); dc_fw_set_ops(fu); -- 2.51.0