Commit ac1bdbf2 authored by Thierry Reding's avatar Thierry Reding
Browse files

gpu: host1x: Add Tegra194 support 



The host1x hardware found on Tegra194 is mostly backwards compatible
with the version found on Tegra186, with the notable exceptions of the
increased number of syncpoints and mlocks. In addition, some rarely
used features such as syncpoint wait bases were dropped and some
registers had to move around to accomodate the increased number of
syncpoints.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent b91bf997

drivers/gpu/host1x/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ host1x-y = \ 
	hw/host1x02.o \

	hw/host1x04.o \

	hw/host1x05.o \

	hw/host1x06.o

	hw/host1x06.o \

	hw/host1x07.o



obj-$(CONFIG_TEGRA_HOST1X) += host1x.o

drivers/gpu/host1x/dev.c

+13 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "hw/host1x04.h"

#include "hw/host1x05.h"

#include "hw/host1x06.h"

#include "hw/host1x07.h"



void host1x_hypervisor_writel(struct host1x *host1x, u32 v, u32 r)

{
@@ -130,7 +131,19 @@ static const struct host1x_info host1x06_info = { 
	.has_hypervisor = true,

};



static const struct host1x_info host1x07_info = {

	.nb_channels = 63,

	.nb_pts = 704,

	.nb_mlocks = 32,

	.nb_bases = 0,

	.init = host1x07_init,

	.sync_offset = 0x0,

	.dma_mask = DMA_BIT_MASK(40),

	.has_hypervisor = true,

};



static const struct of_device_id host1x_of_match[] = {

	{ .compatible = "nvidia,tegra194-host1x", .data = &host1x07_info, },

	{ .compatible = "nvidia,tegra186-host1x", .data = &host1x06_info, },

	{ .compatible = "nvidia,tegra210-host1x", .data = &host1x05_info, },

	{ .compatible = "nvidia,tegra124-host1x", .data = &host1x04_info, },

drivers/gpu/host1x/hw/debug_hw_1x06.c

+6 −1
Original line number Diff line number Diff line
@@ -62,9 +62,12 @@ static void host1x_debug_show_channel_fifo(struct host1x *host, 
					   struct host1x_channel *ch,

					   struct output *o)

{

	u32 val, rd_ptr, wr_ptr, start, end;

#if HOST1X_HW <= 6

	u32 rd_ptr, wr_ptr, start, end;

	u32 payload = INVALID_PAYLOAD;

	unsigned int data_count = 0;

#endif

	u32 val;



	host1x_debug_output(o, "%u: fifo:\n", ch->id);
@@ -78,6 +81,7 @@ static void host1x_debug_show_channel_fifo(struct host1x *host, 
	val = host1x_ch_readl(ch, HOST1X_CHANNEL_CMDFIFO_RDATA);

	host1x_debug_output(o, "CMDFIFO_RDATA %08x\n", val);



#if HOST1X_HW <= 6

	/* Peek pointer values are invalid during SLCG, so disable it */

	host1x_hypervisor_writel(host, 0x1, HOST1X_HV_ICG_EN_OVERRIDE);
@@ -127,6 +131,7 @@ static void host1x_debug_show_channel_fifo(struct host1x *host, 


	host1x_hypervisor_writel(host, 0x0, HOST1X_HV_CMDFIFO_PEEK_CTRL);

	host1x_hypervisor_writel(host, 0x0, HOST1X_HV_ICG_EN_OVERRIDE);

#endif

}



static void host1x_debug_show_mlocks(struct host1x *host, struct output *o)

drivers/gpu/host1x/hw/host1x07.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Host1x init for Tegra194 SoCs

 *

 * Copyright (c) 2018 NVIDIA Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



/* include hw specification */

#include "host1x07.h"

#include "host1x07_hardware.h"



/* include code */

#define HOST1X_HW 7



#include "cdma_hw.c"

#include "channel_hw.c"

#include "debug_hw.c"

#include "intr_hw.c"

#include "syncpt_hw.c"



#include "../dev.h"



int host1x07_init(struct host1x *host)

{

	host->channel_op = &host1x_channel_ops;

	host->cdma_op = &host1x_cdma_ops;

	host->cdma_pb_op = &host1x_pushbuffer_ops;

	host->syncpt_op = &host1x_syncpt_ops;

	host->intr_op = &host1x_intr_ops;

	host->debug_op = &host1x_debug_ops;



	return 0;

}

drivers/gpu/host1x/hw/host1x07.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Host1x init for Tegra194 SoCs

 *

 * Copyright (c) 2018 NVIDIA Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef HOST1X_HOST1X07_H

#define HOST1X_HOST1X07_H



struct host1x;



int host1x07_init(struct host1x *host);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE