From patchwork Thu Feb 21 20:20:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 10824719 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6870215AC for ; Thu, 21 Feb 2019 20:20:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5AD9C32480 for ; Thu, 21 Feb 2019 20:20:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5969432493; Thu, 21 Feb 2019 20:20:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D9BA132490 for ; Thu, 21 Feb 2019 20:20:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E7EE893B9; Thu, 21 Feb 2019 20:20:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-eopbgr780050.outbound.protection.outlook.com [40.107.78.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9660E89359; Thu, 21 Feb 2019 20:20:12 +0000 (UTC) Received: from CY4PR12CA0047.namprd12.prod.outlook.com (2603:10b6:903:129::33) by MN2PR12MB2974.namprd12.prod.outlook.com (2603:10b6:208:c2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.15; Thu, 21 Feb 2019 20:20:10 +0000 Received: from CO1NAM03FT023.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::202) by CY4PR12CA0047.outlook.office365.com (2603:10b6:903:129::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.16 via Frontend Transport; Thu, 21 Feb 2019 20:20:09 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by CO1NAM03FT023.mail.protection.outlook.com (10.152.80.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1643.13 via Frontend Transport; Thu, 21 Feb 2019 20:20:09 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Thu, 21 Feb 2019 14:20:07 -0600 From: David Francis To: Subject: [PATCH v2 2/3] drm/dsc: Add native 420 and 422 support to compute_rc_params Date: Thu, 21 Feb 2019 15:20:00 -0500 Message-ID: <20190221202001.28430-3-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190221202001.28430-1-David.Francis@amd.com> References: <20190221202001.28430-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(2980300002)(428003)(199004)(189003)(6916009)(5660300002)(68736007)(106466001)(105586002)(72206003)(54906003)(4326008)(97736004)(305945005)(47776003)(49486002)(2351001)(8936002)(1076003)(316002)(16586007)(50226002)(336012)(48376002)(426003)(186003)(8676002)(81156014)(50466002)(356004)(446003)(26005)(77096007)(81166006)(53936002)(478600001)(11346002)(104016004)(2616005)(126002)(476003)(6666004)(76176011)(2906002)(36756003)(51416003)(86362001)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR12MB2974; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ce357ba-a054-4019-5ec1-08d69839fa3c X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605104)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:MN2PR12MB2974; X-MS-TrafficTypeDiagnostic: MN2PR12MB2974: X-Microsoft-Exchange-Diagnostics: 1; MN2PR12MB2974; 20:Abz+kRtInXwdDG4smPYEMkKmDWj55ajwB57pYCDh9P4I31FIASFqP0QqHv+hwusYHmGfb6f8R4ZoShBnNoXH0jD4htld8Ko7Gly34ephugptTc8TetPCmU+0xKmiINBityUChqkx6DFisNxHqeO6soOI74Bba/DnmsZigFQH9RhvbRGnJimyxJDm9Y1TIsJI8M5kxqjKZXXIhxFeH2VeIycUDdc4M1SmR4evvA6DBSIvJodom461rC9Qaz0YMvGs9TDHEbvsi+I4MPgGywHbcugb9q4EpQFV46yIr5Y+s+0dh3Arsve6H39HfwWrD/iVa0jn0FAMK/Q8sE14D0dKPEUHSpboQvUe6p6yKYaoDyc+c9hxgRZ28l4rVxPSbCzaTKOmWdtFqTOQMukl1o2KLsw0Gcpnd5/acen3Iqug5xDWBh+hFbPpb6YiOegLR6hgcGKrwLjchBjJWmbCQ+do6xLsjtF2YahPPBNdUugJ/a+RGUdnSpplKB9SpVdthIx8 X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 09555FB1AD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MN2PR12MB2974; 23:PW4IVwLeOMOo/2MGm6xwZzKxbZ32ufaHJzKM3w9lo?= HChfjYy00R46eQdeoV3ns40mSh/QbJ91tmxMIuEMNY3JMzgH0sCo22DTvvEzju59SRpnRvFEUGHom10V9A7ey4TbSRnZd2RAwTs+PKEpF4RaKRlk6kAw4FOE2gHaAMPCGHDdT11C6xSU3GaKihFea9khrCiUa19wEaYd8n1bs+N63Ua70WN5UoFALIms949SRdZo0+bUJ+sMv+yBbOZDu2hwizPBBIS4I2ayHU8g8T42nuVIl39daULT0N+Pgc62OXG342FV8DhxHBdU+UDOa5thyyXbAWiT4aA/TkkBDz8wvqurE+f3pZhyI+CXMg3ywyKBygCvy2crcOGC7xMmc4/yh3W9Km9HqIUOIaegH5LFK0sahEcqqovo1QWbZC5oF1Coqau+PO0ubgrfWrMVglNpVLNG2kh09X1h/JBqL0M+cKmB1b1s2n7QiLv+goru+k3Etxper9ZMfsSKtCBVqrWiGnxzAaEnJYniEwpROL9t2Twq7JjsVF4KiR8orRiwKjBu1RqzrqbVIT85B1zcVpkmdtfGP6//1CkrzOLxICK9C83vjE2M5s+nUvzbT46kUiFKoJoyfz077rSGHjqTff3WJTVhxMwXHgdaaFoBw24TZbsdxLbRrvCBd0u5GQHRPfBMR4F2OyXWyBrCOoVsznCYHQXGgk3XEwx4KNseN/v2WvgONGwvxGKQq9T5ctg2xbvYmjlsKWNd19j8hsVNXalr8087BNdwupBpwt1s10Yg0hvKucwIsea6/3aIxrqCfAImCBJbI4FgwYGUmUH4eZT5MIZ5znlybSqnAnEoRCEijU8NoY8UF2Lj3gJgnSoM0oTUJ+b5ehvmdzyZOaHnAaVhFPu6xkqG7OKr9/Mkm75BGskCZxpxll9uQ8LYR9kugXTRbYPzpqJ//txObOTbGuKw5pxui8xyUtC+V8KcPmc04QnoPULfyZe0XRGrn6dPsgvi5m1DOdHTmbZGYlyOoIpvCsI2MM+qOQ8mjwSdKIVWjCB4NmuSw1n22rP9g583Nd0OsIGxpAASVUTc06yxB+QvmyF5QeAxtOO8ihpAAjxEdDhMlLBzS1skA5QdDl1cgyhmh2t8Dq/skZykRCBl/XywMCVk0pL4DBRqZ2gtvHfxw== X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: erv7dlfbyiHBiUlbazZeaGqhIloPZyaiJJ2OqO8WsPpugbyZB4CYcuqZqaLgRj596X81uTtjIIg0vi91us43w53OWs4xhCopKy3pNsAYYRvPkhQ5uCYE/O8IU9xACPxutlx+wIuTsk9PzL4GO2qjyftknlIEqColiU1Qd4rwNEvwO82Z/8wfRc/X8NOvneP7jVeqSOOFEiR+cboO4WXb4zz3Wory31B4xaEcDtU3CVdWIsIOqDMqldyDT7E0xZwwZEF3/vIA5Nygdozwjf8V+cWbSu8vjuCzABy5TuN8VAZW3afofQlqQOfuZgY57BJbVlKozYJNQCNSFoKCOG0gBwiW9T2BG94rI6LzNv+LxwXfyFQEVBf+ci9VJl5hQuz0fra/drEDI4q4e5YBH8lh9SObC/k2r7opG0aUpGWKWlw= X-Microsoft-Exchange-Diagnostics: 1; MN2PR12MB2974; 20:cZubPXowPqbdxABOj8BSWjogpA/i1kPJ9235621uZJHT/th12CQYfmf3zkZj0JkuNb4+NmZ0R4SFXQPowENlj6O3rzLAFA97ZiFMIKW0YFYyegdVlllPK71smC9ROT6SYkLMs8TUSygfR3nACpHoQKYhXZRoiWRKMch1Aw41J1FlVdCu0L7I0ioJ8PbCw0Kt4N6NLnNR0vuokM6ZVOHfFrXdOE9RGIpCsMxB3MtojGnAn35MItLXYUB8x9EiHMZM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2019 20:20:09.6310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ce357ba-a054-4019-5ec1-08d69839fa3c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2974 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b94qTedU2KyA5pT4sp4ZOLc99UP8m1fG4tVQEyVV9kY=; b=HsaBAHK4fSP62dONDv16eTX2x7VuBUCHXGRslqjYTDAmEGLhBcgvaDSR++ZihsyEG/3REIwzzmqp7DuWaCFWfcnqIdfsGuoy57qYwDP9N/ZjbueH5VGp8X1IVP5ZeSvH3Li3Do8cs4F4RjlNga39LXRkAeTpqQtVUEBz2Vrv/wc= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, nikola.cornij@amd.com, manasi.d.navare@intel.com, David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Native 420 and 422 transfer modes are new in DSC1.2 In these modes, each two pixels of a slice are treated as one pixel, so the slice width is half as large (round down) for the purposes of calucating the groups per line and chunk size in bytes In native 422 mode, each pixel has four components, so the mux component of a group is larger by one additional mux word and one additional component Now that there is native 422 support, the configuration option previously called enable422 is renamed to simple_422 to avoid confusion Acked-by: Jani Nikula Reviewed-by: Manasi Navare Reviewed-by: Harry Wentland Signed-off-by: David Francis --- drivers/gpu/drm/drm_dsc.c | 33 ++++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_vdsc.c | 4 ++-- include/drm/drm_dsc.h | 4 ++-- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_dsc.c b/drivers/gpu/drm/drm_dsc.c index b7f1903508a4..d77570bf6ac4 100644 --- a/drivers/gpu/drm/drm_dsc.c +++ b/drivers/gpu/drm/drm_dsc.c @@ -95,7 +95,7 @@ void drm_dsc_pps_infoframe_pack(struct drm_dsc_pps_infoframe *pps_sdp, ((dsc_cfg->bits_per_pixel & DSC_PPS_BPP_HIGH_MASK) >> DSC_PPS_MSB_SHIFT) | dsc_cfg->vbr_enable << DSC_PPS_VBR_EN_SHIFT | - dsc_cfg->enable422 << DSC_PPS_SIMPLE422_SHIFT | + dsc_cfg->simple_422 << DSC_PPS_SIMPLE422_SHIFT | dsc_cfg->convert_rgb << DSC_PPS_CONVERT_RGB_SHIFT | dsc_cfg->block_pred_enable << DSC_PPS_BLOCK_PRED_EN_SHIFT; @@ -249,7 +249,7 @@ EXPORT_SYMBOL(drm_dsc_pps_infoframe_pack); /** * drm_dsc_compute_rc_parameters() - Write rate control * parameters to the dsc configuration defined in - * &struct drm_dsc_config in accordance with the DSC 1.1 + * &struct drm_dsc_config in accordance with the DSC 1.2 * specification. Some configuration fields must be present * beforehand. * @@ -266,19 +266,34 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg) unsigned long final_scale = 0; unsigned long rbs_min = 0; - /* Number of groups used to code each line of a slice */ - groups_per_line = DIV_ROUND_UP(vdsc_cfg->slice_width, - DSC_RC_PIXELS_PER_GROUP); + if (vdsc_cfg->native_420 || vdsc_cfg->native_422) { + /* Number of groups used to code each line of a slice */ + groups_per_line = DIV_ROUND_UP(vdsc_cfg->slice_width / 2, + DSC_RC_PIXELS_PER_GROUP); - /* chunksize in Bytes */ - vdsc_cfg->slice_chunk_size = DIV_ROUND_UP(vdsc_cfg->slice_width * - vdsc_cfg->bits_per_pixel, - (8 * 16)); + /* chunksize in Bytes */ + vdsc_cfg->slice_chunk_size = DIV_ROUND_UP(vdsc_cfg->slice_width / 2 * + vdsc_cfg->bits_per_pixel, + (8 * 16)); + } else { + /* Number of groups used to code each line of a slice */ + groups_per_line = DIV_ROUND_UP(vdsc_cfg->slice_width, + DSC_RC_PIXELS_PER_GROUP); + + /* chunksize in Bytes */ + vdsc_cfg->slice_chunk_size = DIV_ROUND_UP(vdsc_cfg->slice_width * + vdsc_cfg->bits_per_pixel, + (8 * 16)); + } if (vdsc_cfg->convert_rgb) num_extra_mux_bits = 3 * (vdsc_cfg->mux_word_size + (4 * vdsc_cfg->bits_per_component + 4) - 2); + else if (vdsc_cfg->native_422) + num_extra_mux_bits = 4 * vdsc_cfg->mux_word_size + + (4 * vdsc_cfg->bits_per_component + 4) + + 3 * (4 * vdsc_cfg->bits_per_component) - 2; else num_extra_mux_bits = 3 * vdsc_cfg->mux_word_size + (4 * vdsc_cfg->bits_per_component + 4) + diff --git a/drivers/gpu/drm/i915/intel_vdsc.c b/drivers/gpu/drm/i915/intel_vdsc.c index 2d059ebc9bd0..8c8d96157333 100644 --- a/drivers/gpu/drm/i915/intel_vdsc.c +++ b/drivers/gpu/drm/i915/intel_vdsc.c @@ -368,7 +368,7 @@ int intel_dp_compute_dsc_params(struct intel_dp *intel_dp, DSC_1_1_MAX_LINEBUF_DEPTH_BITS : line_buf_depth; /* Gen 11 does not support YCbCr */ - vdsc_cfg->enable422 = false; + vdsc_cfg->simple_422 = false; /* Gen 11 does not support VBR */ vdsc_cfg->vbr_enable = false; vdsc_cfg->block_pred_enable = @@ -495,7 +495,7 @@ static void intel_configure_pps_for_dsc_encoder(struct intel_encoder *encoder, pps_val |= DSC_BLOCK_PREDICTION; if (vdsc_cfg->convert_rgb) pps_val |= DSC_COLOR_SPACE_CONVERSION; - if (vdsc_cfg->enable422) + if (vdsc_cfg->simple_422) pps_val |= DSC_422_ENABLE; if (vdsc_cfg->vbr_enable) pps_val |= DSC_VBR_ENABLE; diff --git a/include/drm/drm_dsc.h b/include/drm/drm_dsc.h index 5a98b8dfdf43..f26a89e1b68a 100644 --- a/include/drm/drm_dsc.h +++ b/include/drm/drm_dsc.h @@ -101,9 +101,9 @@ struct drm_dsc_config { */ u16 slice_height; /** - * @enable422: True for 4_2_2 sampling, false for 4_4_4 sampling + * @simple_422: True if simple 4_2_2 mode is enabled else False */ - bool enable422; + bool simple_422; /** * @pic_width: Width of the input display frame in pixels */