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: 698019 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCEC8EB64DD for ; Fri, 30 Jun 2023 23:13:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229762AbjF3XNA (ORCPT ); Fri, 30 Jun 2023 19:13:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229575AbjF3XM7 (ORCPT ); Fri, 30 Jun 2023 19:12:59 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E17013ABC for ; Fri, 30 Jun 2023 16:12:55 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4fb960b7c9dso3941760e87.0 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=BBYjP5A5EHr86taN5o4rRzOZCCgxK2zjtsSPgHXyJcRm7bwGPmt1g6WimZUxHn205a nkbU4sQxbB34thzysm2bAD56tUyI1b58JhR7R676FtmRnGZSvHvjTvVIPrWfOrMBj3eL EUOD3J1njxaTEiNJB21EVyiktMYoTmcyvhVqpoq4o7ng6pBFlmZnt9LiZVLaVG2h8Dap 4DvkBoXvXkVmlQmlg80up3Ib9/Il1N7qBKekl7cmfF/MsSz1sRSwGu6k0Q1C62if7NcX zUvQkHtAC0O2bHcTwzdl0zlqmXpmVCg8Higa6rXrC4ieLraM/vsc8ZgW7ICWZRRjRNoA S32Q== X-Gm-Message-State: ABy/qLbnDJyaHNxw2L64qFmHAs3C8Jy5xyPlRfiBkanFYJcvs6ljMMVU jo7ed1497Gx5JFSvBu1ClZIGhUPgqS6sqkgcvKii2Q== X-Google-Smtp-Source: APBJJlGOQPbPsy71Zzasb4tSYlvGnNC3rxke+QcuIHviwP4fP+a6VaJuxJz+B/ssCIrt7lEFXNhmzw== 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= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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",