drm/nouveau/secboot: remove (9d350c5e) · Commits · 戴 / test

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ enum nvkm_devidx {
		NVKM_SUBDEV_THERM,
		NVKM_SUBDEV_CLK,
		NVKM_SUBDEV_GSP,
		NVKM_SUBDEV_SECBOOT,

		NVKM_ENGINE_BSP,

		@@ -151,7 +150,6 @@ struct nvkm_device {
		struct nvkm_subdev *mxm;
		struct nvkm_pci *pci;
		struct nvkm_pmu *pmu;
		struct nvkm_secboot *secboot;
		struct nvkm_therm *therm;
		struct nvkm_timer *timer;
		struct nvkm_top *top;
		@@ -225,7 +223,6 @@ struct nvkm_device_chip {
		int (mxm )(struct nvkm_device , int idx, struct nvkm_subdev **);
		int (pci )(struct nvkm_device , int idx, struct nvkm_pci **);
		int (pmu )(struct nvkm_device , int idx, struct nvkm_pmu **);
		int (secboot )(struct nvkm_device , int idx, struct nvkm_secboot **);
		int (therm )(struct nvkm_device , int idx, struct nvkm_therm **);
		int (timer )(struct nvkm_device , int idx, struct nvkm_timer **);
		int (top )(struct nvkm_device , int idx, struct nvkm_top **);

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
		* DEALINGS IN THE SOFTWARE.
		*/

		#ifndef __NVKM_CORE_MSGQUEUE_H
		#define __NVKM_CORE_MSGQUEUE_H

		/* Hopefully we will never have firmware arguments larger than that... */
		#define NVKM_MSGQUEUE_CMDLINE_SIZE 0x100
		#endif

+0 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ nvkm_subdev_name[NVKM_SUBDEV_NR] = {
		[NVKM_SUBDEV_MXM ] = "mxm",
		[NVKM_SUBDEV_PCI ] = "pci",
		[NVKM_SUBDEV_PMU ] = "pmu",
		[NVKM_SUBDEV_SECBOOT ] = "secboot",
		[NVKM_SUBDEV_THERM ] = "therm",
		[NVKM_SUBDEV_TIMER ] = "tmr",
		[NVKM_SUBDEV_TOP ] = "top",

+0 −2

Original line number	Diff line number	Diff line
		@@ -2691,7 +2691,6 @@ nvkm_device_subdev(struct nvkm_device *device, int index)
		_(MXM , device->mxm , device->mxm);
		_(PCI , device->pci , &device->pci->subdev);
		_(PMU , device->pmu , &device->pmu->subdev);
		_(SECBOOT , device->secboot , &device->secboot->subdev);
		_(THERM , device->therm , &device->therm->subdev);
		_(TIMER , device->timer , &device->timer->subdev);
		_(TOP , device->top , &device->top->subdev);
		@@ -3198,7 +3197,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
		_(NVKM_SUBDEV_MXM , mxm);
		_(NVKM_SUBDEV_PCI , pci);
		_(NVKM_SUBDEV_PMU , pmu);
		_(NVKM_SUBDEV_SECBOOT , secboot);
		_(NVKM_SUBDEV_THERM , therm);
		_(NVKM_SUBDEV_TIMER , timer);
		_(NVKM_SUBDEV_TOP , top);

+0 −1