drm/nv84: move PCRYPT ISR out of nouveau_irq.c (d7facf9d) · Commits · 戴 / test

drivers/gpu/drm/nouveau/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		ccflags-y := -Iinclude/drm
		nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
		nouveau_object.o nouveau_irq.o nouveau_notifier.o \
		nouveau_sgdma.o nouveau_dma.o \
		nouveau_sgdma.o nouveau_dma.o nouveau_util.o \
		nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
		nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
		nouveau_display.o nouveau_connector.o nouveau_fbcon.o \

+1 −24

Original line number	Diff line number	Diff line
		@@ -36,19 +36,12 @@
		#include "nouveau_drv.h"
		#include "nouveau_reg.h"
		#include "nouveau_ramht.h"
		#include <linux/ratelimit.h>
		#include "nouveau_util.h"

		/* needed for hotplug irq */
		#include "nouveau_connector.h"
		#include "nv50_display.h"

		static DEFINE_RATELIMIT_STATE(nouveau_ratelimit_state, 3 * HZ, 20);

		static int nouveau_ratelimit(void)
		{
		return __ratelimit(&nouveau_ratelimit_state);
		}

		void
		nouveau_irq_preinstall(struct drm_device *dev)
		{
		@@ -1240,22 +1233,6 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
		status &= ~NV_PMC_INTR_0_PGRAPH_PENDING;
		}

		if (status & 0x00004000) {
		u32 stat = nv_rd32(dev, 0x102130);
		u32 mthd = nv_rd32(dev, 0x102190);
		u32 data = nv_rd32(dev, 0x102194);
		u32 inst = nv_rd32(dev, 0x102188) & 0x7fffffff;

		NV_INFO(dev, "PCRYPT_INTR: 0x%08x 0x%08x 0x%08x 0x%08x\n",
		stat, mthd, data, inst);
		nv_wr32(dev, 0x102130, stat);
		nv_wr32(dev, 0x10200c, 0x10);

		nv50_fb_vm_trap(dev, nouveau_ratelimit(), "PCRYPT");
		status &= ~0x00004000;

		}

		if (status & NV_PMC_INTR_0_CRTCn_PENDING) {
		nouveau_crtc_irq_handler(dev, (status>>24)&3);
		status &= ~NV_PMC_INTR_0_CRTCn_PENDING;

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 Nouveau Project
		*
		* 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 (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.
		*
		*/

		#include <linux/ratelimit.h>

		static DEFINE_RATELIMIT_STATE(nouveau_ratelimit_state, 3 * HZ, 20);

		int
		nouveau_ratelimit(void)
		{
		return __ratelimit(&nouveau_ratelimit_state);
		}

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 Nouveau Project
		*
		* 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 (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.
		*
		*/

		#ifndef __NOUVEAU_UTIL_H__
		#define __NOUVEAU_UTIL_H__

		int nouveau_ratelimit(void);

		#endif

+27 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,9 @@

		#include "drmP.h"
		#include "nouveau_drv.h"
		#include "nouveau_util.h"

		static void nv84_crypt_isr(struct drm_device *);

		int
		nv84_crypt_create_context(struct nouveau_channel *chan)
		@@ -97,8 +100,11 @@ nv84_crypt_init(struct drm_device *dev)

		nv_mask(dev, 0x000200, 0x00004000, 0x00000000);
		nv_mask(dev, 0x000200, 0x00004000, 0x00004000);

		nouveau_irq_register(dev, 14, nv84_crypt_isr);
		nv_wr32(dev, 0x102130, 0xffffffff);
		nv_wr32(dev, 0x102140, 0xffffffbf);

		nv_wr32(dev, 0x10200c, 0x00000010);
		return 0;
		}
		@@ -107,4 +113,25 @@ void
		nv84_crypt_fini(struct drm_device *dev)
		{
		nv_wr32(dev, 0x102140, 0x00000000);
		nouveau_irq_unregister(dev, 14);
		}

		static void
		nv84_crypt_isr(struct drm_device *dev)
		{
		u32 stat = nv_rd32(dev, 0x102130);
		u32 mthd = nv_rd32(dev, 0x102190);
		u32 data = nv_rd32(dev, 0x102194);
		u32 inst = nv_rd32(dev, 0x102188) & 0x7fffffff;
		int show = nouveau_ratelimit();

		if (show) {
		NV_INFO(dev, "PCRYPT_INTR: 0x%08x 0x%08x 0x%08x 0x%08x\n",
		stat, mthd, data, inst);
		}

		nv_wr32(dev, 0x102130, stat);
		nv_wr32(dev, 0x10200c, 0x10);

		nv50_fb_vm_trap(dev, show, "PCRYPT");
		}