Merge tag 'amd-drm-next-5.9-2020-07-24' of git://people.freedesktop.org/~agd5f/linux into drm-next (92be4239) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -2036,3 +2036,20 @@ int amdgpu_atombios_init(struct amdgpu_device *adev)
		return 0;
		}

		int amdgpu_atombios_get_data_table(struct amdgpu_device *adev,
		uint32_t table,
		uint16_t *size,
		uint8_t *frev,
		uint8_t *crev,
		uint8_t **addr)
		{
		uint16_t data_start;

		if (!amdgpu_atom_parse_data_header(adev->mode_info.atom_context, table,
		size, frev, crev, &data_start))
		return -EINVAL;

		addr = (uint8_t )adev->mode_info.atom_context->bios + data_start;

		return 0;
		}

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,13 @@ int amdgpu_atombios_get_svi2_info(struct amdgpu_device *adev,
		u8 voltage_type,
		u8 svd_gpio_id, u8 svc_gpio_id);

		int amdgpu_atombios_get_data_table(struct amdgpu_device *adev,
		uint32_t table,
		uint16_t *size,
		uint8_t *frev,
		uint8_t *crev,
		uint8_t **addr);

		void amdgpu_atombios_fini(struct amdgpu_device *adev);
		int amdgpu_atombios_init(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c

+53 −0

Original line number	Diff line number	Diff line
		@@ -1073,6 +1073,57 @@ static ssize_t amdgpu_debugfs_gfxoff_write(struct file f, const char __user bu
		}


		/**
		* amdgpu_debugfs_regs_gfxoff_status - read gfxoff status
		*
		* @f: open file handle
		* @buf: User buffer to store read data in
		* @size: Number of bytes to read
		* @pos: Offset to seek to
		*/
		static ssize_t amdgpu_debugfs_gfxoff_read(struct file f, char __user buf,
		size_t size, loff_t *pos)
		{
		struct amdgpu_device *adev = file_inode(f)->i_private;
		ssize_t result = 0;
		int r;

		if (size & 0x3 \|\| *pos & 0x3)
		return -EINVAL;

		r = pm_runtime_get_sync(adev->ddev->dev);
		if (r < 0)
		return r;

		while (size) {
		uint32_t value;

		r = amdgpu_get_gfx_off_status(adev, &value);
		if (r) {
		pm_runtime_mark_last_busy(adev->ddev->dev);
		pm_runtime_put_autosuspend(adev->ddev->dev);
		return r;
		}

		r = put_user(value, (uint32_t *)buf);
		if (r) {
		pm_runtime_mark_last_busy(adev->ddev->dev);
		pm_runtime_put_autosuspend(adev->ddev->dev);
		return r;
		}

		result += 4;
		buf += 4;
		*pos += 4;
		size -= 4;
		}

		pm_runtime_mark_last_busy(adev->ddev->dev);
		pm_runtime_put_autosuspend(adev->ddev->dev);

		return result;
		}

		static const struct file_operations amdgpu_debugfs_regs_fops = {
		.owner = THIS_MODULE,
		.read = amdgpu_debugfs_regs_read,
		@@ -1123,7 +1174,9 @@ static const struct file_operations amdgpu_debugfs_gpr_fops = {

		static const struct file_operations amdgpu_debugfs_gfxoff_fops = {
		.owner = THIS_MODULE,
		.read = amdgpu_debugfs_gfxoff_read,
		.write = amdgpu_debugfs_gfxoff_write,
		.llseek = default_llseek
		};

		static const struct file_operations *debugfs_regs[] = {

drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -425,6 +425,7 @@ struct amdgpu_pm {
		u32 default_sclk;
		u32 default_mclk;
		struct amdgpu_i2c_chan *i2c_bus;
		bool bus_locked;
		/* internal thermal controller on rv6xx+ */
		enum amdgpu_int_thermal_type int_thermal_type;
		struct device *int_hwmon_dev;

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1186,6 +1186,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev)
		* unfortunately we can't detect certain
		* hypervisors so just do this all the time.
		*/
		if (!amdgpu_passthrough(adev))
		adev->mp1_state = PP_MP1_STATE_UNLOAD;
		amdgpu_device_ip_suspend(adev);
		adev->mp1_state = PP_MP1_STATE_NONE;

Admin message