From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4DDDEC38145 for ; Sat, 3 Sep 2022 06:11:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A4F810E987; Sat, 3 Sep 2022 06:10:46 +0000 (UTC) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA00710E77B for ; Sat, 3 Sep 2022 06:07:01 +0000 (UTC) Received: by mail-pj1-x1032.google.com with SMTP id l5so3809697pjy.5 for ; Fri, 02 Sep 2022 23:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=schmorgal.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Hqs+EOWSoVn8x/QAKmfg4Hu1Z05+52oHCjQloLi5jzQ=; b=Q3JZBdTwrV9sR7Edp6HSHF70gt77E2SNZYWVht+P2XUcr5IPt24yxv21sH5atPk/Zj YzZ2mHkn746G357ZxRFm42UBc3BLKMxQe9as0HTQy7jsSVsqW2dewmRUtJgCcqTd71lJ n9H1ADFCyxHMtYq7vcFWj4qHLN6XcO9rTB48o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Hqs+EOWSoVn8x/QAKmfg4Hu1Z05+52oHCjQloLi5jzQ=; b=nb2LCrjh8l7T6yZvSkw+FUeXRSarVMgYlBwW+YIKaZwNH28UNJGZKqT4rXEK2Wk/Yz AWEH0CvPqkxbQfDsFSQlTIB3AT6RqfkpjbmRbTKFpzR+Z9IE0/1E4+N4x/Dw6t2BrhA/ 2Hw2aA2opy3/2W/LRtcDralaAZdgiAo+OybKIqbQKzlOjq0bVnDlsi1k/vVHaNY5RLIt 3uc/C61xwWjouJkauFY6R/3gvYc/cKv4sYjlXKHT6aW8/8DxFmgkPvbeX7KPuQhNMzix KcofZpBpZMm8yVnE3XL6p1PxE+iOmP2+sLYnJUB8Hx61N+pPk3VzECpvbS400YfMGBAC oLRQ== X-Gm-Message-State: ACgBeo1nfSZUbQzqSeC5MHJiq8Vh95qa9UTdEX/uiqZm3Oovjg+XX4Nt gCLKNGT1V9iO7wyM6Ed78srjqw== X-Google-Smtp-Source: AA6agR6Rlahf8BH6dUKZjItBDrclPm4u0ueSF2l2JtZWYwLxbahSL+34Ja9X8R3Hecx5NAp6dhWeWQ== X-Received: by 2002:a17:902:aa01:b0:172:b0dc:ba40 with SMTP id be1-20020a170902aa0100b00172b0dcba40mr39250123plb.101.1662185221217; Fri, 02 Sep 2022 23:07:01 -0700 (PDT) Received: from localhost.localdomain ([50.45.132.243]) by smtp.gmail.com with ESMTPSA id v28-20020aa799dc000000b00537ab89c66csm3048793pfi.143.2022.09.02.23.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Sep 2022 23:07:00 -0700 (PDT) From: Doug Brown To: Lucas Stach , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter Subject: [PATCH 1/2] drm/etnaviv: add missing quirks for GC300 Date: Fri, 2 Sep 2022 23:05:57 -0700 Message-Id: <20220903060558.55167-2-doug@schmorgal.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220903060558.55167-1-doug@schmorgal.com> References: <20220903060558.55167-1-doug@schmorgal.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sat, 03 Sep 2022 06:10:40 +0000 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: Doug Brown , etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The GC300's features register doesn't specify that a 2D pipe is available, and like the GC600, its idle register reports zero bits where modules aren't present. Signed-off-by: Doug Brown --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 37018bc55810..f667e7906d1f 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -416,6 +416,12 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) if (gpu->identity.model == chipModel_GC700) gpu->identity.features &= ~chipFeatures_FAST_CLEAR; + /* These models/revisions don't have the 2D pipe bit */ + if ((gpu->identity.model == chipModel_GC500 && + gpu->identity.revision <= 2) || + gpu->identity.model == chipModel_GC300) + gpu->identity.features |= chipFeatures_PIPE_2D; + if ((gpu->identity.model == chipModel_GC500 && gpu->identity.revision < 2) || (gpu->identity.model == chipModel_GC300 && @@ -449,8 +455,9 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) gpu_read(gpu, VIVS_HI_CHIP_MINOR_FEATURE_5); } - /* GC600 idle register reports zero bits where modules aren't present */ - if (gpu->identity.model == chipModel_GC600) + /* GC600/300 idle register reports zero bits where modules aren't present */ + if (gpu->identity.model == chipModel_GC600 || + gpu->identity.model == chipModel_GC300) gpu->idle_mask = VIVS_HI_IDLE_STATE_TX | VIVS_HI_IDLE_STATE_RA | VIVS_HI_IDLE_STATE_SE | -- 2.25.1