From patchwork Thu Feb 10 10:34:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 541419 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp2113346imo; Thu, 10 Feb 2022 02:34:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFMCjpEO9UA1PJfdwyK+D5TTHsDBQe9CHiWvYrQWW/baPDChQ61Hobl7Sh8y5lv+RQLZ+4 X-Received: by 2002:a17:903:2cc:: with SMTP id s12mr6817050plk.130.1644489295935; Thu, 10 Feb 2022 02:34:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644489295; cv=none; d=google.com; s=arc-20160816; b=g/D0GPsXXzyqkoh0y+uUIjyW3HrP7o6QEjRoGd+dERMFh48j0BHMs9zNBm07cSuhcy l9CJqxsmup64V2Y30vQMuNLU4ZZMv70z/r7QB1PHtvT/xpGXv+2nDzV/RXozLAAFlbp5 w+8QIlQKCFfHsqML41qYCs9WDl8XcNtRGUYS6wUpsiPmE8sIZAQLa9QrAfEEpEdd4A+q tqXKLB44dn14BwR8uk6cEFCyyEV4e5JW9alpaUenjyF7Vtrix1UOmTJg7r81dzxe5r8u gafVBBzpZFeK8Np6ix2wtZUwiZEF/ajdyelShGa4o1TrvdpmPpK3BxJfyY6s0LmvDgih xHNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=RhSRXAMaSyKjneMWxm3uQ9Q3+gE+H599q/JPITrKG0A=; b=Fm52AJ0KE91jMD6EHAXTfnXZ66WYc92fsXdvPscNuKRobPYwJUSrO41xapkiRUyWXv l0hbHU2/grnViLtS00Di0bRrB2rXA4U8BijH11m1ivV53wC8mo7nHSZb47NpHITvEcLU lV+wJPmuFiZn4MTtu75BFChafoBNg8lBYij6YCMzGosj2o3woZnvkCLmbXGrTdu6fa5d 3/wrwpNa75qiRIgZ3OlkHBmFB2xZKHaxnH4HcIfadWYiN+/PF3xFgFFV/eISyP+dBZyk q7k/smCOy3FTG0l4zC1X+xu6wTQqgtoran7AYKTw3lRDujqXw3njqBgMHY0fhpWmkceB V4DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=J+wfPf6I; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id h12si1662639plo.442.2022.02.10.02.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 02:34:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=J+wfPf6I; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E12E210E7DA; Thu, 10 Feb 2022 10:34:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id A78DA10E7EB; Thu, 10 Feb 2022 10:34:52 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 793DB61BAD; Thu, 10 Feb 2022 10:34:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C67FAC004E1; Thu, 10 Feb 2022 10:34:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644489290; bh=WDoD2IWuN+dSHlVHH7SgTftB5cke0BrFUNUt4U6trWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J+wfPf6I3uIRDjzR6a+Bdex5880kr34x4yMNg51viDZwWf0Fsr0fvehUba+ZtIan3 TaeqBtutbGQJXQDzd+eAkCTAL/D4FW8CyHMP6xQ1TnPdwFvTcccilbhNAF0q6lTOok 8ytiP2anAxMcm+fkd+qlEHA2jgCs71ShLCgmdVTUZcd+lfk0gkOXffmvt92F4Apy99 AHTM5XLyVtVDj13lBijA5rApV+3JaBHaV0biQTyreusdNU7TW9qxp1Chi9Sahkv+qj h3Gl/c1XUsyizPyH4EmqWlME7WM2RfW0qM5snaUnxCGb9kWTsXfB8yfruu1isAVI1D KSNCxDGIzxyBg== From: Vinod Koul To: Rob Clark Subject: [REPOST PATCH v4 04/13] drm/msm/disp/dpu1: Add support for DSC in pingpong block Date: Thu, 10 Feb 2022 16:04:14 +0530 Message-Id: <20220210103423.271016-5-vkoul@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220210103423.271016-1-vkoul@kernel.org> References: <20220210103423.271016-1-vkoul@kernel.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Marek , David Airlie , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Abhinav Kumar , Bjorn Andersson , Vinod Koul , dri-devel@lists.freedesktop.org, Dmitry Baryshkov , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In SDM845, DSC can be enabled by writing to pingpong block registers, so add support for DSC in hw_pp Reviewed-by: Abhinav Kumar Reviewed-by: Dmitry Baryshkov Signed-off-by: Vinod Koul Reviewed-by: Abhinav Kumar --- .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 32 +++++++++++++++++++ .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 14 ++++++++ 2 files changed, 46 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c index 55766c97c4c8..47c6ab6caf95 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c @@ -28,6 +28,9 @@ #define PP_FBC_MODE 0x034 #define PP_FBC_BUDGET_CTL 0x038 #define PP_FBC_LOSSY_MODE 0x03C +#define PP_DSC_MODE 0x0a0 +#define PP_DCE_DATA_IN_SWAP 0x0ac +#define PP_DCE_DATA_OUT_SWAP 0x0c8 #define PP_DITHER_EN 0x000 #define PP_DITHER_BITDEPTH 0x004 @@ -245,6 +248,32 @@ static u32 dpu_hw_pp_get_line_count(struct dpu_hw_pingpong *pp) return line; } +static int dpu_hw_pp_dsc_enable(struct dpu_hw_pingpong *pp) +{ + struct dpu_hw_blk_reg_map *c = &pp->hw; + + DPU_REG_WRITE(c, PP_DSC_MODE, 1); + return 0; +} + +static void dpu_hw_pp_dsc_disable(struct dpu_hw_pingpong *pp) +{ + struct dpu_hw_blk_reg_map *c = &pp->hw; + + DPU_REG_WRITE(c, PP_DSC_MODE, 0); +} + +static int dpu_hw_pp_setup_dsc(struct dpu_hw_pingpong *pp) +{ + struct dpu_hw_blk_reg_map *pp_c = &pp->hw; + int data; + + data = DPU_REG_READ(pp_c, PP_DCE_DATA_OUT_SWAP); + data |= BIT(18); /* endian flip */ + DPU_REG_WRITE(pp_c, PP_DCE_DATA_OUT_SWAP, data); + return 0; +} + static void _setup_pingpong_ops(struct dpu_hw_pingpong *c, unsigned long features) { @@ -256,6 +285,9 @@ static void _setup_pingpong_ops(struct dpu_hw_pingpong *c, c->ops.get_autorefresh = dpu_hw_pp_get_autorefresh_config; c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr; c->ops.get_line_count = dpu_hw_pp_get_line_count; + c->ops.setup_dsc = dpu_hw_pp_setup_dsc; + c->ops.enable_dsc = dpu_hw_pp_dsc_enable; + c->ops.disable_dsc = dpu_hw_pp_dsc_disable; if (test_bit(DPU_PINGPONG_DITHER, &features)) c->ops.setup_dither = dpu_hw_pp_setup_dither; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h index 89d08a715c16..12758468d9ca 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h @@ -124,6 +124,20 @@ struct dpu_hw_pingpong_ops { */ void (*setup_dither)(struct dpu_hw_pingpong *pp, struct dpu_hw_dither_cfg *cfg); + /** + * Enable DSC + */ + int (*enable_dsc)(struct dpu_hw_pingpong *pp); + + /** + * Disable DSC + */ + void (*disable_dsc)(struct dpu_hw_pingpong *pp); + + /** + * Setup DSC + */ + int (*setup_dsc)(struct dpu_hw_pingpong *pp); }; struct dpu_hw_merge_3d;