From patchwork Fri Nov 23 12:31:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1002282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pXQ8KD8R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 431bK95YNLz9s7T for ; Fri, 23 Nov 2018 23:31:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504289AbeKWXPm (ORCPT ); Fri, 23 Nov 2018 18:15:42 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:43289 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504288AbeKWXPm (ORCPT ); Fri, 23 Nov 2018 18:15:42 -0500 Received: by mail-ed1-f67.google.com with SMTP id f4so10106688edq.10 for ; Fri, 23 Nov 2018 04:31:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7avETwcIShysXsaz4IMrzV8qVf8/fRSc4Dwo1qE9aNs=; b=pXQ8KD8Rrxf++S39bEouyjmCmWoDiVvsmoQSZRUjsdeEghv80GZ8V/EPXTS+xgxaoW 9V3fVvIx6E0xaiyv0F9lW3F8Ue8ZnKu0NWNU+IMK1l+yxp1Jdl6oJqG26kAe5hQNXyiu a2ZzFpeD4nmzn2njQThx+kXHfYYL8GXEq2x6917bpvjH+RHCNJFTL9fFnpQmpCzKGmqn 6J2Fu8nNJzTOJUoD0t43Iq3pHa8R6RVppt9eSee2jkXkSlYmUNeonLHKj+W94ix5hI/6 QtkMyfoOSbuNl8z3eb3nh8UKtfNERAXwfF2IHhsmEB7OcgSR1dgU8Vtign74IR7u8eQl 7dBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7avETwcIShysXsaz4IMrzV8qVf8/fRSc4Dwo1qE9aNs=; b=jJjGe0hwaxtobJ15CNcDvObG6CeOHMqcuMb/bjz2RBArZrOg78fsua6TA04XmUgDZL +nuWuudOUyk50omXaEIqz2dF2WfWE0Y4WuhGzA/EJ9H3BkDsje5sgzwZ55UAtW1nWh5R iqjKhroXuXEf0BI/w9Nj8eaXivvNbTNPVBug4ujevpNuQoENMXHDCLjHU3dEL6Lb6JLO AuKsGnVREdb27sKfZTiGdDGkEH+AYtkIJkGo3MCKKkqIn04PxmEolGxHuyqemmBcptIa qouZ/SMiMEha52XPU3rugNullINuhhQPC6UzfnEgc4sec3tlZNsYc1hof3FdQOQRqcFE p2aA== X-Gm-Message-State: AGRZ1gJgeuA2aHoeCMn+43uCq/MzamjnOy567ryBMb3RavVyAGu/Ygtw W/1R0K2/EHIQglvlWdyaoaE= X-Google-Smtp-Source: AJdET5fciCwB2xlAT3OE3Lc59DFeWbp69CCcsRYiFGDTE4a1B7HsCzkfO28XWT6mqbPKlHC65VB6Jw== X-Received: by 2002:a17:906:195b:: with SMTP id b27-v6mr11459283eje.220.1542976299636; Fri, 23 Nov 2018 04:31:39 -0800 (PST) Received: from localhost (pD9E51040.dip0.t-ipconnect.de. [217.229.16.64]) by smtp.gmail.com with ESMTPSA id q4sm11237101eda.50.2018.11.23.04.31.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Nov 2018 04:31:39 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: Jon Hunter , Mikko Perttunen , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH 1/7] gpu: host1x: Resize channel register region on Tegra186 and later Date: Fri, 23 Nov 2018 13:31:32 +0100 Message-Id: <20181123123138.20739-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding The register region allocated per channel was decreased from 16384 bytes to 256 bytes on Tegra186 and later. Resize the region to make sure every channel (instead of only the first) is properly programmed. Suggested-by: Mikko Perttunen Signed-off-by: Thierry Reding Reviewed-by: Mikko Perttunen --- drivers/gpu/host1x/hw/channel_hw.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index d188f9068b91..95ea81172a83 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c @@ -26,7 +26,6 @@ #include "../intr.h" #include "../job.h" -#define HOST1X_CHANNEL_SIZE 16384 #define TRACE_MAX_LENGTH 128U static void trace_write_gather(struct host1x_cdma *cdma, struct host1x_bo *bo, @@ -203,7 +202,11 @@ static void enable_gather_filter(struct host1x *host, static int host1x_channel_init(struct host1x_channel *ch, struct host1x *dev, unsigned int index) { - ch->regs = dev->regs + index * HOST1X_CHANNEL_SIZE; +#if HOST1X_HW < 6 + ch->regs = dev->regs + index * 0x4000; +#else + ch->regs = dev->regs + index * 0x100; +#endif enable_gather_filter(dev, ch); return 0; }