From patchwork Fri Jun 30 23:12:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 114928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10726356vqr; Fri, 30 Jun 2023 16:42:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Fy3RxN2Yh3X4Jmg6ei7fDn08oYaGMV5Hlh55M4VGAXdq9H3SiUI8R0X52YaXoLjr2WGfQ X-Received: by 2002:a05:6808:2909:b0:39e:940c:2a58 with SMTP id ev9-20020a056808290900b0039e940c2a58mr4754829oib.5.1688168556589; Fri, 30 Jun 2023 16:42:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688168556; cv=none; d=google.com; s=arc-20160816; b=HmGbaGd9c21ZnfNQduyoMTf1QjUOK5juPXMqQFnQP7jzw4OGGMJOQ3tOCDKyJnL+w5 CXxUpRoP++WJPrlawbF77CbBzMhgUOiIPbBbIBoQRTnXYB+xYh/1baJ16J7Qn2uCIfsl QGulNwqlTDBIwTJ7CYS4ovwOZYvgJYQh2yJ1FwCglTGPUE9jvT+khE+qCD02nusUr5ds 6/PMWOg4kO+DMqPd395US7CTO1JR5D0dOiX3I+n8xjJNbRBMXDIkFglUbV3I/uxxvdjL 6bzYy65ROVC39tPZyIYvSnUO+2GcLmukrtKd77oSiLM9fVA4trC8Uj56Q/xgcGOz4SnF ZyLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=tk7tcTZ9mb+wfLY/iSHZQg5Fo49rxNkkvriMan5x4EY=; fh=XJvVe9bMsauSGHBATfca0FMZjAaPFc1XWz4sdRBffRs=; b=EIgiLfyigzoOVsnOWXVBAnwfklxLy8V2Ame+wxh1nLeZBJbe+kIQJGVBXIv8L0VnJo nfCO7E4n5tJr8DgAqnTvQ7oVQPKSxQtkLEiICqiDfZ4+6ZqtwdOicmWC5ogj+Y16mG7+ FVXxhtv6I3h+41WvrCrtOenlHWmZ9IsFmNOV0Np02yf7Xt18hEBknK6rXTlDt0+ipM2I ozf3Pfsve6y3yAl+nVZ35fgRzp0zHrlu298DwZhP5dZ7IHLFlVbFGq8J2OKxEncddQ9E yc9KZXypVOXkKseUaQ/eft6+exi16SLc+q9s9OTrUd0RpVsf8Tk/Csx9xsBd7xnfQJSj eYYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gJIYWpjQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cp22-20020a056a00349600b00643c4345942si12117431pfb.134.2023.06.30.16.42.21; Fri, 30 Jun 2023 16:42:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gJIYWpjQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229575AbjF3XNB (ORCPT + 99 others); Fri, 30 Jun 2023 19:13:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjF3XM6 (ORCPT ); Fri, 30 Jun 2023 19:12:58 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 875B13AB9 for ; Fri, 30 Jun 2023 16:12:55 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2b6c3921c8bso39688781fa.3 for ; Fri, 30 Jun 2023 16:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688166774; x=1690758774; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=tk7tcTZ9mb+wfLY/iSHZQg5Fo49rxNkkvriMan5x4EY=; b=gJIYWpjQGjk6Ok+6dezGhjo5v7Ut16pua5m5HKrlE85emWC48Xz4Ko3bbJKppUc/0C q0SYc3QyiIFBMtbdWVXeUZuMwbLeRnNo9iJh0UA7K3l3uQ3IYbjbAtAuHVeQVID/6vhJ Tptgk9JmVyYr/qTMBDWOoZtZ7MpSzG0lOgAC+MzvmOwBsc/LDA5zVw9K10peQnMg4WZo r3tv9j96jCjfEC4tabffa3HLXbc0+x/RYYkN4MAH5reRNu0O0RxSgHE/I3HrKwvYNI5/ kLzCCaRf9KERj6Hyn23l/5/8fdLmOrCzFOnhcAf4c/NneOasRvWQ3C9v6qSbz3hL6lRf wZPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688166774; x=1690758774; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tk7tcTZ9mb+wfLY/iSHZQg5Fo49rxNkkvriMan5x4EY=; b=DRXzREjeOVlMTQ+X/tQrjqE7yAbgCTwaO0txrITl17ZxAgn7WGLEFQad4yMTd+pq4L NAWsAkROsjkMe8tuVQ1oNSiNzwbJjs4/Xm7AP4L5prRosKIfrA0i8Q6/EPCKvYSQDdEf YAaZPHWXRt8gZ1yPjIK3x0DWgAlx8w1QApgJAKCGV6jWzjZb6FjfT3Rh7eBq3polHz2j 3Y/QY/7bSuTYyPXhDlRXszuvneNBjZAXx7DXlVBW9/XIqwWliQK/CJxSlJFKNzU25tgR 5BwbirWAHFsv9GnBhgabNJ/YhJTh+roIEW6+A8Ufd+NOnOZbDfFoQHYVCa+wJ8ILxU3r O+WA== X-Gm-Message-State: ABy/qLa7ppCQrkfmwn4qbHMzNytPEFatQ/91a1CC01EJVjR2q/+4AeHN uHVYxsNPMyyWdCdV6CwjI4YnCA== X-Received: by 2002:a19:655c:0:b0:4f8:770f:1b0b with SMTP id c28-20020a19655c000000b004f8770f1b0bmr2951107lfj.33.1688166773682; Fri, 30 Jun 2023 16:12:53 -0700 (PDT) Received: from [192.168.1.101] (abxi253.neoplus.adsl.tpnet.pl. [83.9.2.253]) by smtp.gmail.com with ESMTPSA id a6-20020a056512390600b004f1383d57ecsm3009499lfu.202.2023.06.30.16.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 16:12:53 -0700 (PDT) From: Konrad Dybcio Date: Sat, 01 Jul 2023 01:12:51 +0200 Subject: [PATCH v2] drm/msm/adreno: Assign revn to A635 MIME-Version: 1.0 Message-Id: <20230628-topic-a635-v2-1-5494c881b8be@linaro.org> X-B4-Tracking: v=1; b=H4sIAHJhn2QC/22Nyw6CMBBFf8XM2jFtkZcr/8OwaOsAk5CWTJFoC P9uZe3ynOTes0EiYUpwO20gtHLiGDKY8wn8aMNAyM/MYJQpVGUaXOLMHm1VlKhd4Y1vm/qqa8g DZxOhExv8mCfhNU1ZzkI9v4/Co8s8clqifI7gqn/27/eqUWOpyopU61XTu/vEwUq8RBmg2/f9C 1kqkqK6AAAA To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Stephen Boyd Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark , Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1688166772; l=1261; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=oIevmiIoqBZEtyln22cHTlwhLGk4BKvbTI7KGaU8Yyc=; b=cKjj71LJhyQygBD7KLDoI76DTuLJ/0I8sUl0gry+/5Ze1m61sRakaDfaNwGegIBghEYrcCsVa aBNNJ9GGLn2ByljvvUFj5h7/KEa0LoFvaQzZTPVTEWKSlBC5av9OqZD X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770173032506025554?= X-GMAIL-MSGID: =?utf-8?q?1770173032506025554?= Recently, a WARN_ON() was introduced to ensure that revn is filled before adreno_is_aXYZ is called. This however doesn't work very well when revn is 0 by design (such as for A635). Fill it in as a stopgap solution for -fixes. Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- Changes in v2: - add fixes - Link to v1: https://lore.kernel.org/r/20230628-topic-a635-v1-1-5056e09c08fb@linaro.org --- drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + 1 file changed, 1 insertion(+) --- base-commit: 5c875096d59010cee4e00da1f9c7bdb07a025dc2 change-id: 20230628-topic-a635-1b3c2c987417 Best regards, diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index cb94cfd137a8..8ea7eae9fc52 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -345,6 +345,7 @@ static const struct adreno_info gpulist[] = { .address_space_size = SZ_16G, }, { .rev = ADRENO_REV(6, 3, 5, ANY_ID), + .revn = 635, .fw = { [ADRENO_FW_SQE] = "a660_sqe.fw", [ADRENO_FW_GMU] = "a660_gmu.bin",