From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935671AbdKPPiz (ORCPT ); Thu, 16 Nov 2017 10:38:55 -0500 Received: from mail-co1nam03on0072.outbound.protection.outlook.com ([104.47.40.72]:28672 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935656AbdKPPir (ORCPT ); Thu, 16 Nov 2017 10:38:47 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Harry.Wentland@amd.com; Subject: Re: [PATCH 2/4] drm: amd: Fix line continuation formats To: Joe Perches , linux-kernel@vger.kernel.org Cc: Alex Deucher , David Airlie , dri-devel@lists.freedesktop.org, =?UTF-8?Q?Christian_K=c3=b6nig?= , amd-gfx@lists.freedesktop.org References: From: Harry Wentland Message-ID: <1b2c63b7-319a-caab-6809-197784c179ef@amd.com> Date: Thu, 16 Nov 2017 10:38:41 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.55.250] X-ClientProxiedBy: BN6PR19CA0076.namprd19.prod.outlook.com (10.175.197.14) To CY4PR1201MB2471.namprd12.prod.outlook.com (10.172.116.10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b006d797-1b20-4da6-17da-08d52d081f8e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:CY4PR1201MB2471; X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB2471;3:QxAVXIxwcJAYfu9vqF6EE7nCIFaob0qOlEf/eY1HtGwU/zS0phBAfLDI7zsASs+4ZCuzg2VzNjVvPy9KxVvXLjSEhChoDiSsGFM3BBV5tGwRSCf7Y+qOLHkz9w6QZyyrCPBSDw/TDIq2bJM6x2D5lrn3gW26wjYxB11nB1G849FQI85EyudFUOZ9c9k66fmyBkjuidax+OakdD4E8MzRGPK+Ctbv9YzsclaSfS0IBcOx6C0BOn5FX+O6vS3d0lLL;25:C8Klv5Gh+7sHnRv0T4rUBVFSK13QXWYAmi8Nkd75k9mApbx/55nQRWTw63Vxw90MmybPAzv9EhRPA/Gie/gp7TAislhVZXyxqLOzsP6ngKHeItXslLSPRStRYGe4z8svWwldm7soc4suvAaMLlKnckRqXokK0wM0L9UYHjw08niauNso4HvVLF8zgYD6DA4UN3dpQL7nNVPq9m0j3teLG1OV3OfhRXtAaChQGWPSrbpH9EKV7qxZW3+wxUyr7dLL3YGC2ucOch8xtKzjkINFnENaU6XOyKR+wSrkVhwwq9R8ZTETCjpyV5mJ0Ct/XS7B3lq8p2CSXmPVL360hlGqTw==;31:l+wCSwq1bOey8AV/GZe5k5LkdGApSL/4bTXYRq17y7n7Y4Hqylq8EpvydIcM7cuPMxxORvpvgRLaZFtxx9XeW+EqcPcQRuHdgOE8mTaOCjkchkh6wsO35G1SrncSb2CjS0iQ/sfkRzIZ/NnUhtgT+6/UyS1WsBVIQC0jVsXu5gCrfQoKHWbXmg67gnjMhK3wfEE5UvIZzkZS8vC8BotGNmPsK1KJtOhI4rg/sqYAVh0= X-MS-TrafficTypeDiagnostic: CY4PR1201MB2471: X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB2471;20:seyInCXzS5fFfHxjfGyciQEK+2b6NCY4zre4xVmerSBt+YX98Lb/PmYqzBXQgLGBLwextim5xRXus48ER9YU+vPDMixdZLtCK7O3J/jAnoQ0dyvyW2ZIxl7QfoG+1sNFe6+UVXcMJjmSxGAF24DlauwaOaAbX9bW1BqQuqnSUgGyqDxYZGu05d3HYz6NoaDh3ba5WQf9EMQH4OSBp54ppFOdQhozEsDhU7VscjLj/65ggdwX5yQ7TPWs4pD39sLkwhqjwrfoGvHYmxDJX5gsNnvUq5zg2mCvdGL+eVjqrpNm8rQqV2T7Bszh++fTmwsHFXJcPdYfemfbc6TvIXwUFu17FzGco/E6WEPNQ9kWo9MkrVruLegFuPdR0ICa4Uy42J0Vj3jkOox2bANQgkNzB8WLbnbVCGdqvvrEqPjI02KMEDtbKP2Ktfs4sNFz10FFqwrvd8Jexm3xhceVO80DeXwlfC3EzVfP2Zw55e9MEMqCSEjnXejPi5VvCgLP+Zva;4:BciPVAlWZDFM+9GmIK4dh8oke0PpScHiI7I9I4TDcIZlrQSjOBxFN5LHOy641F7cx4vNmjvQA1/6wFmK0hI7z1KBsY4hs9bay6pntS6tqMXX/gizRjSgxyTqfB/ubdUX3mcQAHg4DJ9ZJTqPpVsmi1TAD9QM6+oaqzb8kd0K3bWOr0HFIckqeo/RUeS/Mr+epCRyTlzZvAm93KhzIN/t5udgoZpxjkAVvOV9shX65STfyzI0cGhq+7mna6skf0DPQ8eYaFktNSyHuOcWk/Y3Spzx24H+pqMelvlRd/wz08nHwmA7RgHpd9m3mJGeWuco X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3231022)(10201501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY4PR1201MB2471;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY4PR1201MB2471; X-Forefront-PRVS: 0493852DA9 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(6049001)(346002)(39860400002)(376002)(377424004)(199003)(24454002)(189002)(65826007)(31696002)(575784001)(47776003)(6666003)(478600001)(106356001)(64126003)(4001150100001)(66066001)(101416001)(65956001)(31686004)(65806001)(72206003)(97736004)(230700001)(86362001)(2950100002)(105586002)(68736007)(23676003)(33646002)(4326008)(36756003)(189998001)(53546010)(5660300001)(90366009)(16526018)(316002)(16576012)(58126008)(54906003)(77096006)(83506002)(6246003)(229853002)(81156014)(8936002)(8676002)(81166006)(6116002)(50466002)(305945005)(54356999)(50986999)(25786009)(76176999)(53936002)(2906002)(7736002)(3846002)(6486002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR1201MB2471;H:[172.29.157.105];FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyMDFNQjI0NzE7MjM6VDhUVGFWVUFWMUZ4ZHhBdHczdFg4Nyth?= =?utf-8?B?U3lvYTdDaVYybzFNUTdlcGRuL1Rvd245OFJMK29BOFVYTzNDTzNKOHdYakU4?= =?utf-8?B?MktsL04vT3BpSnNuSk1iTnlXYkNmVmFldkFDUjIrNnUrV2UxOWFXYVk1ZXhq?= =?utf-8?B?LzdWVnhHTkxhazRPZ3Jud0w5a1YyN0hyS3ptUlkvV3E3ai9zeDl2QWs1RENv?= =?utf-8?B?a2I3bHY0MUxYbWZ5RlY4TGlaU2dBYkVQbnZpdk5YeUN2MHVNSkFTVFV6VlVL?= =?utf-8?B?ZU5ZbmpKUlFKcUViamRaOVZiMmFoaXM0Ymx6bTdXOU5KZXRJRXFSMnFYMi9n?= =?utf-8?B?cm0yS1Y2SEtXZGRnNlpHSmQ5bWs5dEc3M3B3ZUNLQmtoMWVJY2lwcXNESHVy?= =?utf-8?B?ZmJ4UWxVRTE0QmZGWFMvUEVHdFB6bWwxQllpK2x3Yy81NjBTa2picjNkQXhr?= =?utf-8?B?c3pnSllvY3ZzM0JSaVpWQ0w2OHRJUmVaN0N5R0tvL0hYejJBN0xqWWR6Nkp4?= =?utf-8?B?VmVKd0wyRWRKN2VjNTlPK2Z1K3pMb1hvSzdlbk80bTBkcWR4UzdGN0NZQWZm?= =?utf-8?B?R3BZRHNwT1JJcVdrSGszUkMrN1JQQjg5bzYzWG1xbkFySEtaRVYxQVptUTlV?= =?utf-8?B?RnlQSEc3M24rSnNGYUJKUWFGTlBDQlpoSm8xOEhSYkt5Wk5ySElBelJrZ3lW?= =?utf-8?B?YzJBaW1hN2luS0p3cm9VVUh4WEVva2NqekRFek5YOTZJRUNUZldHUnNtZW92?= =?utf-8?B?TVJtNjFXMTdYNTBQcmNjM0V2cW13YklOQVJWM0RQVnRhazBWZGRNUFVaVFJ1?= =?utf-8?B?OUZOSG9lSEpQQWdmb3IwcGFnanY3TWk3eE1wM3FJMis4Q3lLMVRTSERacHNl?= =?utf-8?B?K0l6OXlEazZzelAveUEwV29WY1pFRmRwWjhvV1hnTEVveTkvT09nR2gxTVNi?= =?utf-8?B?Qk1LL3VUYmV4ME9ZZUJ0cnVxYWc3bUV3Q2I5RDBUMUZiYW5WaEhyU2dJNG9q?= =?utf-8?B?emJxdm5SdWNrR0h5MVZYTTkrWFRDT2NNbVI4UjlBMjNjcmNaZHJTMVJnb1Q3?= =?utf-8?B?WUgzY2hubHg0UG1uNnRxM0FrL2hHcTJOR0h6a0VQRVBDL0poWGZ4WUx3ekp3?= =?utf-8?B?OEw2U2JSNnd1Y01Kb1cvcGQ3Rlk1dm0wUjkvVGYrTDJvMk9oSTJFaU9vbXlh?= =?utf-8?B?QkFpaGlNWVZUOGM1d2xsL0dsUzZaTk1uQ0lyY2wwYlZKMkl3NXJwdXlqMjls?= =?utf-8?B?dW9oMlJ4M3JHSTRUSzVONnpYOTQ5TzV0N3BYaFpETlpRUHFrRHlwMkNVQkRz?= =?utf-8?B?aDhsbEhWeVcwUVNoR0NyUkRSNEpjdnpoY29wRWp6SCs3d0hhZDhZdjlBVkRo?= =?utf-8?B?K21PQytiM0hyc2lWU0xiZUpaMWlpZUxzRXRHNW02R2ljV29oVkxlWUgzOHBz?= =?utf-8?B?MEIzbkdHbWptTmY2cmFuYnRvNXU4V3JFVWQ3ZHFuMjlPZzd1UDhPVFFQVG5B?= =?utf-8?B?YUtHREZHNTZuN3pTaVlIZlN2MWxibk5kNkdCVGhLOG5RZEUwR3F5clNCR21M?= =?utf-8?B?M0p6RU1CZC9TcHZmNDRvM1pjSkxoRUhnRUFGZ3B1Z2RHcXl6Y3R4QXhCbTkw?= =?utf-8?B?SFdxLzREMGdvZjY4V1U1eXhXZTQyV1prVmNWYzY5V3NHeVkzVUQyWUFrelpk?= =?utf-8?B?bHV4aW1MM2NsY2J2a1BZRDQ5dVJRNTQrMTBKSVl0N3dva3phY1Q5ZmFVbndQ?= =?utf-8?B?SWYyOFRYbTBzMHBYK1dPMEFVaEJzS0JvSXFCSWZMWnhVTFMvTjZoRWF0WDV3?= =?utf-8?B?Um0wVU02WEpGb0hXNWR4ajBOSXp6MHliWjhDb2V1WUhPc21PLzB3Zkwrb2ZK?= =?utf-8?B?NXcxWnozT0s2N083WGtiUnA5K1dyMFdsYjVWQkpiN3hVUmdlYVo3NzJzc0U3?= =?utf-8?B?bVNmYUFsb3g3YlhUb1RyR1B0WlNCV2lQUXlEWjYyYi92MWpxbmFuNjRHRExK?= =?utf-8?Q?Mg03gM6+?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB2471;6:7VsX2GHjAlI0d5DtQi+FOZUXaAS337i6AIuwy6ypy/Yi3Ful0VmpIm2JmrLrFZs+eZRlp5q4S/+U1LUu/J1DkUC8WctnGS0yKg8dAJtWSPdCfZ6fBuYKDyoWK/hIA4/NaZNZNxXE+hJBS66qx/6kpv3sOUTqo0JKgsnuuQ7zEnhez0i3RbaNDvZm7sCiFi++V1CsHsUbmT+1akfPHDVRrYcCfvcOpwgHgZazLljsp1uS7cKGxlV5egCJ51BdO7SuvdHfQ6j13ouz+1xukTCFTIi5UrnMgbv+58jNrrx2OuZSTQAAnv5fFGZ2EqHGLYmh088BWvSrJUAWr4hqHzixJPpeRxcbZrsYnJBFsbgX1jk=;5:DCTE6gQ1oOZlmzIKU4A2V5PkhgJChDCiJvFM+L5rNXIK6dIF5aB2z3/pkErrGdetAjm5P5KVV3Zy5hp8M9eZS5ulSbfJbSp71KUSQBdwouxOVtW36GJZ2BxrBEZ4uYpDcYMj3yjsmvpsWT09Ho/EKkxpRb0IL64TQyHOioSXlNw=;24:4KINHhPLtLrwSNz7E718UyfWLSadFesMzyDSrk585YgrQ+Kwp+J0RhxLHnWQWwfUEUmcM7KF1VdZj46Wx3XVEy0EfxBKeINyoqV9yDw4tic=;7:NmrYa3S9WOuWe3RfnY3aZrZSVR+eBk6UtkM610utWCMjspKjje8ACzJLQLZUHCfPMVx7LWUQEBPCgW7+glJuHTYwfvVTSKC/rly5yzHkjU+N2pJOw77knzQKA8U7H+N3DnrgMMgsbhgQmrQkU4wt9YF0RfqSPKbDE6HdpMKmCS6KklZN6JWrx17xVB07CpEb9XwyR7ufo8yEUuQ2erkn9G/mtP/EZIo0PHT6BkkpiAqVch0Ci86wFEtZw5NRmxEL SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB2471;20:OB/KzRjETBYTfzxycUJEYevKR5TX/sqkQWGfeV0dUqAHKHcaAOP5D52f1whBNzvsDXmhK9kM5Cy60CRqAzs1/XzGgjy2vqz8nfD05zB/rL4J9vdY3hJtXMz3YBUOZbq7KTqbJLB4L46dSrsRHSWT/i2dLMeRHz4iguLZxgDisqmKJr2zQJXe+Rx2ap+K10YhO3KayemAJAFM+18fCxYT8jQCA8hVm32bLzyn/O/7INRB3KfvjYE5D3SPYx3jFoQY X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2017 15:38:44.7218 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b006d797-1b20-4da6-17da-08d52d081f8e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB2471 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017-11-16 10:27 AM, Joe Perches wrote: > Line continuations with excess spacing causes unexpected output. > > Miscellanea: > > o Added missing '\n' to a few of the coalesced pr_ formats > > Signed-off-by: Joe Perches > --- > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 ++++----- > .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 ++--- > drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++-------------- > drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 6 ++--- > .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 9 +++----- > .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 ++--- > 6 files changed, 22 insertions(+), 43 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c > index ced42484dcfc..6743786afcce 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c > @@ -220,8 +220,7 @@ static void dpcd_set_lt_pattern_and_lane_settings( > size_in_bytes); > > dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, > - "%s:\n %x VS set = %x PE set = %x \ > - max VS Reached = %x max PE Reached = %x\n", > + "%s:\n %x VS set = %x PE set = %x max VS Reached = %x max PE Reached = %x\n", > __func__, > DP_TRAINING_LANE0_SET, > dpcd_lane[0].bits.VOLTAGE_SWING_SET, > @@ -558,8 +557,7 @@ static void dpcd_set_lane_settings( > */ > > dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, > - "%s\n %x VS set = %x PE set = %x \ > - max VS Reached = %x max PE Reached = %x\n", > + "%s\n %x VS set = %x PE set = %x max VS Reached = %x max PE Reached = %x\n", > __func__, > DP_TRAINING_LANE0_SET, > dpcd_lane[0].bits.VOLTAGE_SWING_SET, > @@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence( > if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) { > ASSERT(0); > dm_logger_write(link->ctx->logger, LOG_ERROR, > - "%s: Link Training Error, could not \ > - get CR after %d tries. \ > - Possibly voltage swing issue", __func__, > + "%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue", Would probably be good to add a '\n' here as well but that's not the main intention of this patch. Either way patch is Reviewed-by: Harry Wentland Harry > + __func__, > LINK_TRAINING_MAX_CR_RETRY); > > } > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c > index d1af1483c69b..813f827e4270 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c > @@ -523,8 +523,7 @@ static int get_pcie_table( > if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count) > pcie_count = (uint32_t)atom_pcie_table->ucNumEntries; > else > - pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \ > - Disregarding the excess entries... \n"); > + pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n"); > > pcie_table->count = pcie_count; > for (i = 0; i < pcie_count; i++) { > @@ -563,8 +562,7 @@ static int get_pcie_table( > if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count) > pcie_count = (uint32_t)atom_pcie_table->ucNumEntries; > else > - pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \ > - Disregarding the excess entries... \n"); > + pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n"); > > pcie_table->count = pcie_count; > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > index 4f79c21f27ed..9599fe0ba779 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > @@ -546,8 +546,7 @@ static void vega10_patch_with_vdd_leakage(struct pp_hwmgr *hwmgr, > } > > if (*voltage > ATOM_VIRTUAL_VOLTAGE_ID0) > - pr_info("Voltage value looks like a Leakage ID \ > - but it's not patched\n"); > + pr_info("Voltage value looks like a Leakage ID but it's not patched\n"); > } > > /** > @@ -701,18 +700,14 @@ static int vega10_set_private_data_based_on_pptable(struct pp_hwmgr *hwmgr) > table_info->vdd_dep_on_mclk; > > PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table, > - "VDD dependency on SCLK table is missing. \ > - This table is mandatory", return -EINVAL); > + "VDD dependency on SCLK table is missing. This table is mandatory", return -EINVAL); > PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1, > - "VDD dependency on SCLK table is empty. \ > - This table is mandatory", return -EINVAL); > + "VDD dependency on SCLK table is empty. This table is mandatory", return -EINVAL); > > PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table, > - "VDD dependency on MCLK table is missing. \ > - This table is mandatory", return -EINVAL); > + "VDD dependency on MCLK table is missing. This table is mandatory", return -EINVAL); > PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1, > - "VDD dependency on MCLK table is empty. \ > - This table is mandatory", return -EINVAL); > + "VDD dependency on MCLK table is empty. This table is mandatory", return -EINVAL); > > table_info->max_clock_voltage_on_ac.sclk = > allowed_sclk_vdd_table->entries[allowed_sclk_vdd_table->count - 1].clk; > @@ -3415,8 +3410,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels( > DPMTABLE_OD_UPDATE_SCLK)) { > result = vega10_populate_all_graphic_levels(hwmgr); > PP_ASSERT_WITH_CODE(!result, > - "Failed to populate SCLK during \ > - PopulateNewDPMClocksStates Function!", > + "Failed to populate SCLK during PopulateNewDPMClocksStates Function!", > return result); > } > > @@ -3425,8 +3419,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels( > DPMTABLE_OD_UPDATE_MCLK)){ > result = vega10_populate_all_memory_levels(hwmgr); > PP_ASSERT_WITH_CODE(!result, > - "Failed to populate MCLK during \ > - PopulateNewDPMClocksStates Function!", > + "Failed to populate MCLK during PopulateNewDPMClocksStates Function!", > return result); > } > } else { > @@ -3543,8 +3536,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels( > data->apply_optimized_settings) { > result = vega10_populate_all_graphic_levels(hwmgr); > PP_ASSERT_WITH_CODE(!result, > - "Failed to populate SCLK during \ > - PopulateNewDPMClocksStates Function!", > + "Failed to populate SCLK during PopulateNewDPMClocksStates Function!", > return result); > } > > @@ -3552,8 +3544,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels( > (DPMTABLE_OD_UPDATE_MCLK + DPMTABLE_UPDATE_MCLK)) { > result = vega10_populate_all_memory_levels(hwmgr); > PP_ASSERT_WITH_CODE(!result, > - "Failed to populate MCLK during \ > - PopulateNewDPMClocksStates Function!", > + "Failed to populate MCLK during PopulateNewDPMClocksStates Function!", > return result); > } > } > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c > index 4d672cd15785..ed4b37e566a3 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c > @@ -1732,8 +1732,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr, > > if (0 != result) { > smu_data->smc_state_table.GraphicsBootLevel = 0; > - pr_err("VBIOS did not find boot engine clock value \ > - in dependency table. Using Graphics DPM level 0!"); > + pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n"); > result = 0; > } > > @@ -1743,8 +1742,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr, > > if (0 != result) { > smu_data->smc_state_table.MemoryBootLevel = 0; > - pr_err("VBIOS did not find boot engine clock value \ > - in dependency table. Using Memory DPM level 0!"); > + pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n"); > result = 0; > } > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c > index 34128822b8fb..2ff682d44e8c 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c > @@ -911,8 +911,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr, > hwmgr->dyn_state.vddc_dependency_on_sclk, engine_clock, > &graphic_level->MinVddc); > PP_ASSERT_WITH_CODE((0 == result), > - "can not find VDDC voltage value for VDDC \ > - engine clock dependency table", return result); > + "can not find VDDC voltage value for VDDC engine clock dependency table", return result); > > /* SCLK frequency in units of 10KHz*/ > graphic_level->SclkFrequency = engine_clock; > @@ -1678,8 +1677,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr, > > if (0 != result) { > smu_data->smc_state_table.GraphicsBootLevel = 0; > - pr_err("VBIOS did not find boot engine clock value \ > - in dependency table. Using Graphics DPM level 0!"); > + pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n"); > result = 0; > } > > @@ -1689,8 +1687,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr, > > if (0 != result) { > smu_data->smc_state_table.MemoryBootLevel = 0; > - pr_err("VBIOS did not find boot engine clock value \ > - in dependency table. Using Memory DPM level 0!"); > + pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n"); > result = 0; > } > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c > index 2f979fb86824..f6f39d01d227 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c > @@ -381,10 +381,8 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr) > (rev_id == 0xc1) || > (rev_id == 0xc3)))) { > if (smc_driver_if_version != SMU9_DRIVER_IF_VERSION) { > - pr_err("Your firmware(0x%x) doesn't match \ > - SMU9_DRIVER_IF_VERSION(0x%x). \ > - Please update your firmware!\n", > - smc_driver_if_version, SMU9_DRIVER_IF_VERSION); > + pr_err("Your firmware(0x%x) doesn't match SMU9_DRIVER_IF_VERSION(0x%x). Please update your firmware!\n", > + smc_driver_if_version, SMU9_DRIVER_IF_VERSION); > return -EINVAL; > } > } > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harry Wentland Subject: Re: [PATCH 2/4] drm: amd: Fix line continuation formats Date: Thu, 16 Nov 2017 10:38:41 -0500 Message-ID: <1b2c63b7-319a-caab-6809-197784c179ef@amd.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: Joe Perches , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Alex Deucher , David Airlie , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, =?UTF-8?Q?Christian_K=c3=b6nig?= , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org CgpPbiAyMDE3LTExLTE2IDEwOjI3IEFNLCBKb2UgUGVyY2hlcyB3cm90ZToKPiBMaW5lIGNvbnRp bnVhdGlvbnMgd2l0aCBleGNlc3Mgc3BhY2luZyBjYXVzZXMgdW5leHBlY3RlZCBvdXRwdXQuCj4g Cj4gTWlzY2VsbGFuZWE6Cj4gCj4gbyBBZGRlZCBtaXNzaW5nICdcbicgdG8gYSBmZXcgb2YgdGhl IGNvYWxlc2NlZCBwcl88bGV2ZWw+IGZvcm1hdHMKPiAKPiBTaWduZWQtb2ZmLWJ5OiBKb2UgUGVy Y2hlcyA8am9lQHBlcmNoZXMuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvY29yZS9kY19saW5rX2RwLmMgICB8IDExICsrKystLS0tLQo+ICAuLi4vYW1kL3Bvd2Vy cGxheS9od21nci9wcm9jZXNzX3BwdGFibGVzX3YxXzAuYyAgICB8ICA2ICsrLS0tCj4gIGRyaXZl cnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3ZlZ2ExMF9od21nci5jIHwgMjcgKysrKysr KystLS0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3Iv Y2lfc211bWdyLmMgICB8ICA2ICsrLS0tCj4gIC4uLi9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211 bWdyL2ljZWxhbmRfc211bWdyLmMgIHwgIDkgKysrLS0tLS0KPiAgLi4uL2dwdS9kcm0vYW1kL3Bv d2VycGxheS9zbXVtZ3IvdmVnYTEwX3NtdW1nci5jICAgfCAgNiArKy0tLQo+ICA2IGZpbGVzIGNo YW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2RwLmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2RwLmMKPiBpbmRleCBjZWQ0 MjQ4NGRjZmMuLjY3NDM3ODZhZmNjZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2RwLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2RwLmMKPiBAQCAtMjIwLDggKzIyMCw3IEBAIHN0YXRp YyB2b2lkIGRwY2Rfc2V0X2x0X3BhdHRlcm5fYW5kX2xhbmVfc2V0dGluZ3MoCj4gIAkJc2l6ZV9p bl9ieXRlcyk7Cj4gIAo+ICAJZG1fbG9nZ2VyX3dyaXRlKGxpbmstPmN0eC0+bG9nZ2VyLCBMT0df SFdfTElOS19UUkFJTklORywKPiAtCQkiJXM6XG4gJXggVlMgc2V0ID0gJXggIFBFIHNldCA9ICV4 IFwKPiAtCQltYXggVlMgUmVhY2hlZCA9ICV4ICBtYXggUEUgUmVhY2hlZCA9ICV4XG4iLAo+ICsJ CSIlczpcbiAleCBWUyBzZXQgPSAleCAgUEUgc2V0ID0gJXggbWF4IFZTIFJlYWNoZWQgPSAleCAg bWF4IFBFIFJlYWNoZWQgPSAleFxuIiwKPiAgCQlfX2Z1bmNfXywKPiAgCQlEUF9UUkFJTklOR19M QU5FMF9TRVQsCj4gIAkJZHBjZF9sYW5lWzBdLmJpdHMuVk9MVEFHRV9TV0lOR19TRVQsCj4gQEAg LTU1OCw4ICs1NTcsNyBAQCBzdGF0aWMgdm9pZCBkcGNkX3NldF9sYW5lX3NldHRpbmdzKAo+ICAJ Ki8KPiAgCj4gIAlkbV9sb2dnZXJfd3JpdGUobGluay0+Y3R4LT5sb2dnZXIsIExPR19IV19MSU5L X1RSQUlOSU5HLAo+IC0JCSIlc1xuICV4IFZTIHNldCA9ICV4ICBQRSBzZXQgPSAleCBcCj4gLQkJ bWF4IFZTIFJlYWNoZWQgPSAleCAgbWF4IFBFIFJlYWNoZWQgPSAleFxuIiwKPiArCQkiJXNcbiAl eCBWUyBzZXQgPSAleCAgUEUgc2V0ID0gJXggbWF4IFZTIFJlYWNoZWQgPSAleCAgbWF4IFBFIFJl YWNoZWQgPSAleFxuIiwKPiAgCQlfX2Z1bmNfXywKPiAgCQlEUF9UUkFJTklOR19MQU5FMF9TRVQs Cj4gIAkJZHBjZF9sYW5lWzBdLmJpdHMuVk9MVEFHRV9TV0lOR19TRVQsCj4gQEAgLTg3Miw5ICs4 NzAsOCBAQCBzdGF0aWMgYm9vbCBwZXJmb3JtX2Nsb2NrX3JlY292ZXJ5X3NlcXVlbmNlKAo+ICAJ aWYgKHJldHJ5X2NvdW50ID49IExJTktfVFJBSU5JTkdfTUFYX0NSX1JFVFJZKSB7Cj4gIAkJQVNT RVJUKDApOwo+ICAJCWRtX2xvZ2dlcl93cml0ZShsaW5rLT5jdHgtPmxvZ2dlciwgTE9HX0VSUk9S LAo+IC0JCQkiJXM6IExpbmsgVHJhaW5pbmcgRXJyb3IsIGNvdWxkIG5vdCBcCj4gLQkJCSBnZXQg Q1IgYWZ0ZXIgJWQgdHJpZXMuIFwKPiAtCQkJUG9zc2libHkgdm9sdGFnZSBzd2luZyBpc3N1ZSIs IF9fZnVuY19fLAo+ICsJCQkiJXM6IExpbmsgVHJhaW5pbmcgRXJyb3IsIGNvdWxkIG5vdCBnZXQg Q1IgYWZ0ZXIgJWQgdHJpZXMuIFBvc3NpYmx5IHZvbHRhZ2Ugc3dpbmcgaXNzdWUiLAoKV291bGQg cHJvYmFibHkgYmUgZ29vZCB0byBhZGQgYSAnXG4nIGhlcmUgYXMgd2VsbCBidXQgdGhhdCdzIG5v dCB0aGUgbWFpbiBpbnRlbnRpb24gb2YgdGhpcyBwYXRjaC4KCkVpdGhlciB3YXkgcGF0Y2ggaXMK UmV2aWV3ZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxoYXJyeS53ZW50bGFuZEBhbWQuY29tPgoKSGFy cnkKCj4gKwkJCV9fZnVuY19fLAo+ICAJCQlMSU5LX1RSQUlOSU5HX01BWF9DUl9SRVRSWSk7Cj4g IAo+ICAJfQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21n ci9wcm9jZXNzX3BwdGFibGVzX3YxXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5 L2h3bWdyL3Byb2Nlc3NfcHB0YWJsZXNfdjFfMC5jCj4gaW5kZXggZDFhZjE0ODNjNjliLi44MTNm ODI3ZTQyNzAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdt Z3IvcHJvY2Vzc19wcHRhYmxlc192MV8wLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bv d2VycGxheS9od21nci9wcm9jZXNzX3BwdGFibGVzX3YxXzAuYwo+IEBAIC01MjMsOCArNTIzLDcg QEAgc3RhdGljIGludCBnZXRfcGNpZV90YWJsZSgKPiAgCQlpZiAoKHVpbnQzMl90KWF0b21fcGNp ZV90YWJsZS0+dWNOdW1FbnRyaWVzIDw9IHBjaWVfY291bnQpCj4gIAkJCXBjaWVfY291bnQgPSAo dWludDMyX3QpYXRvbV9wY2llX3RhYmxlLT51Y051bUVudHJpZXM7Cj4gIAkJZWxzZQo+IC0JCQlw cl9lcnIoIk51bWJlciBvZiBQY2llIEVudHJpZXMgZXhjZWVkIHRoZSBudW1iZXIgb2YgU0NMSyBE cG0gTGV2ZWxzISBcCj4gLQkJCURpc3JlZ2FyZGluZyB0aGUgZXhjZXNzIGVudHJpZXMuLi4gXG4i KTsKPiArCQkJcHJfZXJyKCJOdW1iZXIgb2YgUGNpZSBFbnRyaWVzIGV4Y2VlZCB0aGUgbnVtYmVy IG9mIFNDTEsgRHBtIExldmVscyEgRGlzcmVnYXJkaW5nIHRoZSBleGNlc3MgZW50cmllcy4uLlxu Iik7Cj4gIAo+ICAJCXBjaWVfdGFibGUtPmNvdW50ID0gcGNpZV9jb3VudDsKPiAgCQlmb3IgKGkg PSAwOyBpIDwgcGNpZV9jb3VudDsgaSsrKSB7Cj4gQEAgLTU2Myw4ICs1NjIsNyBAQCBzdGF0aWMg aW50IGdldF9wY2llX3RhYmxlKAo+ICAJCWlmICgodWludDMyX3QpYXRvbV9wY2llX3RhYmxlLT51 Y051bUVudHJpZXMgPD0gcGNpZV9jb3VudCkKPiAgCQkJcGNpZV9jb3VudCA9ICh1aW50MzJfdClh dG9tX3BjaWVfdGFibGUtPnVjTnVtRW50cmllczsKPiAgCQllbHNlCj4gLQkJCXByX2VycigiTnVt YmVyIG9mIFBjaWUgRW50cmllcyBleGNlZWQgdGhlIG51bWJlciBvZiBTQ0xLIERwbSBMZXZlbHMh IFwKPiAtCQkJRGlzcmVnYXJkaW5nIHRoZSBleGNlc3MgZW50cmllcy4uLiBcbiIpOwo+ICsJCQlw cl9lcnIoIk51bWJlciBvZiBQY2llIEVudHJpZXMgZXhjZWVkIHRoZSBudW1iZXIgb2YgU0NMSyBE cG0gTGV2ZWxzISBEaXNyZWdhcmRpbmcgdGhlIGV4Y2VzcyBlbnRyaWVzLi4uXG4iKTsKPiAgCj4g IAkJcGNpZV90YWJsZS0+Y291bnQgPSBwY2llX2NvdW50Owo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvdmVnYTEwX2h3bWdyLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci92ZWdhMTBfaHdtZ3IuYwo+IGluZGV4IDRmNzlj MjFmMjdlZC4uOTU5OWZlMGJhNzc5IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv cG93ZXJwbGF5L2h3bWdyL3ZlZ2ExMF9od21nci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9wb3dlcnBsYXkvaHdtZ3IvdmVnYTEwX2h3bWdyLmMKPiBAQCAtNTQ2LDggKzU0Niw3IEBAIHN0 YXRpYyB2b2lkIHZlZ2ExMF9wYXRjaF93aXRoX3ZkZF9sZWFrYWdlKHN0cnVjdCBwcF9od21nciAq aHdtZ3IsCj4gIAl9Cj4gIAo+ICAJaWYgKCp2b2x0YWdlID4gQVRPTV9WSVJUVUFMX1ZPTFRBR0Vf SUQwKQo+IC0JCXByX2luZm8oIlZvbHRhZ2UgdmFsdWUgbG9va3MgbGlrZSBhIExlYWthZ2UgSUQg XAo+IC0JCQkJYnV0IGl0J3Mgbm90IHBhdGNoZWRcbiIpOwo+ICsJCXByX2luZm8oIlZvbHRhZ2Ug dmFsdWUgbG9va3MgbGlrZSBhIExlYWthZ2UgSUQgYnV0IGl0J3Mgbm90IHBhdGNoZWRcbiIpOwo+ ICB9Cj4gIAo+ICAvKioKPiBAQCAtNzAxLDE4ICs3MDAsMTQgQEAgc3RhdGljIGludCB2ZWdhMTBf c2V0X3ByaXZhdGVfZGF0YV9iYXNlZF9vbl9wcHRhYmxlKHN0cnVjdCBwcF9od21nciAqaHdtZ3Ip Cj4gIAkJCXRhYmxlX2luZm8tPnZkZF9kZXBfb25fbWNsazsKPiAgCj4gIAlQUF9BU1NFUlRfV0lU SF9DT0RFKGFsbG93ZWRfc2Nsa192ZGRfdGFibGUsCj4gLQkJIlZERCBkZXBlbmRlbmN5IG9uIFND TEsgdGFibGUgaXMgbWlzc2luZy4gXAo+IC0JCVRoaXMgdGFibGUgaXMgbWFuZGF0b3J5IiwgcmV0 dXJuIC1FSU5WQUwpOwo+ICsJCSJWREQgZGVwZW5kZW5jeSBvbiBTQ0xLIHRhYmxlIGlzIG1pc3Np bmcuIFRoaXMgdGFibGUgaXMgbWFuZGF0b3J5IiwgcmV0dXJuIC1FSU5WQUwpOwo+ICAJUFBfQVNT RVJUX1dJVEhfQ09ERShhbGxvd2VkX3NjbGtfdmRkX3RhYmxlLT5jb3VudCA+PSAxLAo+IC0JCSJW REQgZGVwZW5kZW5jeSBvbiBTQ0xLIHRhYmxlIGlzIGVtcHR5LiBcCj4gLQkJVGhpcyB0YWJsZSBp cyBtYW5kYXRvcnkiLCByZXR1cm4gLUVJTlZBTCk7Cj4gKwkJIlZERCBkZXBlbmRlbmN5IG9uIFND TEsgdGFibGUgaXMgZW1wdHkuIFRoaXMgdGFibGUgaXMgbWFuZGF0b3J5IiwgcmV0dXJuIC1FSU5W QUwpOwo+ICAKPiAgCVBQX0FTU0VSVF9XSVRIX0NPREUoYWxsb3dlZF9tY2xrX3ZkZF90YWJsZSwK PiAtCQkiVkREIGRlcGVuZGVuY3kgb24gTUNMSyB0YWJsZSBpcyBtaXNzaW5nLiBcCj4gLQkJVGhp cyB0YWJsZSBpcyBtYW5kYXRvcnkiLCByZXR1cm4gLUVJTlZBTCk7Cj4gKwkJIlZERCBkZXBlbmRl bmN5IG9uIE1DTEsgdGFibGUgaXMgbWlzc2luZy4gIFRoaXMgdGFibGUgaXMgbWFuZGF0b3J5Iiwg cmV0dXJuIC1FSU5WQUwpOwo+ICAJUFBfQVNTRVJUX1dJVEhfQ09ERShhbGxvd2VkX21jbGtfdmRk X3RhYmxlLT5jb3VudCA+PSAxLAo+IC0JCSJWREQgZGVwZW5kZW5jeSBvbiBNQ0xLIHRhYmxlIGlz IGVtcHR5LiBcCj4gLQkJVGhpcyB0YWJsZSBpcyBtYW5kYXRvcnkiLCByZXR1cm4gLUVJTlZBTCk7 Cj4gKwkJIlZERCBkZXBlbmRlbmN5IG9uIE1DTEsgdGFibGUgaXMgZW1wdHkuICBUaGlzIHRhYmxl IGlzIG1hbmRhdG9yeSIsIHJldHVybiAtRUlOVkFMKTsKPiAgCj4gIAl0YWJsZV9pbmZvLT5tYXhf Y2xvY2tfdm9sdGFnZV9vbl9hYy5zY2xrID0KPiAgCQlhbGxvd2VkX3NjbGtfdmRkX3RhYmxlLT5l bnRyaWVzW2FsbG93ZWRfc2Nsa192ZGRfdGFibGUtPmNvdW50IC0gMV0uY2xrOwo+IEBAIC0zNDE1 LDggKzM0MTAsNyBAQCBzdGF0aWMgaW50IHZlZ2ExMF9wb3B1bGF0ZV9hbmRfdXBsb2FkX3NjbGtf bWNsa19kcG1fbGV2ZWxzKAo+ICAJCQkJCURQTVRBQkxFX09EX1VQREFURV9TQ0xLKSkgewo+ICAJ CQlyZXN1bHQgPSB2ZWdhMTBfcG9wdWxhdGVfYWxsX2dyYXBoaWNfbGV2ZWxzKGh3bWdyKTsKPiAg CQkJUFBfQVNTRVJUX1dJVEhfQ09ERSghcmVzdWx0LAo+IC0JCQkJCSJGYWlsZWQgdG8gcG9wdWxh dGUgU0NMSyBkdXJpbmcgXAo+IC0JCQkJCVBvcHVsYXRlTmV3RFBNQ2xvY2tzU3RhdGVzIEZ1bmN0 aW9uISIsCj4gKwkJCQkJIkZhaWxlZCB0byBwb3B1bGF0ZSBTQ0xLIGR1cmluZyBQb3B1bGF0ZU5l d0RQTUNsb2Nrc1N0YXRlcyBGdW5jdGlvbiEiLAo+ICAJCQkJCXJldHVybiByZXN1bHQpOwo+ICAJ CX0KPiAgCj4gQEAgLTM0MjUsOCArMzQxOSw3IEBAIHN0YXRpYyBpbnQgdmVnYTEwX3BvcHVsYXRl X2FuZF91cGxvYWRfc2Nsa19tY2xrX2RwbV9sZXZlbHMoCj4gIAkJCQkJRFBNVEFCTEVfT0RfVVBE QVRFX01DTEspKXsKPiAgCQkJcmVzdWx0ID0gdmVnYTEwX3BvcHVsYXRlX2FsbF9tZW1vcnlfbGV2 ZWxzKGh3bWdyKTsKPiAgCQkJUFBfQVNTRVJUX1dJVEhfQ09ERSghcmVzdWx0LAo+IC0JCQkJCSJG YWlsZWQgdG8gcG9wdWxhdGUgTUNMSyBkdXJpbmcgXAo+IC0JCQkJCVBvcHVsYXRlTmV3RFBNQ2xv Y2tzU3RhdGVzIEZ1bmN0aW9uISIsCj4gKwkJCQkJIkZhaWxlZCB0byBwb3B1bGF0ZSBNQ0xLIGR1 cmluZyBQb3B1bGF0ZU5ld0RQTUNsb2Nrc1N0YXRlcyBGdW5jdGlvbiEiLAo+ICAJCQkJCXJldHVy biByZXN1bHQpOwo+ICAJCX0KPiAgCX0gZWxzZSB7Cj4gQEAgLTM1NDMsOCArMzUzNiw3IEBAIHN0 YXRpYyBpbnQgdmVnYTEwX3BvcHVsYXRlX2FuZF91cGxvYWRfc2Nsa19tY2xrX2RwbV9sZXZlbHMo Cj4gIAkJCWRhdGEtPmFwcGx5X29wdGltaXplZF9zZXR0aW5ncykgewo+ICAJCQlyZXN1bHQgPSB2 ZWdhMTBfcG9wdWxhdGVfYWxsX2dyYXBoaWNfbGV2ZWxzKGh3bWdyKTsKPiAgCQkJUFBfQVNTRVJU X1dJVEhfQ09ERSghcmVzdWx0LAo+IC0JCQkJCSJGYWlsZWQgdG8gcG9wdWxhdGUgU0NMSyBkdXJp bmcgXAo+IC0JCQkJCVBvcHVsYXRlTmV3RFBNQ2xvY2tzU3RhdGVzIEZ1bmN0aW9uISIsCj4gKwkJ CQkJIkZhaWxlZCB0byBwb3B1bGF0ZSBTQ0xLIGR1cmluZyBQb3B1bGF0ZU5ld0RQTUNsb2Nrc1N0 YXRlcyBGdW5jdGlvbiEiLAo+ICAJCQkJCXJldHVybiByZXN1bHQpOwo+ICAJCX0KPiAgCj4gQEAg LTM1NTIsOCArMzU0NCw3IEBAIHN0YXRpYyBpbnQgdmVnYTEwX3BvcHVsYXRlX2FuZF91cGxvYWRf c2Nsa19tY2xrX2RwbV9sZXZlbHMoCj4gIAkJCQkoRFBNVEFCTEVfT0RfVVBEQVRFX01DTEsgKyBE UE1UQUJMRV9VUERBVEVfTUNMSykpIHsKPiAgCQkJcmVzdWx0ID0gdmVnYTEwX3BvcHVsYXRlX2Fs bF9tZW1vcnlfbGV2ZWxzKGh3bWdyKTsKPiAgCQkJUFBfQVNTRVJUX1dJVEhfQ09ERSghcmVzdWx0 LAo+IC0JCQkJCSJGYWlsZWQgdG8gcG9wdWxhdGUgTUNMSyBkdXJpbmcgXAo+IC0JCQkJCVBvcHVs YXRlTmV3RFBNQ2xvY2tzU3RhdGVzIEZ1bmN0aW9uISIsCj4gKwkJCQkJIkZhaWxlZCB0byBwb3B1 bGF0ZSBNQ0xLIGR1cmluZyBQb3B1bGF0ZU5ld0RQTUNsb2Nrc1N0YXRlcyBGdW5jdGlvbiEiLAo+ ICAJCQkJCXJldHVybiByZXN1bHQpOwo+ICAJCX0KPiAgCX0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL2NpX3NtdW1nci5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL2NpX3NtdW1nci5jCj4gaW5kZXggNGQ2NzJjZDE1Nzg1 Li5lZDRiMzdlNTY2YTMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBs YXkvc211bWdyL2NpX3NtdW1nci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBs YXkvc211bWdyL2NpX3NtdW1nci5jCj4gQEAgLTE3MzIsOCArMTczMiw3IEBAIHN0YXRpYyBpbnQg Y2lfcG9wdWxhdGVfc21jX2Jvb3RfbGV2ZWwoc3RydWN0IHBwX2h3bWdyICpod21nciwKPiAgCj4g IAlpZiAoMCAhPSByZXN1bHQpIHsKPiAgCQlzbXVfZGF0YS0+c21jX3N0YXRlX3RhYmxlLkdyYXBo aWNzQm9vdExldmVsID0gMDsKPiAtCQlwcl9lcnIoIlZCSU9TIGRpZCBub3QgZmluZCBib290IGVu Z2luZSBjbG9jayB2YWx1ZSBcCj4gLQkJCWluIGRlcGVuZGVuY3kgdGFibGUuIFVzaW5nIEdyYXBo aWNzIERQTSBsZXZlbCAwISIpOwo+ICsJCXByX2VycigiVkJJT1MgZGlkIG5vdCBmaW5kIGJvb3Qg ZW5naW5lIGNsb2NrIHZhbHVlIGluIGRlcGVuZGVuY3kgdGFibGUuIFVzaW5nIEdyYXBoaWNzIERQ TSBsZXZlbCAwIVxuIik7Cj4gIAkJcmVzdWx0ID0gMDsKPiAgCX0KPiAgCj4gQEAgLTE3NDMsOCAr MTc0Miw3IEBAIHN0YXRpYyBpbnQgY2lfcG9wdWxhdGVfc21jX2Jvb3RfbGV2ZWwoc3RydWN0IHBw X2h3bWdyICpod21nciwKPiAgCj4gIAlpZiAoMCAhPSByZXN1bHQpIHsKPiAgCQlzbXVfZGF0YS0+ c21jX3N0YXRlX3RhYmxlLk1lbW9yeUJvb3RMZXZlbCA9IDA7Cj4gLQkJcHJfZXJyKCJWQklPUyBk aWQgbm90IGZpbmQgYm9vdCBlbmdpbmUgY2xvY2sgdmFsdWUgXAo+IC0JCQlpbiBkZXBlbmRlbmN5 IHRhYmxlLiBVc2luZyBNZW1vcnkgRFBNIGxldmVsIDAhIik7Cj4gKwkJcHJfZXJyKCJWQklPUyBk aWQgbm90IGZpbmQgYm9vdCBlbmdpbmUgY2xvY2sgdmFsdWUgaW4gZGVwZW5kZW5jeSB0YWJsZS4g VXNpbmcgTWVtb3J5IERQTSBsZXZlbCAwIVxuIik7Cj4gIAkJcmVzdWx0ID0gMDsKPiAgCX0KPiAg Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci9pY2Vs YW5kX3NtdW1nci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL2ljZWxh bmRfc211bWdyLmMKPiBpbmRleCAzNDEyODgyMmI4ZmIuLjJmZjY4MmQ0NGU4YyAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvaWNlbGFuZF9zbXVtZ3Iu Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci9pY2VsYW5kX3Nt dW1nci5jCj4gQEAgLTkxMSw4ICs5MTEsNyBAQCBzdGF0aWMgaW50IGljZWxhbmRfcG9wdWxhdGVf c2luZ2xlX2dyYXBoaWNfbGV2ZWwoc3RydWN0IHBwX2h3bWdyICpod21nciwKPiAgCQlod21nci0+ ZHluX3N0YXRlLnZkZGNfZGVwZW5kZW5jeV9vbl9zY2xrLCBlbmdpbmVfY2xvY2ssCj4gIAkJJmdy YXBoaWNfbGV2ZWwtPk1pblZkZGMpOwo+ICAJUFBfQVNTRVJUX1dJVEhfQ09ERSgoMCA9PSByZXN1 bHQpLAo+IC0JCSJjYW4gbm90IGZpbmQgVkREQyB2b2x0YWdlIHZhbHVlIGZvciBWRERDCVwKPiAt CQllbmdpbmUgY2xvY2sgZGVwZW5kZW5jeSB0YWJsZSIsIHJldHVybiByZXN1bHQpOwo+ICsJCSJj YW4gbm90IGZpbmQgVkREQyB2b2x0YWdlIHZhbHVlIGZvciBWRERDIGVuZ2luZSBjbG9jayBkZXBl bmRlbmN5IHRhYmxlIiwgcmV0dXJuIHJlc3VsdCk7Cj4gIAo+ICAJLyogU0NMSyBmcmVxdWVuY3kg aW4gdW5pdHMgb2YgMTBLSHoqLwo+ICAJZ3JhcGhpY19sZXZlbC0+U2Nsa0ZyZXF1ZW5jeSA9IGVu Z2luZV9jbG9jazsKPiBAQCAtMTY3OCw4ICsxNjc3LDcgQEAgc3RhdGljIGludCBpY2VsYW5kX3Bv cHVsYXRlX3NtY19ib290X2xldmVsKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsCj4gIAo+ICAJaWYg KDAgIT0gcmVzdWx0KSB7Cj4gIAkJc211X2RhdGEtPnNtY19zdGF0ZV90YWJsZS5HcmFwaGljc0Jv b3RMZXZlbCA9IDA7Cj4gLQkJcHJfZXJyKCJWQklPUyBkaWQgbm90IGZpbmQgYm9vdCBlbmdpbmUg Y2xvY2sgdmFsdWUgXAo+IC0JCQlpbiBkZXBlbmRlbmN5IHRhYmxlLiBVc2luZyBHcmFwaGljcyBE UE0gbGV2ZWwgMCEiKTsKPiArCQlwcl9lcnIoIlZCSU9TIGRpZCBub3QgZmluZCBib290IGVuZ2lu ZSBjbG9jayB2YWx1ZSBpbiBkZXBlbmRlbmN5IHRhYmxlLiBVc2luZyBHcmFwaGljcyBEUE0gbGV2 ZWwgMCFcbiIpOwo+ICAJCXJlc3VsdCA9IDA7Cj4gIAl9Cj4gIAo+IEBAIC0xNjg5LDggKzE2ODcs NyBAQCBzdGF0aWMgaW50IGljZWxhbmRfcG9wdWxhdGVfc21jX2Jvb3RfbGV2ZWwoc3RydWN0IHBw X2h3bWdyICpod21nciwKPiAgCj4gIAlpZiAoMCAhPSByZXN1bHQpIHsKPiAgCQlzbXVfZGF0YS0+ c21jX3N0YXRlX3RhYmxlLk1lbW9yeUJvb3RMZXZlbCA9IDA7Cj4gLQkJcHJfZXJyKCJWQklPUyBk aWQgbm90IGZpbmQgYm9vdCBlbmdpbmUgY2xvY2sgdmFsdWUgXAo+IC0JCQlpbiBkZXBlbmRlbmN5 IHRhYmxlLiBVc2luZyBNZW1vcnkgRFBNIGxldmVsIDAhIik7Cj4gKwkJcHJfZXJyKCJWQklPUyBk aWQgbm90IGZpbmQgYm9vdCBlbmdpbmUgY2xvY2sgdmFsdWUgaW4gZGVwZW5kZW5jeSB0YWJsZS4g VXNpbmcgTWVtb3J5IERQTSBsZXZlbCAwIVxuIik7Cj4gIAkJcmVzdWx0ID0gMDsKPiAgCX0KPiAg Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci92ZWdh MTBfc211bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvdmVnYTEw X3NtdW1nci5jCj4gaW5kZXggMmY5NzlmYjg2ODI0Li5mNmYzOWQwMWQyMjcgMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL3ZlZ2ExMF9zbXVtZ3IuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci92ZWdhMTBfc211bWdy LmMKPiBAQCAtMzgxLDEwICszODEsOCBAQCBzdGF0aWMgaW50IHZlZ2ExMF92ZXJpZnlfc21jX2lu dGVyZmFjZShzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKQo+ICAJCShyZXZfaWQgPT0gMHhjMSkgfHwK PiAgCQkocmV2X2lkID09IDB4YzMpKSkpIHsKPiAgCQlpZiAoc21jX2RyaXZlcl9pZl92ZXJzaW9u ICE9IFNNVTlfRFJJVkVSX0lGX1ZFUlNJT04pIHsKPiAtCQkJcHJfZXJyKCJZb3VyIGZpcm13YXJl KDB4JXgpIGRvZXNuJ3QgbWF0Y2ggXAo+IC0JCQkJU01VOV9EUklWRVJfSUZfVkVSU0lPTigweCV4 KS4gXAo+IC0JCQkJUGxlYXNlIHVwZGF0ZSB5b3VyIGZpcm13YXJlIVxuIiwKPiAtCQkJCXNtY19k cml2ZXJfaWZfdmVyc2lvbiwgU01VOV9EUklWRVJfSUZfVkVSU0lPTik7Cj4gKwkJCXByX2Vycigi WW91ciBmaXJtd2FyZSgweCV4KSBkb2Vzbid0IG1hdGNoIFNNVTlfRFJJVkVSX0lGX1ZFUlNJT04o MHgleCkuIFBsZWFzZSB1cGRhdGUgeW91ciBmaXJtd2FyZSFcbiIsCj4gKwkJCSAgICAgICBzbWNf ZHJpdmVyX2lmX3ZlcnNpb24sIFNNVTlfRFJJVkVSX0lGX1ZFUlNJT04pOwo+ICAJCQlyZXR1cm4g LUVJTlZBTDsKPiAgCQl9Cj4gIAl9Cj4gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v YW1kLWdmeAo=