Skip to content

L
linux
Commit 268d2837 authored by Dave Airlie's avatar Dave Airlie
Browse files
Options

Merge branch 'drm-nouveau-next' of... 

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

This is a major rework of the nouveau driver core, to reflect more closely
how the hw is used and to make it easier to implement newer features now
that the GPUs are more clearly understood than when nouveau started.

It also contains a few other bits:
thermal patches
nv41/44 pcie gart fixes
i2c unregistering fixes.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (191 commits)
  drm/nv98/crypt: fix fuc build with latest envyas
  drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
  drm/nv41/vm: fix and enable use of "real" pciegart
  drm/nv44/vm: fix and enable use of "real" pciegart
  drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
  drm/nouveau: store supported dma mask in vmmgr
  drm/nvc0/ibus: initial implementation of subdev
  drm/nouveau/therm: add support for fan-control modes
  drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
  drm/nouveau/therm: calculate the pwm divisor on nv50+
  drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
  drm/nouveau/therm: move thermal-related functions to the therm subdev
  drm/nouveau/bios: parse the pwm divisor from the perf table
  drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
  drm/nouveau/therm: rework thermal table parsing
  drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
  drm/nouveau: fix pm initialization order
  drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
  drm/nouveau: log channel debug/error messages from client object rather than drm client
  drm/nouveau: have drm debugging macros build on top of core macros
  ...

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_dp.c
parents df86b576 b9f10852
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 54227 additions and 31811 deletions
Documentation/vfio.txt
View file @ 268d2837
...@@ -133,7 +133,7 @@ character devices for this group: ...@@ -133,7 +133,7 @@ character devices for this group:
$ lspci -n -s 0000:06:0d.0 $ lspci -n -s 0000:06:0d.0
06:0d.0 0401: 1102:0002 (rev 08) 06:0d.0 0401: 1102:0002 (rev 08)
# echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind # echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind
# echo 1102 0002 > /sys/bus/pci/drivers/vfio/new_id # echo 1102 0002 > /sys/bus/pci/drivers/vfio-pci/new_id
Now we need to look at what other devices are in the group to free Now we need to look at what other devices are in the group to free
it for use by VFIO: it for use by VFIO:
......
MAINTAINERS
View file @ 268d2837
...@@ -3552,11 +3552,12 @@ K: \b(ABS|SYN)_MT_ ...@@ -3552,11 +3552,12 @@ K: \b(ABS|SYN)_MT_
INTEL C600 SERIES SAS CONTROLLER DRIVER INTEL C600 SERIES SAS CONTROLLER DRIVER
M: Intel SCU Linux support <intel-linux-scu@intel.com> M: Intel SCU Linux support <intel-linux-scu@intel.com>
M: Lukasz Dorau <lukasz.dorau@intel.com>
M: Maciej Patelczyk <maciej.patelczyk@intel.com>
M: Dave Jiang <dave.jiang@intel.com> M: Dave Jiang <dave.jiang@intel.com>
M: Ed Nadolski <edmund.nadolski@intel.com>
L: linux-scsi@vger.kernel.org L: linux-scsi@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git T: git git://git.code.sf.net/p/intel-sas/isci
S: Maintained S: Supported
F: drivers/scsi/isci/ F: drivers/scsi/isci/
F: firmware/isci/ F: firmware/isci/
...@@ -5544,6 +5545,8 @@ F: Documentation/devicetree/bindings/pwm/ ...@@ -5544,6 +5545,8 @@ F: Documentation/devicetree/bindings/pwm/
F: include/linux/pwm.h F: include/linux/pwm.h
F: include/linux/of_pwm.h F: include/linux/of_pwm.h
F: drivers/pwm/ F: drivers/pwm/
F: drivers/video/backlight/pwm_bl.c
F: include/linux/pwm_backlight.h
PXA2xx/PXA3xx SUPPORT PXA2xx/PXA3xx SUPPORT
M: Eric Miao <eric.y.miao@gmail.com> M: Eric Miao <eric.y.miao@gmail.com>
......
Makefile
View file @ 268d2837
VERSION = 3 VERSION = 3
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc7 EXTRAVERSION =
NAME = Terrified Chipmunk NAME = Terrified Chipmunk
# *DOCUMENTATION* # *DOCUMENTATION*
......
arch/arm/mach-mxs/mach-mxs.c
View file @ 268d2837
...@@ -261,7 +261,7 @@ static void __init apx4devkit_init(void) ...@@ -261,7 +261,7 @@ static void __init apx4devkit_init(void)
enable_clk_enet_out(); enable_clk_enet_out();
if (IS_BUILTIN(CONFIG_PHYLIB)) if (IS_BUILTIN(CONFIG_PHYLIB))
phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK, phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK,
apx4devkit_phy_fixup); apx4devkit_phy_fixup);
mxsfb_pdata.mode_list = apx4devkit_video_modes; mxsfb_pdata.mode_list = apx4devkit_video_modes;
......
arch/arm/mach-orion5x/common.c
View file @ 268d2837
...@@ -204,6 +204,13 @@ void __init orion5x_wdt_init(void) ...@@ -204,6 +204,13 @@ void __init orion5x_wdt_init(void)
void __init orion5x_init_early(void) void __init orion5x_init_early(void)
{ {
orion_time_set_base(TIMER_VIRT_BASE); orion_time_set_base(TIMER_VIRT_BASE);
/*
* Some Orion5x devices allocate their coherent buffers from atomic
* context. Increase size of atomic coherent pool to make sure such
* the allocations won't fail.
*/
init_dma_coherent_pool_size(SZ_1M);
} }
int orion5x_tclk; int orion5x_tclk;
......
arch/arm/mm/dma-mapping.c
View file @ 268d2837
...@@ -346,6 +346,8 @@ static int __init atomic_pool_init(void) ...@@ -346,6 +346,8 @@ static int __init atomic_pool_init(void)
(unsigned)pool->size / 1024); (unsigned)pool->size / 1024);
return 0; return 0;
} }
kfree(pages);
no_pages: no_pages:
kfree(bitmap); kfree(bitmap);
no_bitmap: no_bitmap:
......
arch/c6x/include/asm/Kbuild
View file @ 268d2837
...@@ -2,6 +2,7 @@ include include/asm-generic/Kbuild.asm ...@@ -2,6 +2,7 @@ include include/asm-generic/Kbuild.asm
generic-y += atomic.h generic-y += atomic.h
generic-y += auxvec.h generic-y += auxvec.h
generic-y += barrier.h
generic-y += bitsperlong.h generic-y += bitsperlong.h
generic-y += bugs.h generic-y += bugs.h
generic-y += cputime.h generic-y += cputime.h
......
arch/c6x/include/asm/barrier.h deleted 100644 → 0
View file @ df86b576
/*
* Port on Texas Instruments TMS320C6x architecture
*
* Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated
* Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.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.
*/
#ifndef _ASM_C6X_BARRIER_H
#define _ASM_C6X_BARRIER_H
#define nop() asm("NOP\n");
#define mb() barrier()
#define rmb() barrier()
#define wmb() barrier()
#define set_mb(var, value) do { var = value; mb(); } while (0)
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
#define smp_mb() barrier()
#define smp_rmb() barrier()
#define smp_wmb() barrier()
#define smp_read_barrier_depends() do { } while (0)
#endif /* _ASM_C6X_BARRIER_H */
arch/tile/include/gxio/iorpc_trio.h
View file @ 268d2837
...@@ -25,21 +25,23 @@ ...@@ -25,21 +25,23 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#define GXIO_TRIO_OP_ALLOC_ASIDS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1400) #define GXIO_TRIO_OP_DEALLOC_ASID IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1400)
#define GXIO_TRIO_OP_ALLOC_ASIDS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1401)
#define GXIO_TRIO_OP_ALLOC_MEMORY_MAPS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1402) #define GXIO_TRIO_OP_ALLOC_MEMORY_MAPS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1404)
#define GXIO_TRIO_OP_ALLOC_PIO_REGIONS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x140e) #define GXIO_TRIO_OP_ALLOC_PIO_REGIONS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1412)
#define GXIO_TRIO_OP_INIT_PIO_REGION_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x140f)
#define GXIO_TRIO_OP_INIT_MEMORY_MAP_MMU_AUX IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x1417) #define GXIO_TRIO_OP_INIT_PIO_REGION_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1414)
#define GXIO_TRIO_OP_GET_PORT_PROPERTY IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x1418)
#define GXIO_TRIO_OP_CONFIG_LEGACY_INTR IORPC_OPCODE(IORPC_FORMAT_KERNEL_INTERRUPT, 0x1419)
#define GXIO_TRIO_OP_CONFIG_MSI_INTR IORPC_OPCODE(IORPC_FORMAT_KERNEL_INTERRUPT, 0x141a)
#define GXIO_TRIO_OP_SET_MPS_MRS IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x141c) #define GXIO_TRIO_OP_INIT_MEMORY_MAP_MMU_AUX IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x141e)
#define GXIO_TRIO_OP_FORCE_RC_LINK_UP IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x141d) #define GXIO_TRIO_OP_GET_PORT_PROPERTY IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x141f)
#define GXIO_TRIO_OP_FORCE_EP_LINK_UP IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x141e) #define GXIO_TRIO_OP_CONFIG_LEGACY_INTR IORPC_OPCODE(IORPC_FORMAT_KERNEL_INTERRUPT, 0x1420)
#define GXIO_TRIO_OP_CONFIG_MSI_INTR IORPC_OPCODE(IORPC_FORMAT_KERNEL_INTERRUPT, 0x1421)
#define GXIO_TRIO_OP_SET_MPS_MRS IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x1423)
#define GXIO_TRIO_OP_FORCE_RC_LINK_UP IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x1424)
#define GXIO_TRIO_OP_FORCE_EP_LINK_UP IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x1425)
#define GXIO_TRIO_OP_GET_MMIO_BASE IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8000) #define GXIO_TRIO_OP_GET_MMIO_BASE IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8000)
#define GXIO_TRIO_OP_CHECK_MMIO_OFFSET IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8001) #define GXIO_TRIO_OP_CHECK_MMIO_OFFSET IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8001)
......
arch/um/include/asm/processor-generic.h
View file @ 268d2837
...@@ -20,14 +20,6 @@ struct mm_struct; ...@@ -20,14 +20,6 @@ struct mm_struct;
struct thread_struct { struct thread_struct {
struct task_struct *saved_task; struct task_struct *saved_task;
/*
* This flag is set to 1 before calling do_fork (and analyzed in
* copy_thread) to mark that we are begin called from userspace (fork /
* vfork / clone), and reset to 0 after. It is left to 0 when called
* from kernelspace (i.e. kernel_thread() or fork_idle(),
* as of 2.6.11).
*/
int forking;
struct pt_regs regs; struct pt_regs regs;
int singlestep_syscall; int singlestep_syscall;
void *fault_addr; void *fault_addr;
...@@ -58,7 +50,6 @@ struct thread_struct { ...@@ -58,7 +50,6 @@ struct thread_struct {
#define INIT_THREAD \ #define INIT_THREAD \
{ \ { \
.forking = 0, \
.regs = EMPTY_REGS, \ .regs = EMPTY_REGS, \
.fault_addr = NULL, \ .fault_addr = NULL, \
.prev_sched = NULL, \ .prev_sched = NULL, \
......
arch/um/include/shared/common-offsets.h
View file @ 268d2837
...@@ -7,16 +7,6 @@ DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); ...@@ -7,16 +7,6 @@ DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK);
DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT); DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT);
DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);
DEFINE_STR(UM_KERN_ALERT, KERN_ALERT);
DEFINE_STR(UM_KERN_CRIT, KERN_CRIT);
DEFINE_STR(UM_KERN_ERR, KERN_ERR);
DEFINE_STR(UM_KERN_WARNING, KERN_WARNING);
DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);
DEFINE_STR(UM_KERN_INFO, KERN_INFO);
DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
DEFINE_STR(UM_KERN_CONT, KERN_CONT);
DEFINE(UM_ELF_CLASS, ELF_CLASS); DEFINE(UM_ELF_CLASS, ELF_CLASS);
DEFINE(UM_ELFCLASS32, ELFCLASS32); DEFINE(UM_ELFCLASS32, ELFCLASS32);
DEFINE(UM_ELFCLASS64, ELFCLASS64); DEFINE(UM_ELFCLASS64, ELFCLASS64);
......
arch/um/include/shared/user.h
View file @ 268d2837
...@@ -26,6 +26,17 @@ ...@@ -26,6 +26,17 @@
extern void panic(const char *fmt, ...) extern void panic(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
/* Requires preincluding include/linux/kern_levels.h */
#define UM_KERN_EMERG KERN_EMERG
#define UM_KERN_ALERT KERN_ALERT
#define UM_KERN_CRIT KERN_CRIT
#define UM_KERN_ERR KERN_ERR
#define UM_KERN_WARNING KERN_WARNING
#define UM_KERN_NOTICE KERN_NOTICE
#define UM_KERN_INFO KERN_INFO
#define UM_KERN_DEBUG KERN_DEBUG
#define UM_KERN_CONT KERN_CONT
#ifdef UML_CONFIG_PRINTK #ifdef UML_CONFIG_PRINTK
extern int printk(const char *fmt, ...) extern int printk(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
......
arch/um/kernel/exec.c
View file @ 268d2837
...@@ -39,34 +39,21 @@ void flush_thread(void) ...@@ -39,34 +39,21 @@ void flush_thread(void)
void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
{ {
get_safe_registers(regs->regs.gp, regs->regs.fp);
PT_REGS_IP(regs) = eip; PT_REGS_IP(regs) = eip;
PT_REGS_SP(regs) = esp; PT_REGS_SP(regs) = esp;
} current->ptrace &= ~PT_DTRACE;
EXPORT_SYMBOL(start_thread);
static long execve1(const char *file,
const char __user *const __user *argv,
const char __user *const __user *env)
{
long error;
error = do_execve(file, argv, env, &current->thread.regs);
if (error == 0) {
task_lock(current);
current->ptrace &= ~PT_DTRACE;
#ifdef SUBARCH_EXECVE1 #ifdef SUBARCH_EXECVE1
SUBARCH_EXECVE1(&current->thread.regs.regs); SUBARCH_EXECVE1(regs->regs);
#endif #endif
task_unlock(current);
}
return error;
} }
EXPORT_SYMBOL(start_thread);
long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env) long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env)
{ {
long err; long err;
err = execve1(file, argv, env); err = do_execve(file, argv, env, &current->thread.regs);
if (!err) if (!err)
UML_LONGJMP(current->thread.exec_buf, 1); UML_LONGJMP(current->thread.exec_buf, 1);
return err; return err;
...@@ -81,7 +68,7 @@ long sys_execve(const char __user *file, const char __user *const __user *argv, ...@@ -81,7 +68,7 @@ long sys_execve(const char __user *file, const char __user *const __user *argv,
filename = getname(file); filename = getname(file);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) goto out; if (IS_ERR(filename)) goto out;
error = execve1(filename, argv, env); error = do_execve(filename, argv, env, &current->thread.regs);
putname(filename); putname(filename);
out: out:
return error; return error;
......
arch/um/kernel/process.c
View file @ 268d2837
...@@ -181,11 +181,12 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, ...@@ -181,11 +181,12 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
struct pt_regs *regs) struct pt_regs *regs)
{ {
void (*handler)(void); void (*handler)(void);
int kthread = current->flags & PF_KTHREAD;
int ret = 0; int ret = 0;
p->thread = (struct thread_struct) INIT_THREAD; p->thread = (struct thread_struct) INIT_THREAD;
if (current->thread.forking) { if (!kthread) {
memcpy(&p->thread.regs.regs, &regs->regs, memcpy(&p->thread.regs.regs, &regs->regs,
sizeof(p->thread.regs.regs)); sizeof(p->thread.regs.regs));
PT_REGS_SET_SYSCALL_RETURN(&p->thread.regs, 0); PT_REGS_SET_SYSCALL_RETURN(&p->thread.regs, 0);
...@@ -195,8 +196,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, ...@@ -195,8 +196,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
handler = fork_handler; handler = fork_handler;
arch_copy_thread(&current->thread.arch, &p->thread.arch); arch_copy_thread(&current->thread.arch, &p->thread.arch);
} } else {
else {
get_safe_registers(p->thread.regs.regs.gp, p->thread.regs.regs.fp); get_safe_registers(p->thread.regs.regs.gp, p->thread.regs.regs.fp);
p->thread.request.u.thread = current->thread.request.u.thread; p->thread.request.u.thread = current->thread.request.u.thread;
handler = new_thread_handler; handler = new_thread_handler;
...@@ -204,7 +204,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, ...@@ -204,7 +204,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
new_thread(task_stack_page(p), &p->thread.switch_buf, handler); new_thread(task_stack_page(p), &p->thread.switch_buf, handler);
if (current->thread.forking) { if (!kthread) {
clear_flushed_tls(p); clear_flushed_tls(p);
/* /*
......
arch/um/kernel/signal.c
View file @ 268d2837
...@@ -22,9 +22,13 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr, ...@@ -22,9 +22,13 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr,
struct k_sigaction *ka, siginfo_t *info) struct k_sigaction *ka, siginfo_t *info)
{ {
sigset_t *oldset = sigmask_to_save(); sigset_t *oldset = sigmask_to_save();
int singlestep = 0;
unsigned long sp; unsigned long sp;
int err; int err;
if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))
singlestep = 1;
/* Did we come from a system call? */ /* Did we come from a system call? */
if (PT_REGS_SYSCALL_NR(regs) >= 0) { if (PT_REGS_SYSCALL_NR(regs) >= 0) {
/* If so, check system call restarting.. */ /* If so, check system call restarting.. */
...@@ -61,7 +65,7 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr, ...@@ -61,7 +65,7 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr,
if (err) if (err)
force_sigsegv(signr, current); force_sigsegv(signr, current);
else else
signal_delivered(signr, info, ka, regs, 0); signal_delivered(signr, info, ka, regs, singlestep);
} }
static int kern_do_signal(struct pt_regs *regs) static int kern_do_signal(struct pt_regs *regs)
......
arch/um/kernel/syscall.c
View file @ 268d2837
...@@ -17,25 +17,25 @@ ...@@ -17,25 +17,25 @@
long sys_fork(void) long sys_fork(void)
{ {
long ret; return do_fork(SIGCHLD, UPT_SP(&current->thread.regs.regs),
current->thread.forking = 1;
ret = do_fork(SIGCHLD, UPT_SP(&current->thread.regs.regs),
&current->thread.regs, 0, NULL, NULL); &current->thread.regs, 0, NULL, NULL);
current->thread.forking = 0;
return ret;
} }
long sys_vfork(void) long sys_vfork(void)
{ {
long ret; return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,
current->thread.forking = 1;
ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,
UPT_SP(&current->thread.regs.regs), UPT_SP(&current->thread.regs.regs),
&current->thread.regs, 0, NULL, NULL); &current->thread.regs, 0, NULL, NULL);
current->thread.forking = 0; }
return ret;
long sys_clone(unsigned long clone_flags, unsigned long newsp,
void __user *parent_tid, void __user *child_tid)
{
if (!newsp)
newsp = UPT_SP(&current->thread.regs.regs);
return do_fork(clone_flags, newsp, &current->thread.regs, 0, parent_tid,
child_tid);
} }
long old_mmap(unsigned long addr, unsigned long len, long old_mmap(unsigned long addr, unsigned long len,
......
arch/um/scripts/Makefile.rules
View file @ 268d2837
...@@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) ...@@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS))
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
$(USER_OBJS:.o=.%): \ $(USER_OBJS:.o=.%): \
c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) -include user.h $(CFLAGS_$(basetarget).o) c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) -include $(srctree)/include/linux/kern_levels.h -include user.h $(CFLAGS_$(basetarget).o)
# These are like USER_OBJS but filter USER_CFLAGS through unprofile instead of # These are like USER_OBJS but filter USER_CFLAGS through unprofile instead of
# using it directly. # using it directly.
......
arch/x86/um/Kconfig
View file @ 268d2837
...@@ -21,6 +21,7 @@ config 64BIT ...@@ -21,6 +21,7 @@ config 64BIT
config X86_32 config X86_32
def_bool !64BIT def_bool !64BIT
select HAVE_AOUT select HAVE_AOUT
select ARCH_WANT_IPC_PARSE_VERSION
config X86_64 config X86_64
def_bool 64BIT def_bool 64BIT
......
arch/x86/um/shared/sysdep/kernel-offsets.h
View file @ 268d2837
...@@ -7,9 +7,6 @@ ...@@ -7,9 +7,6 @@
#define DEFINE(sym, val) \ #define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val)) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
#define STR(x) #x
#define DEFINE_STR(sym, val) asm volatile("\n->" #sym " " STR(val) " " #val: : )
#define BLANK() asm volatile("\n->" : : ) #define BLANK() asm volatile("\n->" : : )
#define OFFSET(sym, str, mem) \ #define OFFSET(sym, str, mem) \
......
arch/x86/um/shared/sysdep/syscalls.h
View file @ 268d2837
extern long sys_clone(unsigned long clone_flags, unsigned long newsp,
void __user *parent_tid, void __user *child_tid);
#ifdef __i386__ #ifdef __i386__
#include "syscalls_32.h" #include "syscalls_32.h"
#else #else
......
arch/x86/um/signal.c
View file @ 268d2837
...@@ -416,9 +416,6 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig, ...@@ -416,9 +416,6 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig,
PT_REGS_AX(regs) = (unsigned long) sig; PT_REGS_AX(regs) = (unsigned long) sig;
PT_REGS_DX(regs) = (unsigned long) 0; PT_REGS_DX(regs) = (unsigned long) 0;
PT_REGS_CX(regs) = (unsigned long) 0; PT_REGS_CX(regs) = (unsigned long) 0;
if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))
ptrace_notify(SIGTRAP);
return 0; return 0;
} }
...@@ -466,9 +463,6 @@ int setup_signal_stack_si(unsigned long stack_top, int sig, ...@@ -466,9 +463,6 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
PT_REGS_AX(regs) = (unsigned long) sig; PT_REGS_AX(regs) = (unsigned long) sig;
PT_REGS_DX(regs) = (unsigned long) &frame->info; PT_REGS_DX(regs) = (unsigned long) &frame->info;
PT_REGS_CX(regs) = (unsigned long) &frame->uc; PT_REGS_CX(regs) = (unsigned long) &frame->uc;
if ((current->ptrace & PT_DTRACE) && (current->ptrace & PT_PTRACED))
ptrace_notify(SIGTRAP);
return 0; return 0;
} }
......
arch/x86/um/sys_call_table_32.c
View file @ 268d2837
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define ptregs_execve sys_execve #define ptregs_execve sys_execve
#define ptregs_iopl sys_iopl #define ptregs_iopl sys_iopl
#define ptregs_vm86old sys_vm86old #define ptregs_vm86old sys_vm86old
#define ptregs_clone sys_clone #define ptregs_clone i386_clone
#define ptregs_vm86 sys_vm86 #define ptregs_vm86 sys_vm86
#define ptregs_sigaltstack sys_sigaltstack #define ptregs_sigaltstack sys_sigaltstack
#define ptregs_vfork sys_vfork #define ptregs_vfork sys_vfork
......
arch/x86/um/syscalls_32.c
View file @ 268d2837
...@@ -3,37 +3,24 @@ ...@@ -3,37 +3,24 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/sched.h" #include <linux/syscalls.h>
#include "linux/shm.h" #include <sysdep/syscalls.h>
#include "linux/ipc.h"
#include "linux/syscalls.h"
#include "asm/mman.h"
#include "asm/uaccess.h"
#include "asm/unistd.h"
/* /*
* The prototype on i386 is: * The prototype on i386 is:
* *
* int clone(int flags, void * child_stack, int * parent_tidptr, struct user_desc * newtls, int * child_tidptr) * int clone(int flags, void * child_stack, int * parent_tidptr, struct user_desc * newtls
* *
* and the "newtls" arg. on i386 is read by copy_thread directly from the * and the "newtls" arg. on i386 is read by copy_thread directly from the
* register saved on the stack. * register saved on the stack.
*/ */
long sys_clone(unsigned long clone_flags, unsigned long newsp, long i386_clone(unsigned long clone_flags, unsigned long newsp,
int __user *parent_tid, void *newtls, int __user *child_tid) int __user *parent_tid, void *newtls, int __user *child_tid)
{ {
long ret; return sys_clone(clone_flags, newsp, parent_tid, child_tid);
if (!newsp)
newsp = UPT_SP(&current->thread.regs.regs);
current->thread.forking = 1;
ret = do_fork(clone_flags, newsp, &current->thread.regs, 0, parent_tid,
child_tid);
current->thread.forking = 0;
return ret;
} }
long sys_sigaction(int sig, const struct old_sigaction __user *act, long sys_sigaction(int sig, const struct old_sigaction __user *act,
struct old_sigaction __user *oact) struct old_sigaction __user *oact)
{ {
......
arch/x86/um/syscalls_64.c
View file @ 268d2837
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/linkage.h" #include <linux/sched.h>
#include "linux/personality.h" #include <asm/prctl.h> /* XXX This should get the constants from libc */
#include "linux/utsname.h" #include <os.h>
#include "asm/prctl.h" /* XXX This should get the constants from libc */
#include "asm/uaccess.h"
#include "os.h"
long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr) long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr)
{ {
...@@ -79,20 +76,6 @@ long sys_arch_prctl(int code, unsigned long addr) ...@@ -79,20 +76,6 @@ long sys_arch_prctl(int code, unsigned long addr)
return arch_prctl(current, code, (unsigned long __user *) addr); return arch_prctl(current, code, (unsigned long __user *) addr);
} }
long sys_clone(unsigned long clone_flags, unsigned long newsp,
void __user *parent_tid, void __user *child_tid)
{
long ret;
if (!newsp)
newsp = UPT_SP(&current->thread.regs.regs);
current->thread.forking = 1;
ret = do_fork(clone_flags, newsp, &current->thread.regs, 0, parent_tid,
child_tid);
current->thread.forking = 0;
return ret;
}
void arch_switch_to(struct task_struct *to) void arch_switch_to(struct task_struct *to)
{ {
if ((to->thread.arch.fs == 0) || (to->mm == NULL)) if ((to->thread.arch.fs == 0) || (to->mm == NULL))
......
arch/x86/xen/setup.c
View file @ 268d2837
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <asm/e820.h> #include <asm/e820.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/acpi.h> #include <asm/acpi.h>
#include <asm/numa.h>
#include <asm/xen/hypervisor.h> #include <asm/xen/hypervisor.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
...@@ -544,4 +545,7 @@ void __init xen_arch_setup(void) ...@@ -544,4 +545,7 @@ void __init xen_arch_setup(void)
disable_cpufreq(); disable_cpufreq();
WARN_ON(set_pm_idle_to_default()); WARN_ON(set_pm_idle_to_default());
fiddle_vdso(); fiddle_vdso();
#ifdef CONFIG_NUMA
numa_off = 1;
#endif
} }
drivers/block/nvme.c
View file @ 268d2837
This diff is collapsed.
drivers/block/rbd.c
View file @ 268d2837
...@@ -246,13 +246,12 @@ static int rbd_open(struct block_device *bdev, fmode_t mode) ...@@ -246,13 +246,12 @@ static int rbd_open(struct block_device *bdev, fmode_t mode)
{ {
struct rbd_device *rbd_dev = bdev->bd_disk->private_data; struct rbd_device *rbd_dev = bdev->bd_disk->private_data;
rbd_get_dev(rbd_dev);
set_device_ro(bdev, rbd_dev->read_only);
if ((mode & FMODE_WRITE) && rbd_dev->read_only) if ((mode & FMODE_WRITE) && rbd_dev->read_only)
return -EROFS; return -EROFS;
rbd_get_dev(rbd_dev);
set_device_ro(bdev, rbd_dev->read_only);
return 0; return 0;
} }
......
drivers/edac/i3200_edac.c
View file @ 268d2837
...@@ -391,7 +391,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -391,7 +391,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
for (j = 0; j < nr_channels; j++) { for (j = 0; j < nr_channels; j++) {
struct dimm_info *dimm = csrow->channels[j]->dimm; struct dimm_info *dimm = csrow->channels[j]->dimm;
dimm->nr_pages = nr_pages / nr_channels; dimm->nr_pages = nr_pages;
dimm->grain = nr_pages << PAGE_SHIFT; dimm->grain = nr_pages << PAGE_SHIFT;
dimm->mtype = MEM_DDR2; dimm->mtype = MEM_DDR2;
dimm->dtype = DEV_UNKNOWN; dimm->dtype = DEV_UNKNOWN;
......
drivers/edac/i5000_edac.c
View file @ 268d2837
...@@ -1012,6 +1012,10 @@ static void handle_channel(struct i5000_pvt *pvt, int slot, int channel, ...@@ -1012,6 +1012,10 @@ static void handle_channel(struct i5000_pvt *pvt, int slot, int channel,
/* add the number of COLUMN bits */ /* add the number of COLUMN bits */
addrBits += MTR_DIMM_COLS_ADDR_BITS(mtr); addrBits += MTR_DIMM_COLS_ADDR_BITS(mtr);
/* Dual-rank memories have twice the size */
if (dinfo->dual_rank)
addrBits++;
addrBits += 6; /* add 64 bits per DIMM */ addrBits += 6; /* add 64 bits per DIMM */
addrBits -= 20; /* divide by 2^^20 */ addrBits -= 20; /* divide by 2^^20 */
addrBits -= 3; /* 8 bits per bytes */ addrBits -= 3; /* 8 bits per bytes */
......
drivers/edac/sb_edac.c
View file @ 268d2837
...@@ -513,7 +513,8 @@ static int get_dimm_config(struct mem_ctl_info *mci) ...@@ -513,7 +513,8 @@ static int get_dimm_config(struct mem_ctl_info *mci)
{ {
struct sbridge_pvt *pvt = mci->pvt_info; struct sbridge_pvt *pvt = mci->pvt_info;
struct dimm_info *dimm; struct dimm_info *dimm;
int i, j, banks, ranks, rows, cols, size, npages; unsigned i, j, banks, ranks, rows, cols, npages;
u64 size;
u32 reg; u32 reg;
enum edac_type mode; enum edac_type mode;
enum mem_type mtype; enum mem_type mtype;
...@@ -585,10 +586,10 @@ static int get_dimm_config(struct mem_ctl_info *mci) ...@@ -585,10 +586,10 @@ static int get_dimm_config(struct mem_ctl_info *mci)
cols = numcol(mtr); cols = numcol(mtr);
/* DDR3 has 8 I/O banks */ /* DDR3 has 8 I/O banks */
size = (rows * cols * banks * ranks) >> (20 - 3); size = ((u64)rows * cols * banks * ranks) >> (20 - 3);
npages = MiB_TO_PAGES(size); npages = MiB_TO_PAGES(size);
edac_dbg(0, "mc#%d: channel %d, dimm %d, %d Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n", edac_dbg(0, "mc#%d: channel %d, dimm %d, %Ld Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n",
pvt->sbridge_dev->mc, i, j, pvt->sbridge_dev->mc, i, j,
size, npages, size, npages,
banks, ranks, rows, cols); banks, ranks, rows, cols);
......
drivers/gpio/gpio-lpc32xx.c
View file @ 268d2837
...@@ -308,6 +308,7 @@ static int lpc32xx_gpio_dir_output_p012(struct gpio_chip *chip, unsigned pin, ...@@ -308,6 +308,7 @@ static int lpc32xx_gpio_dir_output_p012(struct gpio_chip *chip, unsigned pin,
{ {
struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip); struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip);
__set_gpio_level_p012(group, pin, value);
__set_gpio_dir_p012(group, pin, 0); __set_gpio_dir_p012(group, pin, 0);
return 0; return 0;
...@@ -318,6 +319,7 @@ static int lpc32xx_gpio_dir_output_p3(struct gpio_chip *chip, unsigned pin, ...@@ -318,6 +319,7 @@ static int lpc32xx_gpio_dir_output_p3(struct gpio_chip *chip, unsigned pin,
{ {
struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip); struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip);
__set_gpio_level_p3(group, pin, value);
__set_gpio_dir_p3(group, pin, 0); __set_gpio_dir_p3(group, pin, 0);
return 0; return 0;
...@@ -326,6 +328,9 @@ static int lpc32xx_gpio_dir_output_p3(struct gpio_chip *chip, unsigned pin, ...@@ -326,6 +328,9 @@ static int lpc32xx_gpio_dir_output_p3(struct gpio_chip *chip, unsigned pin,
static int lpc32xx_gpio_dir_out_always(struct gpio_chip *chip, unsigned pin, static int lpc32xx_gpio_dir_out_always(struct gpio_chip *chip, unsigned pin,
int value) int value)
{ {
struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip);
__set_gpo_level_p3(group, pin, value);
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/Kconfig
View file @ 268d2837
...@@ -17,6 +17,34 @@ config DRM_NOUVEAU ...@@ -17,6 +17,34 @@ config DRM_NOUVEAU
help help
Choose this option for open-source nVidia support. Choose this option for open-source nVidia support.
config NOUVEAU_DEBUG
int "Maximum debug level"
depends on DRM_NOUVEAU
range 0 7
default 5
help
Selects the maximum debug level to compile support for.
0 - fatal
1 - error
2 - warning
3 - info
4 - debug
5 - trace (recommended)
6 - paranoia
7 - spam
The paranoia and spam levels will add a lot of extra checks which
may potentially slow down driver operation.
config NOUVEAU_DEBUG_DEFAULT
int "Default debug level"
depends on DRM_NOUVEAU
range 0 7
default 3
help
Selects the default debug level
config DRM_NOUVEAU_BACKLIGHT config DRM_NOUVEAU_BACKLIGHT
bool "Support for backlight control" bool "Support for backlight control"
depends on DRM_NOUVEAU depends on DRM_NOUVEAU
...@@ -25,14 +53,6 @@ config DRM_NOUVEAU_BACKLIGHT ...@@ -25,14 +53,6 @@ config DRM_NOUVEAU_BACKLIGHT
Say Y here if you want to control the backlight of your display Say Y here if you want to control the backlight of your display
(e.g. a laptop panel). (e.g. a laptop panel).
config DRM_NOUVEAU_DEBUG
bool "Build in Nouveau's debugfs support"
depends on DRM_NOUVEAU && DEBUG_FS
default y
help
Say Y here if you want Nouveau to output debugging information
via debugfs.
menu "I2C encoder or helper chips" menu "I2C encoder or helper chips"
depends on DRM && DRM_KMS_HELPER && I2C depends on DRM && DRM_KMS_HELPER && I2C
......
drivers/gpu/drm/nouveau/Makefile
View file @ 268d2837
...@@ -3,49 +3,190 @@ ...@@ -3,49 +3,190 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
ccflags-y := -Iinclude/drm ccflags-y := -Iinclude/drm
nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ ccflags-y += -I$(src)/core/include
nouveau_gpuobj.o nouveau_irq.o nouveau_notifier.o \ ccflags-y += -I$(src)/core
nouveau_sgdma.o nouveau_dma.o nouveau_util.o \ ccflags-y += -I$(src)
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-y := core/core/client.o
nouveau_display.o nouveau_connector.o nouveau_fbcon.o \ nouveau-y += core/core/engctx.o
nouveau_hdmi.o nouveau_dp.o nouveau_ramht.o \ nouveau-y += core/core/engine.o
nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \ nouveau-y += core/core/enum.o
nouveau_mm.o nouveau_vm.o nouveau_mxm.o nouveau_gpio.o \ nouveau-y += core/core/gpuobj.o
nouveau_abi16.o \ nouveau-y += core/core/handle.o
nv04_timer.o \ nouveau-y += core/core/mm.o
nv04_mc.o nv40_mc.o nv50_mc.o \ nouveau-y += core/core/namedb.o
nv04_fb.o nv10_fb.o nv20_fb.o nv30_fb.o nv40_fb.o \ nouveau-y += core/core/object.o
nv50_fb.o nvc0_fb.o \ nouveau-y += core/core/option.o
nv04_fifo.o nv10_fifo.o nv17_fifo.o nv40_fifo.o nv50_fifo.o \ nouveau-y += core/core/parent.o
nv84_fifo.o nvc0_fifo.o nve0_fifo.o \ nouveau-y += core/core/printk.o
nv04_fence.o nv10_fence.o nv84_fence.o nvc0_fence.o \ nouveau-y += core/core/ramht.o
nv04_software.o nv50_software.o nvc0_software.o \ nouveau-y += core/core/subdev.o
nv04_graph.o nv10_graph.o nv20_graph.o \
nv40_graph.o nv50_graph.o nvc0_graph.o nve0_graph.o \ nouveau-y += core/subdev/bar/base.o
nv40_grctx.o nv50_grctx.o nvc0_grctx.o nve0_grctx.o \ nouveau-y += core/subdev/bar/nv50.o
nv84_crypt.o nv98_crypt.o \ nouveau-y += core/subdev/bar/nvc0.o
nva3_copy.o nvc0_copy.o \ nouveau-y += core/subdev/bios/base.o
nv31_mpeg.o nv50_mpeg.o \ nouveau-y += core/subdev/bios/bit.o
nv84_bsp.o \ nouveau-y += core/subdev/bios/conn.o
nv84_vp.o \ nouveau-y += core/subdev/bios/dcb.o
nv98_ppp.o \ nouveau-y += core/subdev/bios/dp.o
nv04_instmem.o nv50_instmem.o nvc0_instmem.o \ nouveau-y += core/subdev/bios/extdev.o
nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \ nouveau-y += core/subdev/bios/gpio.o
nv04_crtc.o nv04_display.o nv04_cursor.o \ nouveau-y += core/subdev/bios/i2c.o
nv50_evo.o nv50_crtc.o nv50_dac.o nv50_sor.o \ nouveau-y += core/subdev/bios/init.o
nv50_cursor.o nv50_display.o \ nouveau-y += core/subdev/bios/mxm.o
nvd0_display.o \ nouveau-y += core/subdev/bios/perf.o
nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o \ nouveau-y += core/subdev/bios/pll.o
nv10_gpio.o nv50_gpio.o \ nouveau-y += core/subdev/bios/therm.o
nv50_calc.o \ nouveau-y += core/subdev/clock/nv04.o
nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o \ nouveau-y += core/subdev/clock/nv40.o
nv50_vram.o nvc0_vram.o \ nouveau-y += core/subdev/clock/nv50.o
nv50_vm.o nvc0_vm.o nouveau_prime.o nouveau-y += core/subdev/clock/nva3.o
nouveau-y += core/subdev/clock/nvc0.o
nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o nouveau-y += core/subdev/clock/pllnv04.o
nouveau-y += core/subdev/clock/pllnva3.o
nouveau-y += core/subdev/device/base.o
nouveau-y += core/subdev/device/nv04.o
nouveau-y += core/subdev/device/nv10.o
nouveau-y += core/subdev/device/nv20.o
nouveau-y += core/subdev/device/nv30.o
nouveau-y += core/subdev/device/nv40.o
nouveau-y += core/subdev/device/nv50.o
nouveau-y += core/subdev/device/nvc0.o
nouveau-y += core/subdev/device/nve0.o
nouveau-y += core/subdev/devinit/base.o
nouveau-y += core/subdev/devinit/nv04.o
nouveau-y += core/subdev/devinit/nv05.o
nouveau-y += core/subdev/devinit/nv10.o
nouveau-y += core/subdev/devinit/nv1a.o
nouveau-y += core/subdev/devinit/nv20.o
nouveau-y += core/subdev/devinit/nv50.o
nouveau-y += core/subdev/fb/base.o
nouveau-y += core/subdev/fb/nv04.o
nouveau-y += core/subdev/fb/nv10.o
nouveau-y += core/subdev/fb/nv20.o
nouveau-y += core/subdev/fb/nv30.o
nouveau-y += core/subdev/fb/nv40.o
nouveau-y += core/subdev/fb/nv50.o
nouveau-y += core/subdev/fb/nvc0.o
nouveau-y += core/subdev/gpio/base.o
nouveau-y += core/subdev/gpio/nv10.o
nouveau-y += core/subdev/gpio/nv50.o
nouveau-y += core/subdev/gpio/nvd0.o
nouveau-y += core/subdev/i2c/base.o
nouveau-y += core/subdev/i2c/aux.o
nouveau-y += core/subdev/i2c/bit.o
nouveau-y += core/subdev/ibus/nvc0.o
nouveau-y += core/subdev/ibus/nve0.o
nouveau-y += core/subdev/instmem/base.o
nouveau-y += core/subdev/instmem/nv04.o
nouveau-y += core/subdev/instmem/nv40.o
nouveau-y += core/subdev/instmem/nv50.o
nouveau-y += core/subdev/ltcg/nvc0.o
nouveau-y += core/subdev/mc/base.o
nouveau-y += core/subdev/mc/nv04.o
nouveau-y += core/subdev/mc/nv44.o
nouveau-y += core/subdev/mc/nv50.o
nouveau-y += core/subdev/mc/nv98.o
nouveau-y += core/subdev/mc/nvc0.o
nouveau-y += core/subdev/mxm/base.o
nouveau-y += core/subdev/mxm/mxms.o
nouveau-y += core/subdev/mxm/nv50.o
nouveau-y += core/subdev/therm/base.o
nouveau-y += core/subdev/therm/fan.o
nouveau-y += core/subdev/therm/ic.o
nouveau-y += core/subdev/therm/nv40.o
nouveau-y += core/subdev/therm/nv50.o
nouveau-y += core/subdev/therm/temp.o
nouveau-y += core/subdev/timer/base.o
nouveau-y += core/subdev/timer/nv04.o
nouveau-y += core/subdev/vm/base.o
nouveau-y += core/subdev/vm/nv04.o
nouveau-y += core/subdev/vm/nv41.o
nouveau-y += core/subdev/vm/nv44.o
nouveau-y += core/subdev/vm/nv50.o
nouveau-y += core/subdev/vm/nvc0.o
nouveau-y += core/engine/dmaobj/base.o
nouveau-y += core/engine/dmaobj/nv04.o
nouveau-y += core/engine/dmaobj/nv50.o
nouveau-y += core/engine/dmaobj/nvc0.o
nouveau-y += core/engine/bsp/nv84.o
nouveau-y += core/engine/copy/nva3.o
nouveau-y += core/engine/copy/nvc0.o
nouveau-y += core/engine/copy/nve0.o
nouveau-y += core/engine/crypt/nv84.o
nouveau-y += core/engine/crypt/nv98.o
nouveau-y += core/engine/disp/nv04.o
nouveau-y += core/engine/disp/nv50.o
nouveau-y += core/engine/disp/nvd0.o
nouveau-y += core/engine/disp/vga.o
nouveau-y += core/engine/fifo/base.o
nouveau-y += core/engine/fifo/nv04.o
nouveau-y += core/engine/fifo/nv10.o
nouveau-y += core/engine/fifo/nv17.o
nouveau-y += core/engine/fifo/nv40.o
nouveau-y += core/engine/fifo/nv50.o
nouveau-y += core/engine/fifo/nv84.o
nouveau-y += core/engine/fifo/nvc0.o
nouveau-y += core/engine/fifo/nve0.o
nouveau-y += core/engine/graph/ctxnv40.o
nouveau-y += core/engine/graph/ctxnv50.o
nouveau-y += core/engine/graph/ctxnvc0.o
nouveau-y += core/engine/graph/ctxnve0.o
nouveau-y += core/engine/graph/nv04.o
nouveau-y += core/engine/graph/nv10.o
nouveau-y += core/engine/graph/nv20.o
nouveau-y += core/engine/graph/nv25.o
nouveau-y += core/engine/graph/nv2a.o
nouveau-y += core/engine/graph/nv30.o
nouveau-y += core/engine/graph/nv34.o
nouveau-y += core/engine/graph/nv35.o
nouveau-y += core/engine/graph/nv40.o
nouveau-y += core/engine/graph/nv50.o
nouveau-y += core/engine/graph/nvc0.o
nouveau-y += core/engine/graph/nve0.o
nouveau-y += core/engine/mpeg/nv31.o
nouveau-y += core/engine/mpeg/nv40.o
nouveau-y += core/engine/mpeg/nv50.o
nouveau-y += core/engine/mpeg/nv84.o
nouveau-y += core/engine/ppp/nv98.o
nouveau-y += core/engine/software/nv04.o
nouveau-y += core/engine/software/nv10.o
nouveau-y += core/engine/software/nv50.o
nouveau-y += core/engine/software/nvc0.o
nouveau-y += core/engine/vp/nv84.o
# drm/core
nouveau-y += nouveau_drm.o nouveau_chan.o nouveau_dma.o nouveau_fence.o
nouveau-y += nouveau_irq.o nouveau_vga.o nouveau_agp.o
nouveau-y += nouveau_ttm.o nouveau_sgdma.o nouveau_bo.o nouveau_gem.o
nouveau-y += nouveau_prime.o nouveau_abi16.o
nouveau-y += nv04_fence.o nv10_fence.o nv50_fence.o nv84_fence.o nvc0_fence.o
# drm/kms
nouveau-y += nouveau_bios.o nouveau_fbcon.o nouveau_display.o
nouveau-y += nouveau_connector.o nouveau_hdmi.o nouveau_dp.o
nouveau-y += nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o
# drm/kms/nv04:nv50
nouveau-y += nouveau_hw.o nouveau_calc.o
nouveau-y += nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o
nouveau-y += nv04_crtc.o nv04_display.o nv04_cursor.o
# drm/kms/nv50-
nouveau-y += nv50_display.o nvd0_display.o
nouveau-y += nv50_crtc.o nv50_dac.o nv50_sor.o nv50_cursor.o
nouveau-y += nv50_evo.o
# drm/pm
nouveau-y += nouveau_pm.o nouveau_volt.o nouveau_perf.o
nouveau-y += nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o
nouveau-y += nouveau_mem.o
# other random bits
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
nouveau-$(CONFIG_ACPI) += nouveau_acpi.o nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
drivers/gpu/drm/nouveau/core/core/client.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/object.h>
#include <core/client.h>
#include <core/handle.h>
#include <core/option.h>
#include <subdev/device.h>
static void
nouveau_client_dtor(struct nouveau_object *object)
{
struct nouveau_client *client = (void *)object;
nouveau_object_ref(NULL, &client->device);
nouveau_handle_destroy(client->root);
nouveau_namedb_destroy(&client->base);
}
static struct nouveau_oclass
nouveau_client_oclass = {
.ofuncs = &(struct nouveau_ofuncs) {
.dtor = nouveau_client_dtor,
},
};
int
nouveau_client_create_(const char *name, u64 devname, const char *cfg,
const char *dbg, int length, void **pobject)
{
struct nouveau_object *device;
struct nouveau_client *client;
int ret;
device = (void *)nouveau_device_find(devname);
if (!device)
return -ENODEV;
ret = nouveau_namedb_create_(NULL, NULL, &nouveau_client_oclass,
NV_CLIENT_CLASS, nouveau_device_sclass,
0, length, pobject);
client = *pobject;
if (ret)
return ret;
ret = nouveau_handle_create(nv_object(client), ~0, ~0,
nv_object(client), &client->root);
if (ret) {
nouveau_namedb_destroy(&client->base);
return ret;
}
/* prevent init/fini being called, os in in charge of this */
atomic_set(&nv_object(client)->usecount, 2);
nouveau_object_ref(device, &client->device);
snprintf(client->name, sizeof(client->name), "%s", name);
client->debug = nouveau_dbgopt(dbg, "CLIENT");
return 0;
}
int
nouveau_client_init(struct nouveau_client *client)
{
int ret;
nv_debug(client, "init running\n");
ret = nouveau_handle_init(client->root);
nv_debug(client, "init completed with %d\n", ret);
return ret;
}
int
nouveau_client_fini(struct nouveau_client *client, bool suspend)
{
const char *name[2] = { "fini", "suspend" };
int ret;
nv_debug(client, "%s running\n", name[suspend]);
ret = nouveau_handle_fini(client->root, suspend);
nv_debug(client, "%s completed with %d\n", name[suspend], ret);
return ret;
}
drivers/gpu/drm/nouveau/core/core/engctx.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/object.h>
#include <core/namedb.h>
#include <core/handle.h>
#include <core/client.h>
#include <core/engctx.h>
#include <subdev/vm.h>
static inline int
nouveau_engctx_exists(struct nouveau_object *parent,
struct nouveau_engine *engine, void **pobject)
{
struct nouveau_engctx *engctx;
struct nouveau_object *parctx;
list_for_each_entry(engctx, &engine->contexts, head) {
parctx = nv_pclass(nv_object(engctx), NV_PARENT_CLASS);
if (parctx == parent) {
atomic_inc(&nv_object(engctx)->refcount);
*pobject = engctx;
return 1;
}
}
return 0;
}
int
nouveau_engctx_create_(struct nouveau_object *parent,
struct nouveau_object *engobj,
struct nouveau_oclass *oclass,
struct nouveau_object *pargpu,
u32 size, u32 align, u32 flags,
int length, void **pobject)
{
struct nouveau_client *client = nouveau_client(parent);
struct nouveau_engine *engine = nv_engine(engobj);
struct nouveau_object *engctx;
unsigned long save;
int ret;
/* check if this engine already has a context for the parent object,
* and reference it instead of creating a new one
*/
spin_lock_irqsave(&engine->lock, save);
ret = nouveau_engctx_exists(parent, engine, pobject);
spin_unlock_irqrestore(&engine->lock, save);
if (ret)
return ret;
/* create the new context, supports creating both raw objects and
* objects backed by instance memory
*/
if (size) {
ret = nouveau_gpuobj_create_(parent, engobj, oclass,
NV_ENGCTX_CLASS,
pargpu, size, align, flags,
length, pobject);
} else {
ret = nouveau_object_create_(parent, engobj, oclass,
NV_ENGCTX_CLASS, length, pobject);
}
engctx = *pobject;
if (ret)
return ret;
/* must take the lock again and re-check a context doesn't already
* exist (in case of a race) - the lock had to be dropped before as
* it's not possible to allocate the object with it held.
*/
spin_lock_irqsave(&engine->lock, save);
ret = nouveau_engctx_exists(parent, engine, pobject);
if (ret) {
spin_unlock_irqrestore(&engine->lock, save);
nouveau_object_ref(NULL, &engctx);
return ret;
}
if (client->vm)
atomic_inc(&client->vm->engref[nv_engidx(engobj)]);
list_add(&nv_engctx(engctx)->head, &engine->contexts);
nv_engctx(engctx)->addr = ~0ULL;
spin_unlock_irqrestore(&engine->lock, save);
return 0;
}
void
nouveau_engctx_destroy(struct nouveau_engctx *engctx)
{
struct nouveau_object *engobj = nv_object(engctx)->engine;
struct nouveau_engine *engine = nv_engine(engobj);
struct nouveau_client *client = nouveau_client(engctx);
unsigned long save;
nouveau_gpuobj_unmap(&engctx->vma);
spin_lock_irqsave(&engine->lock, save);
list_del(&engctx->head);
spin_unlock_irqrestore(&engine->lock, save);
if (client->vm)
atomic_dec(&client->vm->engref[nv_engidx(engobj)]);
if (engctx->base.size)
nouveau_gpuobj_destroy(&engctx->base);
else
nouveau_object_destroy(&engctx->base.base);
}
int
nouveau_engctx_init(struct nouveau_engctx *engctx)
{
struct nouveau_object *object = nv_object(engctx);
struct nouveau_subdev *subdev = nv_subdev(object->engine);
struct nouveau_object *parent;
struct nouveau_subdev *pardev;
int ret;
ret = nouveau_gpuobj_init(&engctx->base);
if (ret)
return ret;
parent = nv_pclass(object->parent, NV_PARENT_CLASS);
pardev = nv_subdev(parent->engine);
if (nv_parent(parent)->context_attach) {
mutex_lock(&pardev->mutex);
ret = nv_parent(parent)->context_attach(parent, object);
mutex_unlock(&pardev->mutex);
}
if (ret) {
nv_error(parent, "failed to attach %s context, %d\n",
subdev->name, ret);
return ret;
}
nv_debug(parent, "attached %s context\n", subdev->name);
return 0;
}
int
nouveau_engctx_fini(struct nouveau_engctx *engctx, bool suspend)
{
struct nouveau_object *object = nv_object(engctx);
struct nouveau_subdev *subdev = nv_subdev(object->engine);
struct nouveau_object *parent;
struct nouveau_subdev *pardev;
int ret = 0;
parent = nv_pclass(object->parent, NV_PARENT_CLASS);
pardev = nv_subdev(parent->engine);
if (nv_parent(parent)->context_detach) {
mutex_lock(&pardev->mutex);
ret = nv_parent(parent)->context_detach(parent, suspend, object);
mutex_unlock(&pardev->mutex);
}
if (ret) {
nv_error(parent, "failed to detach %s context, %d\n",
subdev->name, ret);
return ret;
}
nv_debug(parent, "detached %s context\n", subdev->name);
return nouveau_gpuobj_fini(&engctx->base, suspend);
}
void
_nouveau_engctx_dtor(struct nouveau_object *object)
{
nouveau_engctx_destroy(nv_engctx(object));
}
int
_nouveau_engctx_init(struct nouveau_object *object)
{
return nouveau_engctx_init(nv_engctx(object));
}
int
_nouveau_engctx_fini(struct nouveau_object *object, bool suspend)
{
return nouveau_engctx_fini(nv_engctx(object), suspend);
}
struct nouveau_object *
nouveau_engctx_get(struct nouveau_engine *engine, u64 addr)
{
struct nouveau_engctx *engctx;
unsigned long flags;
spin_lock_irqsave(&engine->lock, flags);
list_for_each_entry(engctx, &engine->contexts, head) {
if (engctx->addr == addr) {
engctx->save = flags;
return nv_object(engctx);
}
}
spin_unlock_irqrestore(&engine->lock, flags);
return NULL;
}
void
nouveau_engctx_put(struct nouveau_object *object)
{
if (object) {
struct nouveau_engine *engine = nv_engine(object->engine);
struct nouveau_engctx *engctx = nv_engctx(object);
spin_unlock_irqrestore(&engine->lock, engctx->save);
}
}
drivers/gpu/drm/nouveau/core/core/engine.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/device.h>
#include <core/engine.h>
#include <core/option.h>
int
nouveau_engine_create_(struct nouveau_object *parent,
struct nouveau_object *engobj,
struct nouveau_oclass *oclass, bool enable,
const char *iname, const char *fname,
int length, void **pobject)
{
struct nouveau_device *device = nv_device(parent);
struct nouveau_engine *engine;
int ret;
ret = nouveau_subdev_create_(parent, engobj, oclass, NV_ENGINE_CLASS,
iname, fname, length, pobject);
engine = *pobject;
if (ret)
return ret;
if (!nouveau_boolopt(device->cfgopt, iname, enable)) {
if (!enable)
nv_warn(engine, "disabled, %s=1 to enable\n", iname);
return -ENODEV;
}
INIT_LIST_HEAD(&engine->contexts);
spin_lock_init(&engine->lock);
return 0;
}
drivers/gpu/drm/nouveau/nouveau_util.c → drivers/gpu/drm/nouveau/core/core/enum.c
View file @ 268d2837
...@@ -25,27 +25,8 @@ ...@@ -25,27 +25,8 @@
* *
*/ */
#include <linux/ratelimit.h> #include <core/os.h>
#include <core/enum.h>
#include "nouveau_util.h"
static DEFINE_RATELIMIT_STATE(nouveau_ratelimit_state, 3 * HZ, 20);
void
nouveau_bitfield_print(const struct nouveau_bitfield *bf, u32 value)
{
while (bf->name) {
if (value & bf->mask) {
printk(" %s", bf->name);
value &= ~bf->mask;
}
bf++;
}
if (value)
printk(" (unknown bits 0x%08x)", value);
}
const struct nouveau_enum * const struct nouveau_enum *
nouveau_enum_find(const struct nouveau_enum *en, u32 value) nouveau_enum_find(const struct nouveau_enum *en, u32 value)
...@@ -63,16 +44,24 @@ void ...@@ -63,16 +44,24 @@ void
nouveau_enum_print(const struct nouveau_enum *en, u32 value) nouveau_enum_print(const struct nouveau_enum *en, u32 value)
{ {
en = nouveau_enum_find(en, value); en = nouveau_enum_find(en, value);
if (en) { if (en)
printk("%s", en->name); printk("%s", en->name);
return; else
} printk("(unknown enum 0x%08x)", value);
printk("(unknown enum 0x%08x)", value);
} }
int void
nouveau_ratelimit(void) nouveau_bitfield_print(const struct nouveau_bitfield *bf, u32 value)
{ {
return __ratelimit(&nouveau_ratelimit_state); while (bf->name) {
if (value & bf->mask) {
printk(" %s", bf->name);
value &= ~bf->mask;
}
bf++;
}
if (value)
printk(" (unknown bits 0x%08x)", value);
} }
drivers/gpu/drm/nouveau/core/core/gpuobj.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/object.h>
#include <core/gpuobj.h>
#include <subdev/instmem.h>
#include <subdev/bar.h>
#include <subdev/vm.h>
void
nouveau_gpuobj_destroy(struct nouveau_gpuobj *gpuobj)
{
int i;
if (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE) {
for (i = 0; i < gpuobj->size; i += 4)
nv_wo32(gpuobj, i, 0x00000000);
}
if (gpuobj->heap.block_size)
nouveau_mm_fini(&gpuobj->heap);
nouveau_object_destroy(&gpuobj->base);
}
int
nouveau_gpuobj_create_(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, u32 pclass,
struct nouveau_object *pargpu,
u32 size, u32 align, u32 flags,
int length, void **pobject)
{
struct nouveau_instmem *imem = nouveau_instmem(parent);
struct nouveau_bar *bar = nouveau_bar(parent);
struct nouveau_gpuobj *gpuobj;
struct nouveau_mm *heap = NULL;
int ret, i;
u64 addr;
*pobject = NULL;
if (pargpu) {
while ((pargpu = nv_pclass(pargpu, NV_GPUOBJ_CLASS))) {
if (nv_gpuobj(pargpu)->heap.block_size)
break;
pargpu = pargpu->parent;
}
if (unlikely(pargpu == NULL)) {
nv_error(parent, "no gpuobj heap\n");
return -EINVAL;
}
addr = nv_gpuobj(pargpu)->addr;
heap = &nv_gpuobj(pargpu)->heap;
atomic_inc(&parent->refcount);
} else {
ret = imem->alloc(imem, parent, size, align, &parent);
pargpu = parent;
if (ret)
return ret;
addr = nv_memobj(pargpu)->addr;
size = nv_memobj(pargpu)->size;
if (bar && bar->alloc) {
struct nouveau_instobj *iobj = (void *)parent;
struct nouveau_mem **mem = (void *)(iobj + 1);
struct nouveau_mem *node = *mem;
if (!bar->alloc(bar, parent, node, &pargpu)) {
nouveau_object_ref(NULL, &parent);
parent = pargpu;
}
}
}
ret = nouveau_object_create_(parent, engine, oclass, pclass |
NV_GPUOBJ_CLASS, length, pobject);
nouveau_object_ref(NULL, &parent);
gpuobj = *pobject;
if (ret)
return ret;
gpuobj->parent = pargpu;
gpuobj->flags = flags;
gpuobj->addr = addr;
gpuobj->size = size;
if (heap) {
ret = nouveau_mm_head(heap, 1, size, size,
max(align, (u32)1), &gpuobj->node);
if (ret)
return ret;
gpuobj->addr += gpuobj->node->offset;
}
if (gpuobj->flags & NVOBJ_FLAG_HEAP) {
ret = nouveau_mm_init(&gpuobj->heap, 0, gpuobj->size, 1);
if (ret)
return ret;
}
if (flags & NVOBJ_FLAG_ZERO_ALLOC) {
for (i = 0; i < gpuobj->size; i += 4)
nv_wo32(gpuobj, i, 0x00000000);
}
return ret;
}
struct nouveau_gpuobj_class {
struct nouveau_object *pargpu;
u64 size;
u32 align;
u32 flags;
};
static int
_nouveau_gpuobj_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nouveau_gpuobj_class *args = data;
struct nouveau_gpuobj *object;
int ret;
ret = nouveau_gpuobj_create(parent, engine, oclass, 0, args->pargpu,
args->size, args->align, args->flags,
&object);
*pobject = nv_object(object);
if (ret)
return ret;
return 0;
}
void
_nouveau_gpuobj_dtor(struct nouveau_object *object)
{
nouveau_gpuobj_destroy(nv_gpuobj(object));
}
int
_nouveau_gpuobj_init(struct nouveau_object *object)
{
return nouveau_gpuobj_init(nv_gpuobj(object));
}
int
_nouveau_gpuobj_fini(struct nouveau_object *object, bool suspend)
{
return nouveau_gpuobj_fini(nv_gpuobj(object), suspend);
}
u32
_nouveau_gpuobj_rd32(struct nouveau_object *object, u32 addr)
{
struct nouveau_gpuobj *gpuobj = nv_gpuobj(object);
struct nouveau_ofuncs *pfuncs = nv_ofuncs(gpuobj->parent);
if (gpuobj->node)
addr += gpuobj->node->offset;
return pfuncs->rd32(gpuobj->parent, addr);
}
void
_nouveau_gpuobj_wr32(struct nouveau_object *object, u32 addr, u32 data)
{
struct nouveau_gpuobj *gpuobj = nv_gpuobj(object);
struct nouveau_ofuncs *pfuncs = nv_ofuncs(gpuobj->parent);
if (gpuobj->node)
addr += gpuobj->node->offset;
pfuncs->wr32(gpuobj->parent, addr, data);
}
static struct nouveau_oclass
_nouveau_gpuobj_oclass = {
.handle = 0x00000000,
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = _nouveau_gpuobj_ctor,
.dtor = _nouveau_gpuobj_dtor,
.init = _nouveau_gpuobj_init,
.fini = _nouveau_gpuobj_fini,
.rd32 = _nouveau_gpuobj_rd32,
.wr32 = _nouveau_gpuobj_wr32,
},
};
int
nouveau_gpuobj_new(struct nouveau_object *parent, struct nouveau_object *pargpu,
u32 size, u32 align, u32 flags,
struct nouveau_gpuobj **pgpuobj)
{
struct nouveau_object *engine = parent;
struct nouveau_gpuobj_class args = {
.pargpu = pargpu,
.size = size,
.align = align,
.flags = flags,
};
if (!nv_iclass(engine, NV_SUBDEV_CLASS))
engine = engine->engine;
BUG_ON(engine == NULL);
return nouveau_object_ctor(parent, engine, &_nouveau_gpuobj_oclass,
&args, sizeof(args),
(struct nouveau_object **)pgpuobj);
}
int
nouveau_gpuobj_map(struct nouveau_gpuobj *gpuobj, u32 access,
struct nouveau_vma *vma)
{
struct nouveau_bar *bar = nouveau_bar(gpuobj);
int ret = -EINVAL;
if (bar && bar->umap) {
struct nouveau_instobj *iobj = (void *)
nv_pclass(nv_object(gpuobj), NV_MEMOBJ_CLASS);
struct nouveau_mem **mem = (void *)(iobj + 1);
ret = bar->umap(bar, *mem, access, vma);
}
return ret;
}
int
nouveau_gpuobj_map_vm(struct nouveau_gpuobj *gpuobj, struct nouveau_vm *vm,
u32 access, struct nouveau_vma *vma)
{
struct nouveau_instobj *iobj = (void *)
nv_pclass(nv_object(gpuobj), NV_MEMOBJ_CLASS);
struct nouveau_mem **mem = (void *)(iobj + 1);
int ret;
ret = nouveau_vm_get(vm, gpuobj->size, 12, access, vma);
if (ret)
return ret;
nouveau_vm_map(vma, *mem);
return 0;
}
void
nouveau_gpuobj_unmap(struct nouveau_vma *vma)
{
if (vma->node) {
nouveau_vm_unmap(vma);
nouveau_vm_put(vma);
}
}
/* the below is basically only here to support sharing the paged dma object
* for PCI(E)GART on <=nv4x chipsets, and should *not* be expected to work
* anywhere else.
*/
static void
nouveau_gpudup_dtor(struct nouveau_object *object)
{
struct nouveau_gpuobj *gpuobj = (void *)object;
nouveau_object_ref(NULL, &gpuobj->parent);
nouveau_object_destroy(&gpuobj->base);
}
static struct nouveau_oclass
nouveau_gpudup_oclass = {
.handle = NV_GPUOBJ_CLASS,
.ofuncs = &(struct nouveau_ofuncs) {
.dtor = nouveau_gpudup_dtor,
.init = nouveau_object_init,
.fini = nouveau_object_fini,
},
};
int
nouveau_gpuobj_dup(struct nouveau_object *parent, struct nouveau_gpuobj *base,
struct nouveau_gpuobj **pgpuobj)
{
struct nouveau_gpuobj *gpuobj;
int ret;
ret = nouveau_object_create(parent, parent->engine,
&nouveau_gpudup_oclass, 0, &gpuobj);
*pgpuobj = gpuobj;
if (ret)
return ret;
nouveau_object_ref(nv_object(base), &gpuobj->parent);
gpuobj->addr = base->addr;
gpuobj->size = base->size;
return 0;
}
drivers/gpu/drm/nouveau/core/core/handle.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/object.h>
#include <core/handle.h>
#include <core/client.h>
#define hprintk(h,l,f,a...) do { \
struct nouveau_client *c = nouveau_client((h)->object); \
struct nouveau_handle *p = (h)->parent; u32 n = p ? p->name : ~0; \
nv_printk((c), l, "0x%08x:0x%08x "f, n, (h)->name, ##a); \
} while(0)
int
nouveau_handle_init(struct nouveau_handle *handle)
{
struct nouveau_handle *item;
int ret;
hprintk(handle, TRACE, "init running\n");
ret = nouveau_object_inc(handle->object);
if (ret)
return ret;
hprintk(handle, TRACE, "init children\n");
list_for_each_entry(item, &handle->tree, head) {
ret = nouveau_handle_init(item);
if (ret)
goto fail;
}
hprintk(handle, TRACE, "init completed\n");
return 0;
fail:
hprintk(handle, ERROR, "init failed with %d\n", ret);
list_for_each_entry_continue_reverse(item, &handle->tree, head) {
nouveau_handle_fini(item, false);
}
nouveau_object_dec(handle->object, false);
return ret;
}
int
nouveau_handle_fini(struct nouveau_handle *handle, bool suspend)
{
static char *name[2] = { "fini", "suspend" };
struct nouveau_handle *item;
int ret;
hprintk(handle, TRACE, "%s children\n", name[suspend]);
list_for_each_entry(item, &handle->tree, head) {
ret = nouveau_handle_fini(item, suspend);
if (ret && suspend)
goto fail;
}
hprintk(handle, TRACE, "%s running\n", name[suspend]);
if (handle->object) {
ret = nouveau_object_dec(handle->object, suspend);
if (ret && suspend)
goto fail;
}
hprintk(handle, TRACE, "%s completed\n", name[suspend]);
return 0;
fail:
hprintk(handle, ERROR, "%s failed with %d\n", name[suspend], ret);
list_for_each_entry_continue_reverse(item, &handle->tree, head) {
int rret = nouveau_handle_init(item);
if (rret)
hprintk(handle, FATAL, "failed to restart, %d\n", rret);
}
return ret;
}
int
nouveau_handle_create(struct nouveau_object *parent, u32 _parent, u32 _handle,
struct nouveau_object *object,
struct nouveau_handle **phandle)
{
struct nouveau_object *namedb;
struct nouveau_handle *handle;
int ret;
namedb = parent;
while (!nv_iclass(namedb, NV_NAMEDB_CLASS))
namedb = namedb->parent;
handle = *phandle = kzalloc(sizeof(*handle), GFP_KERNEL);
if (!handle)
return -ENOMEM;
INIT_LIST_HEAD(&handle->head);
INIT_LIST_HEAD(&handle->tree);
handle->name = _handle;
handle->priv = ~0;
ret = nouveau_namedb_insert(nv_namedb(namedb), _handle, object, handle);
if (ret) {
kfree(handle);
return ret;
}
if (nv_parent(parent)->object_attach) {
ret = nv_parent(parent)->object_attach(parent, object, _handle);
if (ret < 0) {
nouveau_handle_destroy(handle);
return ret;
}
handle->priv = ret;
}
if (object != namedb) {
while (!nv_iclass(namedb, NV_CLIENT_CLASS))
namedb = namedb->parent;
handle->parent = nouveau_namedb_get(nv_namedb(namedb), _parent);
if (handle->parent) {
list_add(&handle->head, &handle->parent->tree);
nouveau_namedb_put(handle->parent);
}
}
hprintk(handle, TRACE, "created\n");
return 0;
}
void
nouveau_handle_destroy(struct nouveau_handle *handle)
{
struct nouveau_handle *item, *temp;
hprintk(handle, TRACE, "destroy running\n");
list_for_each_entry_safe(item, temp, &handle->tree, head) {
nouveau_handle_destroy(item);
}
list_del(&handle->head);
if (handle->priv != ~0) {
struct nouveau_object *parent = handle->parent->object;
nv_parent(parent)->object_detach(parent, handle->priv);
}
hprintk(handle, TRACE, "destroy completed\n");
nouveau_namedb_remove(handle);
kfree(handle);
}
struct nouveau_object *
nouveau_handle_ref(struct nouveau_object *parent, u32 name)
{
struct nouveau_object *object = NULL;
struct nouveau_handle *handle;
while (!nv_iclass(parent, NV_NAMEDB_CLASS))
parent = parent->parent;
handle = nouveau_namedb_get(nv_namedb(parent), name);
if (handle) {
nouveau_object_ref(handle->object, &object);
nouveau_namedb_put(handle);
}
return object;
}
struct nouveau_handle *
nouveau_handle_get_class(struct nouveau_object *engctx, u16 oclass)
{
struct nouveau_namedb *namedb;
if (engctx && (namedb = (void *)nv_pclass(engctx, NV_NAMEDB_CLASS)))
return nouveau_namedb_get_class(namedb, oclass);
return NULL;
}
struct nouveau_handle *
nouveau_handle_get_vinst(struct nouveau_object *engctx, u64 vinst)
{
struct nouveau_namedb *namedb;
if (engctx && (namedb = (void *)nv_pclass(engctx, NV_NAMEDB_CLASS)))
return nouveau_namedb_get_vinst(namedb, vinst);
return NULL;
}
struct nouveau_handle *
nouveau_handle_get_cinst(struct nouveau_object *engctx, u32 cinst)
{
struct nouveau_namedb *namedb;
if (engctx && (namedb = (void *)nv_pclass(engctx, NV_NAMEDB_CLASS)))
return nouveau_namedb_get_cinst(namedb, cinst);
return NULL;
}
void
nouveau_handle_put(struct nouveau_handle *handle)
{
if (handle)
nouveau_namedb_put(handle);
}
drivers/gpu/drm/nouveau/nouveau_mm.c → drivers/gpu/drm/nouveau/core/core/mm.c
View file @ 268d2837
/* /*
* Copyright 2010 Red Hat Inc. * Copyright 2012 Red Hat Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
...@@ -22,20 +22,52 @@ ...@@ -22,20 +22,52 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include "drmP.h" #include "core/os.h"
#include "nouveau_drv.h" #include "core/mm.h"
#include "nouveau_mm.h"
static inline void #define node(root, dir) ((root)->nl_entry.dir == &mm->nodes) ? NULL : \
region_put(struct nouveau_mm *mm, struct nouveau_mm_node *a) list_entry((root)->nl_entry.dir, struct nouveau_mm_node, nl_entry)
void
nouveau_mm_free(struct nouveau_mm *mm, struct nouveau_mm_node **pthis)
{ {
list_del(&a->nl_entry); struct nouveau_mm_node *this = *pthis;
list_del(&a->fl_entry);
kfree(a); if (this) {
struct nouveau_mm_node *prev = node(this, prev);
struct nouveau_mm_node *next = node(this, next);
if (prev && prev->type == 0) {
prev->length += this->length;
list_del(&this->nl_entry);
kfree(this); this = prev;
}
if (next && next->type == 0) {
next->offset = this->offset;
next->length += this->length;
if (this->type == 0)
list_del(&this->fl_entry);
list_del(&this->nl_entry);
kfree(this); this = NULL;
}
if (this && this->type != 0) {
list_for_each_entry(prev, &mm->free, fl_entry) {
if (this->offset < prev->offset)
break;
}
list_add_tail(&this->fl_entry, &prev->fl_entry);
this->type = 0;
}
}
*pthis = NULL;
} }
static struct nouveau_mm_node * static struct nouveau_mm_node *
region_split(struct nouveau_mm *mm, struct nouveau_mm_node *a, u32 size) region_head(struct nouveau_mm *mm, struct nouveau_mm_node *a, u32 size)
{ {
struct nouveau_mm_node *b; struct nouveau_mm_node *b;
...@@ -57,38 +89,12 @@ region_split(struct nouveau_mm *mm, struct nouveau_mm_node *a, u32 size) ...@@ -57,38 +89,12 @@ region_split(struct nouveau_mm *mm, struct nouveau_mm_node *a, u32 size)
return b; return b;
} }
#define node(root, dir) ((root)->nl_entry.dir == &mm->nodes) ? NULL : \
list_entry((root)->nl_entry.dir, struct nouveau_mm_node, nl_entry)
void
nouveau_mm_put(struct nouveau_mm *mm, struct nouveau_mm_node *this)
{
struct nouveau_mm_node *prev = node(this, prev);
struct nouveau_mm_node *next = node(this, next);
list_add(&this->fl_entry, &mm->free);
this->type = 0;
if (prev && prev->type == 0) {
prev->length += this->length;
region_put(mm, this);
this = prev;
}
if (next && next->type == 0) {
next->offset = this->offset;
next->length += this->length;
region_put(mm, this);
}
}
int int
nouveau_mm_get(struct nouveau_mm *mm, int type, u32 size, u32 size_nc, nouveau_mm_head(struct nouveau_mm *mm, u8 type, u32 size_max, u32 size_min,
u32 align, struct nouveau_mm_node **pnode) u32 align, struct nouveau_mm_node **pnode)
{ {
struct nouveau_mm_node *prev, *this, *next; struct nouveau_mm_node *prev, *this, *next;
u32 min = size_nc ? size_nc : size; u32 mask = align - 1;
u32 align_mask = align - 1;
u32 splitoff; u32 splitoff;
u32 s, e; u32 s, e;
...@@ -104,16 +110,86 @@ nouveau_mm_get(struct nouveau_mm *mm, int type, u32 size, u32 size_nc, ...@@ -104,16 +110,86 @@ nouveau_mm_get(struct nouveau_mm *mm, int type, u32 size, u32 size_nc,
if (next && next->type != type) if (next && next->type != type)
e = rounddown(e, mm->block_size); e = rounddown(e, mm->block_size);
s = (s + align_mask) & ~align_mask; s = (s + mask) & ~mask;
e &= ~align_mask; e &= ~mask;
if (s > e || e - s < min) if (s > e || e - s < size_min)
continue; continue;
splitoff = s - this->offset; splitoff = s - this->offset;
if (splitoff && !region_split(mm, this, splitoff)) if (splitoff && !region_head(mm, this, splitoff))
return -ENOMEM;
this = region_head(mm, this, min(size_max, e - s));
if (!this)
return -ENOMEM;
this->type = type;
list_del(&this->fl_entry);
*pnode = this;
return 0;
}
return -ENOSPC;
}
static struct nouveau_mm_node *
region_tail(struct nouveau_mm *mm, struct nouveau_mm_node *a, u32 size)
{
struct nouveau_mm_node *b;
if (a->length == size)
return a;
b = kmalloc(sizeof(*b), GFP_KERNEL);
if (unlikely(b == NULL))
return NULL;
a->length -= size;
b->offset = a->offset + a->length;
b->length = size;
b->type = a->type;
list_add(&b->nl_entry, &a->nl_entry);
if (b->type == 0)
list_add(&b->fl_entry, &a->fl_entry);
return b;
}
int
nouveau_mm_tail(struct nouveau_mm *mm, u8 type, u32 size_max, u32 size_min,
u32 align, struct nouveau_mm_node **pnode)
{
struct nouveau_mm_node *prev, *this, *next;
u32 mask = align - 1;
list_for_each_entry_reverse(this, &mm->free, fl_entry) {
u32 e = this->offset + this->length;
u32 s = this->offset;
u32 c = 0, a;
prev = node(this, prev);
if (prev && prev->type != type)
s = roundup(s, mm->block_size);
next = node(this, next);
if (next && next->type != type) {
e = rounddown(e, mm->block_size);
c = next->offset - e;
}
s = (s + mask) & ~mask;
a = e - s;
if (s > e || a < size_min)
continue;
a = min(a, size_max);
s = (e - a) & ~mask;
c += (e - s) - a;
if (c && !region_tail(mm, this, c))
return -ENOMEM; return -ENOMEM;
this = region_split(mm, this, min(size, e - s)); this = region_tail(mm, this, a);
if (!this) if (!this)
return -ENOMEM; return -ENOMEM;
...@@ -148,6 +224,7 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block) ...@@ -148,6 +224,7 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block)
list_add_tail(&node->nl_entry, &mm->nodes); list_add_tail(&node->nl_entry, &mm->nodes);
list_add_tail(&node->fl_entry, &mm->free); list_add_tail(&node->fl_entry, &mm->free);
mm->heap_nodes++; mm->heap_nodes++;
mm->heap_size += length;
return 0; return 0;
} }
...@@ -159,15 +236,8 @@ nouveau_mm_fini(struct nouveau_mm *mm) ...@@ -159,15 +236,8 @@ nouveau_mm_fini(struct nouveau_mm *mm)
int nodes = 0; int nodes = 0;
list_for_each_entry(node, &mm->nodes, nl_entry) { list_for_each_entry(node, &mm->nodes, nl_entry) {
if (nodes++ == mm->heap_nodes) { if (nodes++ == mm->heap_nodes)
printk(KERN_ERR "nouveau_mm in use at destroy time!\n");
list_for_each_entry(node, &mm->nodes, nl_entry) {
printk(KERN_ERR "0x%02x: 0x%08x 0x%08x\n",
node->type, node->offset, node->length);
}
WARN_ON(1);
return -EBUSY; return -EBUSY;
}
} }
kfree(heap); kfree(heap);
......
drivers/gpu/drm/nouveau/core/core/namedb.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/object.h>
#include <core/namedb.h>
#include <core/handle.h>
#include <core/gpuobj.h>
static struct nouveau_handle *
nouveau_namedb_lookup(struct nouveau_namedb *namedb, u32 name)
{
struct nouveau_handle *handle;
list_for_each_entry(handle, &namedb->list, node) {
if (handle->name == name)
return handle;
}
return NULL;
}
static struct nouveau_handle *
nouveau_namedb_lookup_class(struct nouveau_namedb *namedb, u16 oclass)
{
struct nouveau_handle *handle;
list_for_each_entry(handle, &namedb->list, node) {
if (nv_mclass(handle->object) == oclass)
return handle;
}
return NULL;
}
static struct nouveau_handle *
nouveau_namedb_lookup_vinst(struct nouveau_namedb *namedb, u64 vinst)
{
struct nouveau_handle *handle;
list_for_each_entry(handle, &namedb->list, node) {
if (nv_iclass(handle->object, NV_GPUOBJ_CLASS)) {
if (nv_gpuobj(handle->object)->addr == vinst)
return handle;
}
}
return NULL;
}
static struct nouveau_handle *
nouveau_namedb_lookup_cinst(struct nouveau_namedb *namedb, u32 cinst)
{
struct nouveau_handle *handle;
list_for_each_entry(handle, &namedb->list, node) {
if (nv_iclass(handle->object, NV_GPUOBJ_CLASS)) {
if (nv_gpuobj(handle->object)->node &&
nv_gpuobj(handle->object)->node->offset == cinst)
return handle;
}
}
return NULL;
}
int
nouveau_namedb_insert(struct nouveau_namedb *namedb, u32 name,
struct nouveau_object *object,
struct nouveau_handle *handle)
{
int ret = -EEXIST;
write_lock_irq(&namedb->lock);
if (!nouveau_namedb_lookup(namedb, name)) {
nouveau_object_ref(object, &handle->object);
handle->namedb = namedb;
list_add(&handle->node, &namedb->list);
ret = 0;
}
write_unlock_irq(&namedb->lock);
return ret;
}
void
nouveau_namedb_remove(struct nouveau_handle *handle)
{
struct nouveau_namedb *namedb = handle->namedb;
struct nouveau_object *object = handle->object;
write_lock_irq(&namedb->lock);
list_del(&handle->node);
write_unlock_irq(&namedb->lock);
nouveau_object_ref(NULL, &object);
}
struct nouveau_handle *
nouveau_namedb_get(struct nouveau_namedb *namedb, u32 name)
{
struct nouveau_handle *handle;
read_lock(&namedb->lock);
handle = nouveau_namedb_lookup(namedb, name);
if (handle == NULL)
read_unlock(&namedb->lock);
return handle;
}
struct nouveau_handle *
nouveau_namedb_get_class(struct nouveau_namedb *namedb, u16 oclass)
{
struct nouveau_handle *handle;
read_lock(&namedb->lock);
handle = nouveau_namedb_lookup_class(namedb, oclass);
if (handle == NULL)
read_unlock(&namedb->lock);
return handle;
}
struct nouveau_handle *
nouveau_namedb_get_vinst(struct nouveau_namedb *namedb, u64 vinst)
{
struct nouveau_handle *handle;
read_lock(&namedb->lock);
handle = nouveau_namedb_lookup_vinst(namedb, vinst);
if (handle == NULL)
read_unlock(&namedb->lock);
return handle;
}
struct nouveau_handle *
nouveau_namedb_get_cinst(struct nouveau_namedb *namedb, u32 cinst)
{
struct nouveau_handle *handle;
read_lock(&namedb->lock);
handle = nouveau_namedb_lookup_cinst(namedb, cinst);
if (handle == NULL)
read_unlock(&namedb->lock);
return handle;
}
void
nouveau_namedb_put(struct nouveau_handle *handle)
{
if (handle)
read_unlock(&handle->namedb->lock);
}
int
nouveau_namedb_create_(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, u32 pclass,
struct nouveau_oclass *sclass, u32 engcls,
int length, void **pobject)
{
struct nouveau_namedb *namedb;
int ret;
ret = nouveau_parent_create_(parent, engine, oclass, pclass |
NV_NAMEDB_CLASS, sclass, engcls,
length, pobject);
namedb = *pobject;
if (ret)
return ret;
rwlock_init(&namedb->lock);
INIT_LIST_HEAD(&namedb->list);
return 0;
}
int
_nouveau_namedb_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nouveau_namedb *object;
int ret;
ret = nouveau_namedb_create(parent, engine, oclass, 0, NULL, 0, &object);
*pobject = nv_object(object);
if (ret)
return ret;
return 0;
}
drivers/gpu/drm/nouveau/core/core/object.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/core/option.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/option.h>
#include <core/debug.h>
/* compares unterminated string 'str' with zero-terminated string 'cmp' */
static inline int
strncasecmpz(const char *str, const char *cmp, size_t len)
{
if (strlen(cmp) != len)
return len;
return strncasecmp(str, cmp, len);
}
const char *
nouveau_stropt(const char *optstr, const char *opt, int *arglen)
{
while (optstr && *optstr != '\0') {
int len = strcspn(optstr, ",=");
switch (optstr[len]) {
case '=':
if (!strncasecmpz(optstr, opt, len)) {
optstr += len + 1;
*arglen = strcspn(optstr, ",=");
return *arglen ? optstr : NULL;
}
optstr++;
break;
case ',':
optstr++;
break;
default:
break;
}
optstr += len;
}
return NULL;
}
bool
nouveau_boolopt(const char *optstr, const char *opt, bool value)
{
int arglen;
optstr = nouveau_stropt(optstr, opt, &arglen);
if (optstr) {
if (!strncasecmpz(optstr, "0", arglen) ||
!strncasecmpz(optstr, "no", arglen) ||
!strncasecmpz(optstr, "off", arglen) ||
!strncasecmpz(optstr, "false", arglen))
value = false;
else
if (!strncasecmpz(optstr, "1", arglen) ||
!strncasecmpz(optstr, "yes", arglen) ||
!strncasecmpz(optstr, "on", arglen) ||
!strncasecmpz(optstr, "true", arglen))
value = true;
}
return value;
}
int
nouveau_dbgopt(const char *optstr, const char *sub)
{
int mode = 1, level = CONFIG_NOUVEAU_DEBUG_DEFAULT;
while (optstr) {
int len = strcspn(optstr, ",=");
switch (optstr[len]) {
case '=':
if (strncasecmpz(optstr, sub, len))
mode = 0;
optstr++;
break;
default:
if (mode) {
if (!strncasecmpz(optstr, "fatal", len))
level = NV_DBG_FATAL;
else if (!strncasecmpz(optstr, "error", len))
level = NV_DBG_ERROR;
else if (!strncasecmpz(optstr, "warn", len))
level = NV_DBG_WARN;
else if (!strncasecmpz(optstr, "info", len))
level = NV_DBG_INFO;
else if (!strncasecmpz(optstr, "debug", len))
level = NV_DBG_DEBUG;
else if (!strncasecmpz(optstr, "trace", len))
level = NV_DBG_TRACE;
else if (!strncasecmpz(optstr, "paranoia", len))
level = NV_DBG_PARANOIA;
else if (!strncasecmpz(optstr, "spam", len))
level = NV_DBG_SPAM;
}
if (optstr[len] != '\0') {
optstr++;
mode = 1;
break;
}
return level;
}
optstr += len;
}
return level;
}
drivers/gpu/drm/nouveau/core/core/parent.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/object.h>
#include <core/parent.h>
int
nouveau_parent_sclass(struct nouveau_object *parent, u16 handle,
struct nouveau_object **pengine,
struct nouveau_oclass **poclass)
{
struct nouveau_sclass *sclass;
struct nouveau_engine *engine;
struct nouveau_oclass *oclass;
u64 mask;
sclass = nv_parent(parent)->sclass;
while (sclass) {
if ((sclass->oclass->handle & 0xffff) == handle) {
*pengine = parent->engine;
*poclass = sclass->oclass;
return 0;
}
sclass = sclass->sclass;
}
mask = nv_parent(parent)->engine;
while (mask) {
int i = ffsll(mask) - 1;
if ((engine = nouveau_engine(parent, i))) {
oclass = engine->sclass;
while (oclass->ofuncs) {
if ((oclass->handle & 0xffff) == handle) {
*pengine = nv_object(engine);
*poclass = oclass;
return 0;
}
oclass++;
}
}
mask &= ~(1ULL << i);
}
return -EINVAL;
}
int
nouveau_parent_create_(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, u32 pclass,
struct nouveau_oclass *sclass, u64 engcls,
int size, void **pobject)
{
struct nouveau_parent *object;
struct nouveau_sclass *nclass;
int ret;
ret = nouveau_object_create_(parent, engine, oclass, pclass |
NV_PARENT_CLASS, size, pobject);
object = *pobject;
if (ret)
return ret;
while (sclass && sclass->ofuncs) {
nclass = kzalloc(sizeof(*nclass), GFP_KERNEL);
if (!nclass)
return -ENOMEM;
nclass->sclass = object->sclass;
object->sclass = nclass;
nclass->engine = engine ? nv_engine(engine) : NULL;
nclass->oclass = sclass;
sclass++;
}
object->engine = engcls;
return 0;
}
int
_nouveau_parent_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nouveau_parent *object;
int ret;
ret = nouveau_parent_create(parent, engine, oclass, 0, NULL, 0, &object);
*pobject = nv_object(object);
if (ret)
return ret;
return 0;
}
void
nouveau_parent_destroy(struct nouveau_parent *parent)
{
struct nouveau_sclass *sclass;
while ((sclass = parent->sclass)) {
parent->sclass = sclass->sclass;
kfree(sclass);
}
nouveau_object_destroy(&parent->base);
}
void
_nouveau_parent_dtor(struct nouveau_object *object)
{
nouveau_parent_destroy(nv_parent(object));
}
drivers/gpu/drm/nouveau/nouveau_mm.h → drivers/gpu/drm/nouveau/core/core/printk.c
View file @ 268d2837
/* /*
* Copyright 2010 Red Hat Inc. * Copyright 2012 Red Hat Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
...@@ -22,46 +22,53 @@ ...@@ -22,46 +22,53 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#ifndef __NOUVEAU_REGION_H__ #include <core/object.h>
#define __NOUVEAU_REGION_H__ #include <core/client.h>
#include <core/subdev.h>
#include <core/printk.h>
struct nouveau_mm_node { void
struct list_head nl_entry; nv_printk_(struct nouveau_object *object, const char *pfx, int level,
struct list_head fl_entry; const char *fmt, ...)
struct list_head rl_entry; {
static const char name[] = { '!', 'E', 'W', ' ', 'D', 'T', 'P', 'S' };
char mfmt[256];
va_list args;
u8 type; if (object && !nv_iclass(object, NV_CLIENT_CLASS)) {
u32 offset; struct nouveau_object *device = object;
u32 length; struct nouveau_object *subdev = object;
}; char obuf[64], *ofmt = "";
struct nouveau_mm { if (object->engine) {
struct list_head nodes; snprintf(obuf, sizeof(obuf), "[0x%08x][%p]",
struct list_head free; nv_hclass(object), object);
ofmt = obuf;
subdev = object->engine;
device = object->engine;
}
struct mutex mutex; if (subdev->parent)
device = subdev->parent;
u32 block_size; if (level > nv_subdev(subdev)->debug)
int heap_nodes; return;
};
int nouveau_mm_init(struct nouveau_mm *, u32 offset, u32 length, u32 block); snprintf(mfmt, sizeof(mfmt), "%snouveau %c[%8s][%s]%s %s", pfx,
int nouveau_mm_fini(struct nouveau_mm *); name[level], nv_subdev(subdev)->name,
int nouveau_mm_pre(struct nouveau_mm *); nv_device(device)->name, ofmt, fmt);
int nouveau_mm_get(struct nouveau_mm *, int type, u32 size, u32 size_nc, } else
u32 align, struct nouveau_mm_node **); if (object && nv_iclass(object, NV_CLIENT_CLASS)) {
void nouveau_mm_put(struct nouveau_mm *, struct nouveau_mm_node *); if (level > nv_client(object)->debug)
return;
int nv50_vram_init(struct drm_device *); snprintf(mfmt, sizeof(mfmt), "%snouveau %c[%8s] %s", pfx,
void nv50_vram_fini(struct drm_device *); name[level], nv_client(object)->name, fmt);
int nv50_vram_new(struct drm_device *, u64 size, u32 align, u32 size_nc, } else {
u32 memtype, struct nouveau_mem **); snprintf(mfmt, sizeof(mfmt), "%snouveau: %s", pfx, fmt);
void nv50_vram_del(struct drm_device *, struct nouveau_mem **); }
bool nv50_vram_flags_valid(struct drm_device *, u32 tile_flags);
int nvc0_vram_init(struct drm_device *); va_start(args, fmt);
int nvc0_vram_new(struct drm_device *, u64 size, u32 align, u32 ncmin, vprintk(mfmt, args);
u32 memtype, struct nouveau_mem **); va_end(args);
bool nvc0_vram_flags_valid(struct drm_device *, u32 tile_flags); }
#endif
drivers/gpu/drm/nouveau/core/core/ramht.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 <core/object.h>
#include <core/ramht.h>
#include <core/math.h>
#include <subdev/bar.h>
static u32
nouveau_ramht_hash(struct nouveau_ramht *ramht, int chid, u32 handle)
{
u32 hash = 0;
while (handle) {
hash ^= (handle & ((1 << ramht->bits) - 1));
handle >>= ramht->bits;
}
hash ^= chid << (ramht->bits - 4);
hash = hash << 3;
return hash;
}
int
nouveau_ramht_insert(struct nouveau_ramht *ramht, int chid,
u32 handle, u32 context)
{
struct nouveau_bar *bar = nouveau_bar(ramht);
u32 co, ho;
co = ho = nouveau_ramht_hash(ramht, chid, handle);
do {
if (!nv_ro32(ramht, co + 4)) {
nv_wo32(ramht, co + 0, handle);
nv_wo32(ramht, co + 4, context);
if (bar)
bar->flush(bar);
return co;
}
co += 8;
if (co >= nv_gpuobj(ramht)->size)
co = 0;
} while (co != ho);
return -ENOMEM;
}
void
nouveau_ramht_remove(struct nouveau_ramht *ramht, int cookie)
{
struct nouveau_bar *bar = nouveau_bar(ramht);
nv_wo32(ramht, cookie + 0, 0x00000000);
nv_wo32(ramht, cookie + 4, 0x00000000);
if (bar)
bar->flush(bar);
}
static struct nouveau_oclass
nouveau_ramht_oclass = {
.handle = 0x0000abcd,
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = NULL,
.dtor = _nouveau_gpuobj_dtor,
.init = _nouveau_gpuobj_init,
.fini = _nouveau_gpuobj_fini,
.rd32 = _nouveau_gpuobj_rd32,
.wr32 = _nouveau_gpuobj_wr32,
},
};
int
nouveau_ramht_new(struct nouveau_object *parent, struct nouveau_object *pargpu,
u32 size, u32 align, struct nouveau_ramht **pramht)
{
struct nouveau_ramht *ramht;
int ret;
ret = nouveau_gpuobj_create(parent, parent->engine ?
parent->engine : parent, /* <nv50 ramht */
&nouveau_ramht_oclass, 0, pargpu, size,
align, NVOBJ_FLAG_ZERO_ALLOC, &ramht);
*pramht = ramht;
if (ret)
return ret;
ramht->bits = log2i(nv_gpuobj(ramht)->size >> 3);
return 0;
}
drivers/gpu/drm/nouveau/core/core/subdev.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/object.h>
#include <core/subdev.h>
#include <core/device.h>
#include <core/option.h>
void
nouveau_subdev_reset(struct nouveau_object *subdev)
{
nv_trace(subdev, "resetting...\n");
nv_ofuncs(subdev)->fini(subdev, false);
nv_debug(subdev, "reset\n");
}
int
nouveau_subdev_init(struct nouveau_subdev *subdev)
{
int ret = nouveau_object_init(&subdev->base);
if (ret)
return ret;
nouveau_subdev_reset(&subdev->base);
return 0;
}
int
_nouveau_subdev_init(struct nouveau_object *object)
{
return nouveau_subdev_init(nv_subdev(object));
}
int
nouveau_subdev_fini(struct nouveau_subdev *subdev, bool suspend)
{
if (subdev->unit) {
nv_mask(subdev, 0x000200, subdev->unit, 0x00000000);
nv_mask(subdev, 0x000200, subdev->unit, subdev->unit);
}
return nouveau_object_fini(&subdev->base, suspend);
}
int
_nouveau_subdev_fini(struct nouveau_object *object, bool suspend)
{
return nouveau_subdev_fini(nv_subdev(object), suspend);
}
void
nouveau_subdev_destroy(struct nouveau_subdev *subdev)
{
int subidx = nv_hclass(subdev) & 0xff;
nv_device(subdev)->subdev[subidx] = NULL;
nouveau_object_destroy(&subdev->base);
}
void
_nouveau_subdev_dtor(struct nouveau_object *object)
{
nouveau_subdev_destroy(nv_subdev(object));
}
int
nouveau_subdev_create_(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, u32 pclass,
const char *subname, const char *sysname,
int size, void **pobject)
{
struct nouveau_subdev *subdev;
int ret;
ret = nouveau_object_create_(parent, engine, oclass, pclass |
NV_SUBDEV_CLASS, size, pobject);
subdev = *pobject;
if (ret)
return ret;
mutex_init(&subdev->mutex);
subdev->name = subname;
if (parent) {
struct nouveau_device *device = nv_device(parent);
int subidx = nv_hclass(subdev) & 0xff;
subdev->debug = nouveau_dbgopt(device->dbgopt, subname);
subdev->mmio = nv_subdev(device)->mmio;
device->subdev[subidx] = *pobject;
}
return 0;
}
drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/os.h>
#include <core/class.h>
#include <core/engctx.h>
#include <engine/bsp.h>
struct nv84_bsp_priv {
struct nouveau_bsp base;
};
struct nv84_bsp_chan {
struct nouveau_bsp_chan base;
};
/*******************************************************************************
* BSP object classes
******************************************************************************/
static struct nouveau_oclass
nv84_bsp_sclass[] = {
{},
};
/*******************************************************************************
* BSP context
******************************************************************************/
static int
nv84_bsp_context_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv84_bsp_chan *priv;
int ret;
ret = nouveau_bsp_context_create(parent, engine, oclass, NULL,
0, 0, 0, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
return 0;
}
static void
nv84_bsp_context_dtor(struct nouveau_object *object)
{
struct nv84_bsp_chan *priv = (void *)object;
nouveau_bsp_context_destroy(&priv->base);
}
static int
nv84_bsp_context_init(struct nouveau_object *object)
{
struct nv84_bsp_chan *priv = (void *)object;
int ret;
ret = nouveau_bsp_context_init(&priv->base);
if (ret)
return ret;
return 0;
}
static int
nv84_bsp_context_fini(struct nouveau_object *object, bool suspend)
{
struct nv84_bsp_chan *priv = (void *)object;
return nouveau_bsp_context_fini(&priv->base, suspend);
}
static struct nouveau_oclass
nv84_bsp_cclass = {
.handle = NV_ENGCTX(BSP, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_bsp_context_ctor,
.dtor = nv84_bsp_context_dtor,
.init = nv84_bsp_context_init,
.fini = nv84_bsp_context_fini,
.rd32 = _nouveau_bsp_context_rd32,
.wr32 = _nouveau_bsp_context_wr32,
},
};
/*******************************************************************************
* BSP engine/subdev functions
******************************************************************************/
static void
nv84_bsp_intr(struct nouveau_subdev *subdev)
{
}
static int
nv84_bsp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv84_bsp_priv *priv;
int ret;
ret = nouveau_bsp_create(parent, engine, oclass, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_subdev(priv)->unit = 0x04008000;
nv_subdev(priv)->intr = nv84_bsp_intr;
nv_engine(priv)->cclass = &nv84_bsp_cclass;
nv_engine(priv)->sclass = nv84_bsp_sclass;
return 0;
}
static void
nv84_bsp_dtor(struct nouveau_object *object)
{
struct nv84_bsp_priv *priv = (void *)object;
nouveau_bsp_destroy(&priv->base);
}
static int
nv84_bsp_init(struct nouveau_object *object)
{
struct nv84_bsp_priv *priv = (void *)object;
int ret;
ret = nouveau_bsp_init(&priv->base);
if (ret)
return ret;
return 0;
}
static int
nv84_bsp_fini(struct nouveau_object *object, bool suspend)
{
struct nv84_bsp_priv *priv = (void *)object;
return nouveau_bsp_fini(&priv->base, suspend);
}
struct nouveau_oclass
nv84_bsp_oclass = {
.handle = NV_ENGINE(BSP, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_bsp_ctor,
.dtor = nv84_bsp_dtor,
.init = nv84_bsp_init,
.fini = nv84_bsp_fini,
},
};
drivers/gpu/drm/nouveau/nva3_copy.fuc.h → drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h
View file @ 268d2837
u32 nva3_pcopy_data[] = { static u32 nva3_pcopy_data[] = {
/* 0x0000: ctx_object */ /* 0x0000: ctx_object */
0x00000000, 0x00000000,
/* 0x0004: ctx_dma */ /* 0x0004: ctx_dma */
...@@ -183,7 +183,7 @@ u32 nva3_pcopy_data[] = { ...@@ -183,7 +183,7 @@ u32 nva3_pcopy_data[] = {
0x00000800, 0x00000800,
}; };
u32 nva3_pcopy_code[] = { static u32 nva3_pcopy_code[] = {
/* 0x0000: main */ /* 0x0000: main */
0x04fe04bd, 0x04fe04bd,
0x3517f000, 0x3517f000,
......
drivers/gpu/drm/nouveau/nvc0_copy.fuc.h → drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h
View file @ 268d2837
u32 nvc0_pcopy_data[] = { static u32 nvc0_pcopy_data[] = {
/* 0x0000: ctx_object */ /* 0x0000: ctx_object */
0x00000000, 0x00000000,
/* 0x0004: ctx_query_address_high */ /* 0x0004: ctx_query_address_high */
...@@ -171,7 +171,7 @@ u32 nvc0_pcopy_data[] = { ...@@ -171,7 +171,7 @@ u32 nvc0_pcopy_data[] = {
0x00000800, 0x00000800,
}; };
u32 nvc0_pcopy_code[] = { static u32 nvc0_pcopy_code[] = {
/* 0x0000: main */ /* 0x0000: main */
0x04fe04bd, 0x04fe04bd,
0x3517f000, 0x3517f000,
......
drivers/gpu/drm/nouveau/core/engine/copy/nva3.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/os.h>
#include <core/enum.h>
#include <core/class.h>
#include <core/engctx.h>
#include <subdev/fb.h>
#include <subdev/vm.h>
#include <engine/fifo.h>
#include <engine/copy.h>
#include "fuc/nva3.fuc.h"
struct nva3_copy_priv {
struct nouveau_copy base;
};
struct nva3_copy_chan {
struct nouveau_copy_chan base;
};
/*******************************************************************************
* Copy object classes
******************************************************************************/
static struct nouveau_oclass
nva3_copy_sclass[] = {
{ 0x85b5, &nouveau_object_ofuncs },
{}
};
/*******************************************************************************
* PCOPY context
******************************************************************************/
static int
nva3_copy_context_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nva3_copy_chan *priv;
int ret;
ret = nouveau_copy_context_create(parent, engine, oclass, NULL, 256, 0,
NVOBJ_FLAG_ZERO_ALLOC, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
return 0;
}
static struct nouveau_oclass
nva3_copy_cclass = {
.handle = NV_ENGCTX(COPY0, 0xa3),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nva3_copy_context_ctor,
.dtor = _nouveau_copy_context_dtor,
.init = _nouveau_copy_context_init,
.fini = _nouveau_copy_context_fini,
.rd32 = _nouveau_copy_context_rd32,
.wr32 = _nouveau_copy_context_wr32,
},
};
/*******************************************************************************
* PCOPY engine/subdev functions
******************************************************************************/
static const struct nouveau_enum nva3_copy_isr_error_name[] = {
{ 0x0001, "ILLEGAL_MTHD" },
{ 0x0002, "INVALID_ENUM" },
{ 0x0003, "INVALID_BITFIELD" },
{}
};
static void
nva3_copy_intr(struct nouveau_subdev *subdev)
{
struct nouveau_fifo *pfifo = nouveau_fifo(subdev);
struct nouveau_engine *engine = nv_engine(subdev);
struct nouveau_object *engctx;
struct nva3_copy_priv *priv = (void *)subdev;
u32 dispatch = nv_rd32(priv, 0x10401c);
u32 stat = nv_rd32(priv, 0x104008) & dispatch & ~(dispatch >> 16);
u64 inst = nv_rd32(priv, 0x104050) & 0x3fffffff;
u32 ssta = nv_rd32(priv, 0x104040) & 0x0000ffff;
u32 addr = nv_rd32(priv, 0x104040) >> 16;
u32 mthd = (addr & 0x07ff) << 2;
u32 subc = (addr & 0x3800) >> 11;
u32 data = nv_rd32(priv, 0x104044);
int chid;
engctx = nouveau_engctx_get(engine, inst);
chid = pfifo->chid(pfifo, engctx);
if (stat & 0x00000040) {
nv_error(priv, "DISPATCH_ERROR [");
nouveau_enum_print(nva3_copy_isr_error_name, ssta);
printk("] ch %d [0x%010llx] subc %d mthd 0x%04x data 0x%08x\n",
chid, inst << 12, subc, mthd, data);
nv_wr32(priv, 0x104004, 0x00000040);
stat &= ~0x00000040;
}
if (stat) {
nv_error(priv, "unhandled intr 0x%08x\n", stat);
nv_wr32(priv, 0x104004, stat);
}
nv50_fb_trap(nouveau_fb(priv), 1);
nouveau_engctx_put(engctx);
}
static int
nva3_copy_tlb_flush(struct nouveau_engine *engine)
{
nv50_vm_flush_engine(&engine->base, 0x0d);
return 0;
}
static int
nva3_copy_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
bool enable = (nv_device(parent)->chipset != 0xaf);
struct nva3_copy_priv *priv;
int ret;
ret = nouveau_copy_create(parent, engine, oclass, enable, 0, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_subdev(priv)->unit = 0x00802000;
nv_subdev(priv)->intr = nva3_copy_intr;
nv_engine(priv)->cclass = &nva3_copy_cclass;
nv_engine(priv)->sclass = nva3_copy_sclass;
nv_engine(priv)->tlb_flush = nva3_copy_tlb_flush;
return 0;
}
static int
nva3_copy_init(struct nouveau_object *object)
{
struct nva3_copy_priv *priv = (void *)object;
int ret, i;
ret = nouveau_copy_init(&priv->base);
if (ret)
return ret;
/* disable all interrupts */
nv_wr32(priv, 0x104014, 0xffffffff);
/* upload ucode */
nv_wr32(priv, 0x1041c0, 0x01000000);
for (i = 0; i < sizeof(nva3_pcopy_data) / 4; i++)
nv_wr32(priv, 0x1041c4, nva3_pcopy_data[i]);
nv_wr32(priv, 0x104180, 0x01000000);
for (i = 0; i < sizeof(nva3_pcopy_code) / 4; i++) {
if ((i & 0x3f) == 0)
nv_wr32(priv, 0x104188, i >> 6);
nv_wr32(priv, 0x104184, nva3_pcopy_code[i]);
}
/* start it running */
nv_wr32(priv, 0x10410c, 0x00000000);
nv_wr32(priv, 0x104104, 0x00000000); /* ENTRY */
nv_wr32(priv, 0x104100, 0x00000002); /* TRIGGER */
return 0;
}
static int
nva3_copy_fini(struct nouveau_object *object, bool suspend)
{
struct nva3_copy_priv *priv = (void *)object;
nv_mask(priv, 0x104048, 0x00000003, 0x00000000);
nv_wr32(priv, 0x104014, 0xffffffff);
return nouveau_copy_fini(&priv->base, suspend);
}
struct nouveau_oclass
nva3_copy_oclass = {
.handle = NV_ENGINE(COPY0, 0xa3),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nva3_copy_ctor,
.dtor = _nouveau_copy_dtor,
.init = nva3_copy_init,
.fini = nva3_copy_fini,
},
};
drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/os.h>
#include <core/enum.h>
#include <core/class.h>
#include <core/engctx.h>
#include <engine/fifo.h>
#include <engine/copy.h>
#include "fuc/nvc0.fuc.h"
struct nvc0_copy_priv {
struct nouveau_copy base;
};
struct nvc0_copy_chan {
struct nouveau_copy_chan base;
};
/*******************************************************************************
* Copy object classes
******************************************************************************/
static struct nouveau_oclass
nvc0_copy0_sclass[] = {
{ 0x90b5, &nouveau_object_ofuncs },
{},
};
static struct nouveau_oclass
nvc0_copy1_sclass[] = {
{ 0x90b8, &nouveau_object_ofuncs },
{},
};
/*******************************************************************************
* PCOPY context
******************************************************************************/
static int
nvc0_copy_context_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nvc0_copy_chan *priv;
int ret;
ret = nouveau_copy_context_create(parent, engine, oclass, NULL, 256,
256, NVOBJ_FLAG_ZERO_ALLOC, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
return 0;
}
static struct nouveau_ofuncs
nvc0_copy_context_ofuncs = {
.ctor = nvc0_copy_context_ctor,
.dtor = _nouveau_copy_context_dtor,
.init = _nouveau_copy_context_init,
.fini = _nouveau_copy_context_fini,
.rd32 = _nouveau_copy_context_rd32,
.wr32 = _nouveau_copy_context_wr32,
};
static struct nouveau_oclass
nvc0_copy0_cclass = {
.handle = NV_ENGCTX(COPY0, 0xc0),
.ofuncs = &nvc0_copy_context_ofuncs,
};
static struct nouveau_oclass
nvc0_copy1_cclass = {
.handle = NV_ENGCTX(COPY1, 0xc0),
.ofuncs = &nvc0_copy_context_ofuncs,
};
/*******************************************************************************
* PCOPY engine/subdev functions
******************************************************************************/
static const struct nouveau_enum nvc0_copy_isr_error_name[] = {
{ 0x0001, "ILLEGAL_MTHD" },
{ 0x0002, "INVALID_ENUM" },
{ 0x0003, "INVALID_BITFIELD" },
{}
};
static void
nvc0_copy_intr(struct nouveau_subdev *subdev)
{
struct nouveau_fifo *pfifo = nouveau_fifo(subdev);
struct nouveau_engine *engine = nv_engine(subdev);
struct nouveau_object *engctx;
int idx = nv_engidx(nv_object(subdev)) - NVDEV_ENGINE_COPY0;
struct nvc0_copy_priv *priv = (void *)subdev;
u32 disp = nv_rd32(priv, 0x10401c + (idx * 0x1000));
u32 intr = nv_rd32(priv, 0x104008 + (idx * 0x1000));
u32 stat = intr & disp & ~(disp >> 16);
u64 inst = nv_rd32(priv, 0x104050 + (idx * 0x1000)) & 0x0fffffff;
u32 ssta = nv_rd32(priv, 0x104040 + (idx * 0x1000)) & 0x0000ffff;
u32 addr = nv_rd32(priv, 0x104040 + (idx * 0x1000)) >> 16;
u32 mthd = (addr & 0x07ff) << 2;
u32 subc = (addr & 0x3800) >> 11;
u32 data = nv_rd32(priv, 0x104044 + (idx * 0x1000));
int chid;
engctx = nouveau_engctx_get(engine, inst);
chid = pfifo->chid(pfifo, engctx);
if (stat & 0x00000040) {
nv_error(priv, "DISPATCH_ERROR [");
nouveau_enum_print(nvc0_copy_isr_error_name, ssta);
printk("] ch %d [0x%010llx] subc %d mthd 0x%04x data 0x%08x\n",
chid, (u64)inst << 12, subc, mthd, data);
nv_wr32(priv, 0x104004 + (idx * 0x1000), 0x00000040);
stat &= ~0x00000040;
}
if (stat) {
nv_error(priv, "unhandled intr 0x%08x\n", stat);
nv_wr32(priv, 0x104004 + (idx * 0x1000), stat);
}
nouveau_engctx_put(engctx);
}
static int
nvc0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nvc0_copy_priv *priv;
int ret;
if (nv_rd32(parent, 0x022500) & 0x00000100)
return -ENODEV;
ret = nouveau_copy_create(parent, engine, oclass, true, 0, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_subdev(priv)->unit = 0x00000040;
nv_subdev(priv)->intr = nvc0_copy_intr;
nv_engine(priv)->cclass = &nvc0_copy0_cclass;
nv_engine(priv)->sclass = nvc0_copy0_sclass;
return 0;
}
static int
nvc0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nvc0_copy_priv *priv;
int ret;
if (nv_rd32(parent, 0x022500) & 0x00000200)
return -ENODEV;
ret = nouveau_copy_create(parent, engine, oclass, true, 1, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_subdev(priv)->unit = 0x00000080;
nv_subdev(priv)->intr = nvc0_copy_intr;
nv_engine(priv)->cclass = &nvc0_copy1_cclass;
nv_engine(priv)->sclass = nvc0_copy1_sclass;
return 0;
}
static int
nvc0_copy_init(struct nouveau_object *object)
{
int idx = nv_engidx(object) - NVDEV_ENGINE_COPY0;
struct nvc0_copy_priv *priv = (void *)object;
int ret, i;
ret = nouveau_copy_init(&priv->base);
if (ret)
return ret;
/* disable all interrupts */
nv_wr32(priv, 0x104014 + (idx * 0x1000), 0xffffffff);
/* upload ucode */
nv_wr32(priv, 0x1041c0 + (idx * 0x1000), 0x01000000);
for (i = 0; i < sizeof(nvc0_pcopy_data) / 4; i++)
nv_wr32(priv, 0x1041c4 + (idx * 0x1000), nvc0_pcopy_data[i]);
nv_wr32(priv, 0x104180 + (idx * 0x1000), 0x01000000);
for (i = 0; i < sizeof(nvc0_pcopy_code) / 4; i++) {
if ((i & 0x3f) == 0)
nv_wr32(priv, 0x104188 + (idx * 0x1000), i >> 6);
nv_wr32(priv, 0x104184 + (idx * 0x1000), nvc0_pcopy_code[i]);
}
/* start it running */
nv_wr32(priv, 0x104084 + (idx * 0x1000), idx);
nv_wr32(priv, 0x10410c + (idx * 0x1000), 0x00000000);
nv_wr32(priv, 0x104104 + (idx * 0x1000), 0x00000000); /* ENTRY */
nv_wr32(priv, 0x104100 + (idx * 0x1000), 0x00000002); /* TRIGGER */
return 0;
}
static int
nvc0_copy_fini(struct nouveau_object *object, bool suspend)
{
int idx = nv_engidx(object) - NVDEV_ENGINE_COPY0;
struct nvc0_copy_priv *priv = (void *)object;
nv_mask(priv, 0x104048 + (idx * 0x1000), 0x00000003, 0x00000000);
nv_wr32(priv, 0x104014 + (idx * 0x1000), 0xffffffff);
return nouveau_copy_fini(&priv->base, suspend);
}
struct nouveau_oclass
nvc0_copy0_oclass = {
.handle = NV_ENGINE(COPY0, 0xc0),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nvc0_copy0_ctor,
.dtor = _nouveau_copy_dtor,
.init = nvc0_copy_init,
.fini = nvc0_copy_fini,
},
};
struct nouveau_oclass
nvc0_copy1_oclass = {
.handle = NV_ENGINE(COPY1, 0xc0),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nvc0_copy1_ctor,
.dtor = _nouveau_copy_dtor,
.init = nvc0_copy_init,
.fini = nvc0_copy_fini,
},
};
drivers/gpu/drm/nouveau/core/engine/copy/nve0.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/os.h>
#include <core/enum.h>
#include <core/class.h>
#include <core/engctx.h>
#include <engine/copy.h>
struct nve0_copy_priv {
struct nouveau_copy base;
};
struct nve0_copy_chan {
struct nouveau_copy_chan base;
};
/*******************************************************************************
* Copy object classes
******************************************************************************/
static struct nouveau_oclass
nve0_copy_sclass[] = {
{ 0xa0b5, &nouveau_object_ofuncs },
{},
};
/*******************************************************************************
* PCOPY context
******************************************************************************/
static int
nve0_copy_context_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nve0_copy_chan *priv;
int ret;
ret = nouveau_copy_context_create(parent, engine, oclass, NULL, 256,
256, NVOBJ_FLAG_ZERO_ALLOC, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
return 0;
}
static struct nouveau_ofuncs
nve0_copy_context_ofuncs = {
.ctor = nve0_copy_context_ctor,
.dtor = _nouveau_copy_context_dtor,
.init = _nouveau_copy_context_init,
.fini = _nouveau_copy_context_fini,
.rd32 = _nouveau_copy_context_rd32,
.wr32 = _nouveau_copy_context_wr32,
};
static struct nouveau_oclass
nve0_copy_cclass = {
.handle = NV_ENGCTX(COPY0, 0xc0),
.ofuncs = &nve0_copy_context_ofuncs,
};
/*******************************************************************************
* PCOPY engine/subdev functions
******************************************************************************/
static int
nve0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nve0_copy_priv *priv;
int ret;
if (nv_rd32(parent, 0x022500) & 0x00000100)
return -ENODEV;
ret = nouveau_copy_create(parent, engine, oclass, true, 0, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_subdev(priv)->unit = 0x00000040;
nv_engine(priv)->cclass = &nve0_copy_cclass;
nv_engine(priv)->sclass = nve0_copy_sclass;
return 0;
}
static int
nve0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nve0_copy_priv *priv;
int ret;
if (nv_rd32(parent, 0x022500) & 0x00000200)
return -ENODEV;
ret = nouveau_copy_create(parent, engine, oclass, true, 1, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_subdev(priv)->unit = 0x00000080;
nv_engine(priv)->cclass = &nve0_copy_cclass;
nv_engine(priv)->sclass = nve0_copy_sclass;
return 0;
}
struct nouveau_oclass
nve0_copy0_oclass = {
.handle = NV_ENGINE(COPY0, 0xe0),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nve0_copy0_ctor,
.dtor = _nouveau_copy_dtor,
.init = _nouveau_copy_init,
.fini = _nouveau_copy_fini,
},
};
struct nouveau_oclass
nve0_copy1_oclass = {
.handle = NV_ENGINE(COPY1, 0xe0),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nve0_copy1_ctor,
.dtor = _nouveau_copy_dtor,
.init = _nouveau_copy_init,
.fini = _nouveau_copy_fini,
},
};
drivers/gpu/drm/nouveau/nv98_crypt.fuc → drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc
View file @ 268d2837
...@@ -238,7 +238,7 @@ ih: ...@@ -238,7 +238,7 @@ ih:
cmpu b32 $r4 0x60+#dma_count cmpu b32 $r4 0x60+#dma_count
bra nc #illegal_mthd bra nc #illegal_mthd
shl b32 $r5 $r4 2 shl b32 $r5 $r4 2
add b32 $r5 (#ctx_dma - 0x60 * 4) & 0xffff add b32 $r5 ((#ctx_dma - 0x60 * 4) & 0xffff)
bset $r3 0x1e bset $r3 0x1e
st b32 D[$r5] $r3 st b32 D[$r5] $r3
add b32 $r4 0x180 - 0x60 add b32 $r4 0x180 - 0x60
......
drivers/gpu/drm/nouveau/nv98_crypt.fuc.h → drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h
View file @ 268d2837
uint32_t nv98_pcrypt_data[] = { static uint32_t nv98_pcrypt_data[] = {
/* 0x0000: ctx_dma */ /* 0x0000: ctx_dma */
/* 0x0000: ctx_dma_query */ /* 0x0000: ctx_dma_query */
0x00000000, 0x00000000,
...@@ -150,7 +150,7 @@ uint32_t nv98_pcrypt_data[] = { ...@@ -150,7 +150,7 @@ uint32_t nv98_pcrypt_data[] = {
0x00000000, 0x00000000,
}; };
uint32_t nv98_pcrypt_code[] = { static uint32_t nv98_pcrypt_code[] = {
0x17f004bd, 0x17f004bd,
0x0010fe35, 0x0010fe35,
0xf10004fe, 0xf10004fe,
......
drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <core/os.h>
#include <core/enum.h>
#include <core/class.h>
#include <core/engctx.h>
#include <core/gpuobj.h>
#include <subdev/fb.h>
#include <engine/fifo.h>
#include <engine/crypt.h>
struct nv84_crypt_priv {
struct nouveau_crypt base;
};
struct nv84_crypt_chan {
struct nouveau_crypt_chan base;
};
/*******************************************************************************
* Crypt object classes
******************************************************************************/
static int
nv84_crypt_object_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nouveau_gpuobj *obj;
int ret;
ret = nouveau_gpuobj_create(parent, engine, oclass, 0, parent,
16, 16, 0, &obj);
*pobject = nv_object(obj);
if (ret)
return ret;
nv_wo32(obj, 0x00, nv_mclass(obj));
nv_wo32(obj, 0x04, 0x00000000);
nv_wo32(obj, 0x08, 0x00000000);
nv_wo32(obj, 0x0c, 0x00000000);
return 0;
}
static struct nouveau_ofuncs
nv84_crypt_ofuncs = {
.ctor = nv84_crypt_object_ctor,
.dtor = _nouveau_gpuobj_dtor,
.init = _nouveau_gpuobj_init,
.fini = _nouveau_gpuobj_fini,
.rd32 = _nouveau_gpuobj_rd32,
.wr32 = _nouveau_gpuobj_wr32,
};
static struct nouveau_oclass
nv84_crypt_sclass[] = {
{ 0x74c1, &nv84_crypt_ofuncs },
{}
};
/*******************************************************************************
* PCRYPT context
******************************************************************************/
static int
nv84_crypt_context_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv84_crypt_chan *priv;
int ret;
ret = nouveau_crypt_context_create(parent, engine, oclass, NULL, 256,
0, NVOBJ_FLAG_ZERO_ALLOC, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
return 0;
}
static struct nouveau_oclass
nv84_crypt_cclass = {
.handle = NV_ENGCTX(CRYPT, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_crypt_context_ctor,
.dtor = _nouveau_crypt_context_dtor,
.init = _nouveau_crypt_context_init,
.fini = _nouveau_crypt_context_fini,
.rd32 = _nouveau_crypt_context_rd32,
.wr32 = _nouveau_crypt_context_wr32,
},
};
/*******************************************************************************
* PCRYPT engine/subdev functions
******************************************************************************/
static const struct nouveau_bitfield nv84_crypt_intr_mask[] = {
{ 0x00000001, "INVALID_STATE" },
{ 0x00000002, "ILLEGAL_MTHD" },
{ 0x00000004, "ILLEGAL_CLASS" },
{ 0x00000080, "QUERY" },
{ 0x00000100, "FAULT" },
{}
};
static void
nv84_crypt_intr(struct nouveau_subdev *subdev)
{
struct nouveau_fifo *pfifo = nouveau_fifo(subdev);
struct nouveau_engine *engine = nv_engine(subdev);
struct nouveau_object *engctx;
struct nv84_crypt_priv *priv = (void *)subdev;
u32 stat = nv_rd32(priv, 0x102130);
u32 mthd = nv_rd32(priv, 0x102190);
u32 data = nv_rd32(priv, 0x102194);
u32 inst = nv_rd32(priv, 0x102188) & 0x7fffffff;
int chid;
engctx = nouveau_engctx_get(engine, inst);
chid = pfifo->chid(pfifo, engctx);
if (stat) {
nv_error(priv, "");
nouveau_bitfield_print(nv84_crypt_intr_mask, stat);
printk(" ch %d [0x%010llx] mthd 0x%04x data 0x%08x\n",
chid, (u64)inst << 12, mthd, data);
}
nv_wr32(priv, 0x102130, stat);
nv_wr32(priv, 0x10200c, 0x10);
nv50_fb_trap(nouveau_fb(priv), 1);
nouveau_engctx_put(engctx);
}
static int
nv84_crypt_tlb_flush(struct nouveau_engine *engine)
{
nv50_vm_flush_engine(&engine->base, 0x0a);
return 0;
}
static int
nv84_crypt_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv84_crypt_priv *priv;
int ret;
ret = nouveau_crypt_create(parent, engine, oclass, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_subdev(priv)->unit = 0x00004000;
nv_subdev(priv)->intr = nv84_crypt_intr;
nv_engine(priv)->cclass = &nv84_crypt_cclass;
nv_engine(priv)->sclass = nv84_crypt_sclass;
nv_engine(priv)->tlb_flush = nv84_crypt_tlb_flush;
return 0;
}
static int
nv84_crypt_init(struct nouveau_object *object)
{
struct nv84_crypt_priv *priv = (void *)object;
int ret;
ret = nouveau_crypt_init(&priv->base);
if (ret)
return ret;
nv_wr32(priv, 0x102130, 0xffffffff);
nv_wr32(priv, 0x102140, 0xffffffbf);
nv_wr32(priv, 0x10200c, 0x00000010);
return 0;
}
struct nouveau_oclass
nv84_crypt_oclass = {
.handle = NV_ENGINE(CRYPT, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_crypt_ctor,
.dtor = _nouveau_crypt_dtor,
.init = nv84_crypt_init,
.fini = _nouveau_crypt_fini,
},
};
drivers/gpu/drm/nouveau/core/engine/disp/nv04.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <engine/disp.h>
struct nv04_disp_priv {
struct nouveau_disp base;
};
static struct nouveau_oclass
nv04_disp_sclass[] = {
{},
};
static void
nv04_disp_intr_vblank(struct nv04_disp_priv *priv, int crtc)
{
struct nouveau_disp *disp = &priv->base;
if (disp->vblank.notify)
disp->vblank.notify(disp->vblank.data, crtc);
}
static void
nv04_disp_intr(struct nouveau_subdev *subdev)
{
struct nv04_disp_priv *priv = (void *)subdev;
u32 crtc0 = nv_rd32(priv, 0x600100);
u32 crtc1 = nv_rd32(priv, 0x602100);
if (crtc0 & 0x00000001) {
nv04_disp_intr_vblank(priv, 0);
nv_wr32(priv, 0x600100, 0x00000001);
}
if (crtc1 & 0x00000001) {
nv04_disp_intr_vblank(priv, 1);
nv_wr32(priv, 0x602100, 0x00000001);
}
}
static int
nv04_disp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv04_disp_priv *priv;
int ret;
ret = nouveau_disp_create(parent, engine, oclass, "DISPLAY",
"display", &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_engine(priv)->sclass = nv04_disp_sclass;
nv_subdev(priv)->intr = nv04_disp_intr;
return 0;
}
struct nouveau_oclass
nv04_disp_oclass = {
.handle = NV_ENGINE(DISP, 0x04),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv04_disp_ctor,
.dtor = _nouveau_disp_dtor,
.init = _nouveau_disp_init,
.fini = _nouveau_disp_fini,
},
};
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c 0 → 100644
View file @ 268d2837
/*
* Copyright 2012 Red Hat Inc.
*
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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
*/
#include <engine/software.h>
#include <engine/disp.h>
struct nv50_disp_priv {
struct nouveau_disp base;
};
static struct nouveau_oclass
nv50_disp_sclass[] = {
{},
};
static void
nv50_disp_intr_vblank(struct nv50_disp_priv *priv, int crtc)
{
struct nouveau_disp *disp = &priv->base;
struct nouveau_software_chan *chan, *temp;
unsigned long flags;
spin_lock_irqsave(&disp->vblank.lock, flags);
list_for_each_entry_safe(chan, temp, &disp->vblank.list, vblank.head) {
if (chan->vblank.crtc != crtc)
continue;
nv_wr32(priv, 0x001704, chan->vblank.channel);
nv_wr32(priv, 0x001710, 0x80000000 | chan->vblank.ctxdma);
if (nv_device(priv)->chipset == 0x50) {
nv_wr32(priv, 0x001570, chan->vblank.offset);
nv_wr32(priv, 0x001574, chan->vblank.value);
} else {
if (nv_device(priv)->chipset >= 0xc0) {
nv_wr32(priv, 0x06000c,
upper_32_bits(chan->vblank.offset));
}
nv_wr32(priv, 0x060010, chan->vblank.offset);
nv_wr32(priv, 0x060014, chan->vblank.value);
}
list_del(&chan->vblank.head);
if (disp->vblank.put)
disp->vblank.put(disp->vblank.data, crtc);
}
spin_unlock_irqrestore(&disp->vblank.lock, flags);
if (disp->vblank.notify)
disp->vblank.notify(disp->vblank.data, crtc);
}
static void
nv50_disp_intr(struct nouveau_subdev *subdev)
{
struct nv50_disp_priv *priv = (void *)subdev;
u32 stat1 = nv_rd32(priv, 0x610024);
if (stat1 & 0x00000004) {
nv50_disp_intr_vblank(priv, 0);
nv_wr32(priv, 0x610024, 0x00000004);
stat1 &= ~0x00000004;
}
if (stat1 & 0x00000008) {
nv50_disp_intr_vblank(priv, 1);
nv_wr32(priv, 0x610024, 0x00000008);
stat1 &= ~0x00000008;
}
}
static int
nv50_disp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv50_disp_priv *priv;
int ret;
ret = nouveau_disp_create(parent, engine, oclass, "PDISP",
"display", &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
nv_engine(priv)->sclass = nv50_disp_sclass;
nv_subdev(priv)->intr = nv50_disp_intr;
INIT_LIST_HEAD(&priv->base.vblank.list);
spin_lock_init(&priv->base.vblank.lock);
return 0;
}
struct nouveau_oclass
nv50_disp_oclass = {
.handle = NV_ENGINE(DISP, 0x50),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv50_disp_ctor,
.dtor = _nouveau_disp_dtor,
.init = _nouveau_disp_init,
.fini = _nouveau_disp_fini,
},
};
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/disp/vga.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/dmaobj/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/dmaobj/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nv04.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nv50.h 0 → 100644
View file @ 268d2837
#ifndef __NV50_FIFO_H__
#define __NV50_FIFO_H__
struct nv50_fifo_priv {
struct nouveau_fifo base;
struct nouveau_gpuobj *playlist[2];
int cur_playlist;
};
struct nv50_fifo_base {
struct nouveau_fifo_base base;
struct nouveau_gpuobj *ramfc;
struct nouveau_gpuobj *cache;
struct nouveau_gpuobj *eng;
struct nouveau_gpuobj *pgd;
struct nouveau_vm *vm;
};
struct nv50_fifo_chan {
struct nouveau_fifo_chan base;
u32 subc[8];
struct nouveau_ramht *ramht;
};
void nv50_fifo_playlist_update(struct nv50_fifo_priv *);
void nv50_fifo_object_detach(struct nouveau_object *, int);
void nv50_fifo_chan_dtor(struct nouveau_object *);
int nv50_fifo_chan_fini(struct nouveau_object *, bool);
void nv50_fifo_context_dtor(struct nouveau_object *);
void nv50_fifo_dtor(struct nouveau_object *);
int nv50_fifo_init(struct nouveau_object *);
#endif
drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_grgpc.fuc → drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
View file @ 268d2837
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
*/ */
/* To build: /* To build:
* m4 nvc0_grgpc.fuc | envyas -a -w -m fuc -V nva3 -o nvc0_grgpc.fuc.h * m4 gpcnvc0.fuc | envyas -a -w -m fuc -V fuc3 -o gpcnvc0.fuc.h
*/ */
/* TODO /* TODO
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
*/ */
.section #nvc0_grgpc_data .section #nvc0_grgpc_data
include(`nvc0_graph.fuc') include(`nvc0.fuc')
gpc_id: .b32 0 gpc_id: .b32 0
gpc_mmio_list_head: .b32 0 gpc_mmio_list_head: .b32 0
gpc_mmio_list_tail: .b32 0 gpc_mmio_list_tail: .b32 0
...@@ -209,11 +209,11 @@ nvd9_tpc_mmio_tail: ...@@ -209,11 +209,11 @@ nvd9_tpc_mmio_tail:
.section #nvc0_grgpc_code .section #nvc0_grgpc_code
bra #init bra #init
define(`include_code') define(`include_code')
include(`nvc0_graph.fuc') include(`nvc0.fuc')
// reports an exception to the host // reports an exception to the host
// //
// In: $r15 error code (see nvc0_graph.fuc) // In: $r15 error code (see nvc0.fuc)
// //
error: error:
push $r14 push $r14
......
drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/fuc/nve0.fuc 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv20.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv20.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv25.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv30.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv34.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv35.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv40.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv40.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nv50.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/nve0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/graph/regs.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/mpeg/nv40.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/mpeg/nv84.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/software/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/software/nv10.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/software/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/software/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/engine/vp/nv84.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/class.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/client.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/debug.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/device.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/engctx.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/engine.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/enum.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/gpuobj.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/handle.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/math.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/mm.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/namedb.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/object.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/option.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/parent.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/printk.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/ramht.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/core/subdev.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/bsp.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/copy.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/crypt.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/disp.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/fifo.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/graph.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/mpeg.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/ppp.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/software.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/engine/vp.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bar.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/bit.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/bmp.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/conn.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/dp.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/extdev.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/i2c.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/mxm.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/perf.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/pll.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/bios/therm.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/clock.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/device.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/devinit.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/fb.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/gpio.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/i2c.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/ibus.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/instmem.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/mc.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/mxm.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/therm.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/timer.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/include/subdev/vga.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/os.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/bit.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/conn.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/dp.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/extdev.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/gpio.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/init.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/mxm.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/perf.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/pll.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/bios/therm.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/clock/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/clock/pll.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/clock/pllnv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nv10.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nv20.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nv30.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nv40.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/device/nve0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/devinit/fbmem.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/devinit/nv05.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/devinit/nv10.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/fb/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/fb/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/gpio/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/i2c/bit.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/ibus/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/ibus/nve0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/instmem/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mc/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mxm/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/mxm/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/therm/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/therm/ic.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/therm/priv.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/therm/temp.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/timer/base.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/vm/nv04.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_abi16.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_abi16.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_acpi.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_acpi.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_agp.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_agp.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_backlight.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_bios.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_bios.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_bo.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_bo.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_calc.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_chan.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_chan.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_channel.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_connector.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_connector.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_debugfs.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_display.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_display.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_dma.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_dma.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_dp.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_drm.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_drv.h deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_encoder.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_fb.h deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_fbcon.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_fbcon.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_fence.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_fence.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_fifo.h deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_gem.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_gem.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_gpio.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_gpio.h deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_gpuobj.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_hdmi.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_hw.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_hw.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_ioc32.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_ioctl.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_irq.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_irq.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_mem.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_mxm.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_notifier.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_perf.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_pm.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_pm.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_prime.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_ramht.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_sgdma.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_software.h deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_state.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_temp.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_ttm.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_ttm.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_vga.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_vga.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_volt.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_crtc.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_cursor.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_dac.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_dfp.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_display.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_display.h 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_fb.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_fbcon.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_fence.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_instmem.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_mc.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_pm.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_timer.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv04_tv.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv10_fb.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv10_fence.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv10_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv17_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv17_tv.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv17_tv.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv17_tv_modes.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv20_fb.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv20_graph.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv31_mpeg.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv40_fb.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv40_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv40_graph.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv40_mc.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv40_pm.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_crtc.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_cursor.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_dac.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_display.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_display.h
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_evo.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_fbcon.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_fence.c 0 → 100644
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_instmem.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_mpeg.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_pm.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_software.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_sor.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv50_vram.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv84_crypt.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nv84_fence.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nv84_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nva3_copy.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nva3_pm.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_copy.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_fbcon.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_fence.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_graph.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_grctx.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_instmem.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nvc0_pm.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nvd0_display.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/nouveau/nve0_fifo.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nve0_graph.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/nouveau/nve0_grctx.c deleted 100644 → 0
View file @ df86b576
This diff is collapsed.
drivers/gpu/drm/udl/udl_connector.c
View file @ 268d2837
This diff is collapsed.
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
View file @ 268d2837
This diff is collapsed.
drivers/iommu/amd_iommu.c
View file @ 268d2837
This diff is collapsed.
drivers/md/dm-mpath.c
View file @ 268d2837
This diff is collapsed.
drivers/md/dm-table.c
View file @ 268d2837
This diff is collapsed.
drivers/md/dm-thin.c
View file @ 268d2837
This diff is collapsed.
drivers/md/dm-verity.c
View file @ 268d2837
This diff is collapsed.
drivers/md/dm.c
View file @ 268d2837
This diff is collapsed.
drivers/md/dm.h
View file @ 268d2837
This diff is collapsed.
drivers/md/raid10.c
View file @ 268d2837
This diff is collapsed.
drivers/md/raid5.c
View file @ 268d2837
This diff is collapsed.
drivers/mtd/mtdchar.c
View file @ 268d2837
This diff is collapsed.
drivers/net/ethernet/broadcom/bnx2.c
View file @ 268d2837
This diff is collapsed.
drivers/net/ethernet/octeon/octeon_mgmt.c
View file @ 268d2837
This diff is collapsed.
drivers/net/ethernet/pasemi/pasemi_mac.c
View file @ 268d2837
This diff is collapsed.
drivers/net/phy/bcm87xx.c
View file @ 268d2837
This diff is collapsed.
drivers/net/phy/micrel.c
View file @ 268d2837
This diff is collapsed.
drivers/net/phy/smsc.c
View file @ 268d2837
This diff is collapsed.
drivers/net/ppp/pppoe.c
View file @ 268d2837
This diff is collapsed.
drivers/net/team/team.c
View file @ 268d2837
This diff is collapsed.
drivers/net/usb/smsc75xx.c
View file @ 268d2837
This diff is collapsed.
drivers/net/wireless/iwlwifi/pcie/trans.c
View file @ 268d2837
This diff is collapsed.
drivers/sh/pfc/pinctrl.c
View file @ 268d2837
This diff is collapsed.
drivers/usb/core/devices.c
View file @ 268d2837
This diff is collapsed.
drivers/usb/core/hcd.c
View file @ 268d2837
This diff is collapsed.
drivers/usb/host/ohci-at91.c
View file @ 268d2837
This diff is collapsed.
drivers/vfio/pci/vfio_pci_intrs.c
View file @ 268d2837
This diff is collapsed.
fs/dcache.c
View file @ 268d2837
This diff is collapsed.
fs/lockd/svclock.c
View file @ 268d2837
This diff is collapsed.
fs/namespace.c
View file @ 268d2837
This diff is collapsed.
include/asm-generic/unistd.h
View file @ 268d2837
This diff is collapsed.
include/linux/iommu.h
View file @ 268d2837
This diff is collapsed.
include/linux/micrel_phy.h
View file @ 268d2837
This diff is collapsed.
include/linux/nvme.h
View file @ 268d2837
This diff is collapsed.
include/linux/security.h
View file @ 268d2837
This diff is collapsed.
lib/flex_proportions.c
View file @ 268d2837
This diff is collapsed.
mm/huge_memory.c
View file @ 268d2837
This diff is collapsed.
net/batman-adv/bat_iv_ogm.c
View file @ 268d2837
This diff is collapsed.
net/batman-adv/soft-interface.c
View file @ 268d2837
This diff is collapsed.
net/bluetooth/hci_core.c
View file @ 268d2837
This diff is collapsed.
net/bluetooth/l2cap_core.c
View file @ 268d2837
This diff is collapsed.
net/bluetooth/mgmt.c
View file @ 268d2837
This diff is collapsed.
net/ceph/messenger.c
View file @ 268d2837
This diff is collapsed.
net/core/sock.c
View file @ 268d2837
This diff is collapsed.
net/ipv4/inetpeer.c
View file @ 268d2837
This diff is collapsed.
net/ipv4/raw.c
View file @ 268d2837
This diff is collapsed.
net/ipv6/mip6.c
View file @ 268d2837
This diff is collapsed.
net/ipv6/raw.c
View file @ 268d2837
This diff is collapsed.
net/l2tp/l2tp_netlink.c
View file @ 268d2837
This diff is collapsed.
net/netfilter/xt_limit.c
View file @ 268d2837
This diff is collapsed.
net/wireless/reg.c
View file @ 268d2837
This diff is collapsed.
scripts/checksyscalls.sh
View file @ 268d2837
This diff is collapsed.
sound/soc/codecs/wm2000.c
View file @ 268d2837
This diff is collapsed.
sound/usb/endpoint.c
View file @ 268d2837
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7