drm/nouveau: restore debugfs/vbios.rom support (33b903e8) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/drm/nouveau/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -242,5 +242,6 @@ ifdef CONFIG_X86
		nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
		endif
		nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
		nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o

		obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o

drivers/gpu/drm/nouveau/nouveau_debugfs.c

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 Red Hat <bskeggs@redhat.com>
		*
		* 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 (including the
		* next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
		*
		*/

		/*
		* Authors:
		* Ben Skeggs <bskeggs@redhat.com>
		*/

		#include "nouveau_debugfs.h"
		#include "nouveau_drm.h"

		static int
		nouveau_debugfs_vbios_image(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node ) m->private;
		struct nouveau_drm *drm = nouveau_drm(node->minor->dev);
		int i;

		for (i = 0; i < drm->vbios.length; i++)
		seq_printf(m, "%c", drm->vbios.data[i]);
		return 0;
		}

		static struct drm_info_list nouveau_debugfs_list[] = {
		{ "vbios.rom", nouveau_debugfs_vbios_image, 0, NULL },
		};
		#define NOUVEAU_DEBUGFS_ENTRIES ARRAY_SIZE(nouveau_debugfs_list)

		int
		nouveau_debugfs_init(struct drm_minor *minor)
		{
		drm_debugfs_create_files(nouveau_debugfs_list, NOUVEAU_DEBUGFS_ENTRIES,
		minor->debugfs_root, minor);
		return 0;
		}

		void
		nouveau_debugfs_takedown(struct drm_minor *minor)
		{
		drm_debugfs_remove_files(nouveau_debugfs_list, NOUVEAU_DEBUGFS_ENTRIES,
		minor);
		}

drivers/gpu/drm/nouveau/nouveau_debugfs.h

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		#ifndef __NOUVEAU_DEBUGFS_H__
		#define __NOUVEAU_DEBUGFS_H__

		#include <drm/drmP.h>

		#if defined(CONFIG_DEBUG_FS)
		extern int nouveau_debugfs_init(struct drm_minor *);
		extern void nouveau_debugfs_takedown(struct drm_minor *);
		#else
		static inline int
		nouveau_debugfs_init(struct drm_minor *minor)
		{
		return 0;
		}

		static inline void nouveau_debugfs_takedown(struct drm_minor *minor)
		{
		}

		#endif

		#endif

drivers/gpu/drm/nouveau/nouveau_drm.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		#include "nouveau_abi16.h"
		#include "nouveau_fbcon.h"
		#include "nouveau_fence.h"
		#include "nouveau_debugfs.h"

		MODULE_PARM_DESC(config, "option string to pass to driver core");
		static char *nouveau_config;
		@@ -667,6 +668,11 @@ driver = {
		.postclose = nouveau_drm_postclose,
		.lastclose = nouveau_vga_lastclose,

		#if defined(CONFIG_DEBUG_FS)
		.debugfs_init = nouveau_debugfs_init,
		.debugfs_cleanup = nouveau_debugfs_takedown,
		#endif

		.irq_preinstall = nouveau_irq_preinstall,
		.irq_postinstall = nouveau_irq_postinstall,
		.irq_uninstall = nouveau_irq_uninstall,