mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 07:46:53 +07:00
e4604d8fe8
Op 23-03-13 12:47, Peter Hurley schreef:
> On Tue, 2013-03-19 at 11:13 -0400, Peter Hurley wrote:
>> On vanilla 3.9.0-rc3, I get this 100% repeatable oops after login when
>> the user X session is coming up:
> Perhaps I wasn't clear that this happens on every boot and is a
> regression from 3.8
>
> I'd be happy to help resolve this but time is of the essence; it would
> be a shame to have to revert all of this for 3.9
Well it broke on my system too, so it was easy to fix.
I didn't even need gdm to trigger it!
>8----
This fixes regression caused by 1d7c71a3e2
(drm/nouveau/disp: port vblank handling to event interface),
which causes a oops in the following way:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000001
IP: [<0000000000000001>] 0x0
PGD 0
Oops: 0010 [#1] PREEMPT SMP
Modules linked in: ip6table_filter ip6_tables ebtable_nat ebtables ...<snip>...
CPU 3
Pid: 0, comm: swapper/3 Not tainted 3.9.0-rc3-xeon #rc3 Dell Inc. Precision WorkStation T5400 /0RW203
RIP: 0010:[<0000000000000001>] [<0000000000000001>] 0x0
RSP: 0018:ffff8802afcc3d80 EFLAGS: 00010087
RAX: ffff88029f6e5808 RBX: 0000000000000001 RCX: 0000000000000000
RDX: 0000000000000096 RSI: 0000000000000001 RDI: ffff88029f6e5808
RBP: ffff8802afcc3dc8 R08: 0000000000000000 R09: 0000000000000004
R10: 000000000000002c R11: ffff88029e559a98 R12: ffff8802a376cb78
R13: ffff88029f6e57e0 R14: ffff88029f6e57f8 R15: ffff88029f6e5808
FS: 0000000000000000(0000) GS:ffff8802afcc0000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000001 CR3: 000000029fa67000 CR4: 00000000000007e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process swapper/3 (pid: 0, threadinfo ffff8802a355e000, task ffff8802a3535c40)
Stack:
ffffffffa0159d8a 0000000000000082 ffff88029f6e5820 0000000000000001
ffff88029f71aa00 0000000000000000 0000000000000000 0000000004000000
0000000004000000 ffff8802afcc3e38 ffffffffa01843b5 ffff8802afcc3df8
Call Trace:
<IRQ>
[<ffffffffa0159d8a>] ? nouveau_event_trigger+0xaa/0xe0 [nouveau]
[<ffffffffa01843b5>] nv50_disp_intr+0xc5/0x200 [nouveau]
[<ffffffff816fbacc>] ? _raw_spin_unlock_irqrestore+0x2c/0x50
[<ffffffff816ff98d>] ? notifier_call_chain+0x4d/0x70
[<ffffffffa017a105>] nouveau_mc_intr+0xb5/0x110 [nouveau]
[<ffffffffa01d45ff>] nouveau_irq_handler+0x6f/0x80 [nouveau]
[<ffffffff810eec95>] handle_irq_event_percpu+0x75/0x260
[<ffffffff810eeec8>] handle_irq_event+0x48/0x70
[<ffffffff810f205a>] handle_fasteoi_irq+0x5a/0x100
[<ffffffff810182f2>] handle_irq+0x22/0x40
[<ffffffff8170561a>] do_IRQ+0x5a/0xd0
[<ffffffff816fc2ad>] common_interrupt+0x6d/0x6d
<EOI>
[<ffffffff810449b6>] ? native_safe_halt+0x6/0x10
[<ffffffff8101ea1d>] default_idle+0x3d/0x170
[<ffffffff8101f736>] cpu_idle+0x116/0x130
[<ffffffff816e2a06>] start_secondary+0x251/0x258
Code: Bad RIP value.
RIP [<0000000000000001>] 0x0
RSP <ffff8802afcc3d80>
CR2: 0000000000000001
---[ end trace 907323cb8ce6f301 ]---
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
149 lines
3.3 KiB
C
149 lines
3.3 KiB
C
#ifndef __NOUVEAU_DRMCLI_H__
|
|
#define __NOUVEAU_DRMCLI_H__
|
|
|
|
#define DRIVER_AUTHOR "Nouveau Project"
|
|
#define DRIVER_EMAIL "nouveau@lists.freedesktop.org"
|
|
|
|
#define DRIVER_NAME "nouveau"
|
|
#define DRIVER_DESC "nVidia Riva/TNT/GeForce/Quadro/Tesla"
|
|
#define DRIVER_DATE "20120801"
|
|
|
|
#define DRIVER_MAJOR 1
|
|
#define DRIVER_MINOR 1
|
|
#define DRIVER_PATCHLEVEL 0
|
|
|
|
#include <core/client.h>
|
|
#include <core/event.h>
|
|
|
|
#include <subdev/vm.h>
|
|
|
|
#include <drmP.h>
|
|
#include <drm/nouveau_drm.h>
|
|
|
|
#include <drm/ttm/ttm_bo_api.h>
|
|
#include <drm/ttm/ttm_bo_driver.h>
|
|
#include <drm/ttm/ttm_placement.h>
|
|
#include <drm/ttm/ttm_memory.h>
|
|
#include <drm/ttm/ttm_module.h>
|
|
#include <drm/ttm/ttm_page_alloc.h>
|
|
|
|
struct nouveau_channel;
|
|
|
|
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
|
|
|
|
#include "nouveau_fence.h"
|
|
#include "nouveau_bios.h"
|
|
|
|
struct nouveau_drm_tile {
|
|
struct nouveau_fence *fence;
|
|
bool used;
|
|
};
|
|
|
|
enum nouveau_drm_handle {
|
|
NVDRM_CLIENT = 0xffffffff,
|
|
NVDRM_DEVICE = 0xdddddddd,
|
|
NVDRM_PUSH = 0xbbbb0000, /* |= client chid */
|
|
NVDRM_CHAN = 0xcccc0000, /* |= client chid */
|
|
};
|
|
|
|
struct nouveau_cli {
|
|
struct nouveau_client base;
|
|
struct list_head head;
|
|
struct mutex mutex;
|
|
void *abi16;
|
|
};
|
|
|
|
static inline struct nouveau_cli *
|
|
nouveau_cli(struct drm_file *fpriv)
|
|
{
|
|
return fpriv ? fpriv->driver_priv : NULL;
|
|
}
|
|
|
|
struct nouveau_drm {
|
|
struct nouveau_cli client;
|
|
struct drm_device *dev;
|
|
|
|
struct nouveau_object *device;
|
|
struct list_head clients;
|
|
|
|
struct {
|
|
enum {
|
|
UNKNOWN = 0,
|
|
DISABLE = 1,
|
|
ENABLED = 2
|
|
} stat;
|
|
u32 base;
|
|
u32 size;
|
|
} agp;
|
|
|
|
/* TTM interface support */
|
|
struct {
|
|
struct drm_global_reference mem_global_ref;
|
|
struct ttm_bo_global_ref bo_global_ref;
|
|
struct ttm_bo_device bdev;
|
|
atomic_t validate_sequence;
|
|
int (*move)(struct nouveau_channel *,
|
|
struct ttm_buffer_object *,
|
|
struct ttm_mem_reg *, struct ttm_mem_reg *);
|
|
int mtrr;
|
|
} ttm;
|
|
|
|
/* GEM interface support */
|
|
struct {
|
|
u64 vram_available;
|
|
u64 gart_available;
|
|
} gem;
|
|
|
|
/* synchronisation */
|
|
void *fence;
|
|
|
|
/* context for accelerated drm-internal operations */
|
|
struct nouveau_channel *cechan;
|
|
struct nouveau_channel *channel;
|
|
struct nouveau_gpuobj *notify;
|
|
struct nouveau_fbdev *fbcon;
|
|
|
|
/* nv10-nv40 tiling regions */
|
|
struct {
|
|
struct nouveau_drm_tile reg[15];
|
|
spinlock_t lock;
|
|
} tile;
|
|
|
|
/* modesetting */
|
|
struct nvbios vbios;
|
|
struct nouveau_display *display;
|
|
struct backlight_device *backlight;
|
|
struct nouveau_eventh vblank[4];
|
|
|
|
/* power management */
|
|
struct nouveau_pm *pm;
|
|
};
|
|
|
|
static inline struct nouveau_drm *
|
|
nouveau_drm(struct drm_device *dev)
|
|
{
|
|
return dev->dev_private;
|
|
}
|
|
|
|
static inline struct nouveau_device *
|
|
nouveau_dev(struct drm_device *dev)
|
|
{
|
|
return nv_device(nouveau_drm(dev)->device);
|
|
}
|
|
|
|
int nouveau_pmops_suspend(struct device *);
|
|
int nouveau_pmops_resume(struct device *);
|
|
|
|
#define NV_FATAL(cli, fmt, args...) nv_fatal((cli), fmt, ##args)
|
|
#define NV_ERROR(cli, fmt, args...) nv_error((cli), fmt, ##args)
|
|
#define NV_WARN(cli, fmt, args...) nv_warn((cli), fmt, ##args)
|
|
#define NV_INFO(cli, fmt, args...) nv_info((cli), fmt, ##args)
|
|
#define NV_DEBUG(cli, fmt, args...) do { \
|
|
if (drm_debug & DRM_UT_DRIVER) \
|
|
nv_info((cli), fmt, ##args); \
|
|
} while (0)
|
|
|
|
extern int nouveau_modeset;
|
|
|
|
#endif
|