Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca6444f3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next 



So what we have for this cycle is a bit of spring cleaning with removal
of unused register logging code and getting rid of the license text in
favor of SPDX, a few smaller MMU handling improvements and a timeout
calculation change, fixing premature fence wait timeouts after 50 days
of uptime.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1526652437.28565.2.camel@pengutronix.de
parents 1dd6eb88 f6ffbd4f

drivers/gpu/drm/etnaviv/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -22,11 +22,3 @@ config DRM_ETNAVIV_THERMAL 
	help

	  Compile in support for thermal throttling.

	  Say Y unless you want to risk burning your SoC.
 


config DRM_ETNAVIV_REGISTER_LOGGING

	bool "enable ETNAVIV register logging"

	depends on DRM_ETNAVIV

	help

	  Compile in support for logging register reads/writes in a format

	  that can be parsed by envytools demsm tool.  If enabled, register

	  logging can be switched on via etnaviv.reglog=y module param.

drivers/gpu/drm/etnaviv/etnaviv_buffer.c

+2 −14
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2014 Etnaviv Project

 * Author: Christian Gmeiner <christian.gmeiner@gmail.com>

 *

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

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that 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/>.

 * Copyright (C) 2014-2018 Etnaviv Project

 */



#include "etnaviv_cmdbuf.h"

drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c

+2 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2015 Etnaviv Project

 *

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

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that 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/>.

 * Copyright (C) 2015-2018 Etnaviv Project

 */



#include <linux/kernel.h>

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c

+2 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2017 Etnaviv Project

 *

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

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that 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/>.

 * Copyright (C) 2017-2018 Etnaviv Project

 */



#include <drm/drm_mm.h>

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h

+1 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2017 Etnaviv Project

 *

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

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that 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 __ETNAVIV_CMDBUF_H__