search for: rom32

The nouveau driver makes a number of unaligned accesses via the ROM16(), ROM32() and ROM64() macros which fault on SPARC (but would be transparently handled by x86 hardware). Making use of get_unaligned() macro fixes the problem for me. diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 7ccd28f..92031f6 100644 --- a/drivers/gpu...

...ertions(+), 6 deletions(-) diff --git a/drm/nouveau/nouveau_bios.h b/drm/nouveau/nouveau_bios.h index 0067586..18eb061 100644 --- a/drm/nouveau/nouveau_bios.h +++ b/drm/nouveau/nouveau_bios.h @@ -31,10 +31,8 @@ #define DCB_LOC_ON_CHIP 0 -#define ROM16(x) le16_to_cpu(*(u16 *)&(x)) -#define ROM32(x) le32_to_cpu(*(u32 *)&(x)) -#define ROM48(x) ({ u8 *p = &(x); (u64)ROM16(p[4]) << 32 | ROM32(p[0]); }) -#define ROM64(x) le64_to_cpu(*(u64 *)&(x)) +#define ROM16(x) get_unaligned_le16(&(x)) +#define ROM32(x) get_unaligned_le32(&(x)) #define ROMPTR(d,x) ({ \...

--- drivers/gpu/drm/nouveau/nouveau_bios.c | 47 ++++++++++++++----------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 5eec5ed..04ac564 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -181,43 +181,42 @@ struct methods { const char

...gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -40,8 +40,6 @@ #define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip->dev, fmt, ##arg) #define LOG_OLD_VALUE(x) //x -#define BIOS_USLEEP(n) mdelay((n)/1000) - #define ROM16(x) le16_to_cpu(*(uint16_t *)&(x)) #define ROM32(x) le32_to_cpu(*(uint32_t *)&(x)) @@ -50,6 +48,15 @@ struct init_exec { bool repeat; }; +static inline void bios_usleep(unsigned usecs) +{ + might_sleep(); + if (usecs < 1000 * MAX_UDELAY_MS) + udelay(usecs); + else + msleep(usecs / 1000 + 1); +} + static bool nv_cksum(const uint8_...

...1 100644 --- a/src/nv_bios.c +++ b/src/nv_bios.c @@ -41,7 +41,7 @@ #define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip, fmt, ##arg) #define LOG_OLD_VALUE(x) //x -#define BIOS_USLEEP(n) usleep(n) +#define BIOS_USLEEP(n) nouveau_usleep(n) #define ROM16(x) le16_to_cpu(*(uint16_t *)&(x)) #define ROM32(x) le32_to_cpu(*(uint32_t *)&(x)) diff --git a/src/nv_crtc.c b/src/nv_crtc.c index b8524fb..1ffb267 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -212,7 +212,7 @@ nv_crtc_dpms(xf86CrtcPtr crtc, int mode) seq1 |= (NVReadVgaSeq(pNv, nv_crtc->head, NV_VIO_SR_CLOCK_INDEX) & ~0x20); N...

...p, fmt, arg...) NV_DEBUG(sip->dev, fmt, > >> > ##arg) #define LOG_OLD_VALUE(x) //x > >> > > >> > -#define BIOS_USLEEP(n) mdelay((n)/1000) > >> > - > >> > #define ROM16(x) le16_to_cpu(*(uint16_t *)&(x)) > >> > #define ROM32(x) le32_to_cpu(*(uint32_t *)&(x)) > >> > > >> > @@ -50,6 +48,15 @@ struct init_exec { > >> > bool repeat; > >> > }; > >> > > >> > +static inline void bios_usleep(unsigned usecs) > >> > +{ > >> &g...

https://bugs.freedesktop.org/show_bug.cgi?id=96836 Bug ID: 96836 Summary: Kernel unaligned access at TPC[105d9fb4] nvkm_instobj_wr32+0x14/0x20 [nouveau] Product: xorg Version: unspecified Hardware: SPARC OS: Linux (All) Status: NEW Severity: normal Priority: medium

It seems it was only locking up in the context of nouveau_hw_save_vga_fonts, when it actually did something (because the console wasn't already in graphics mode). Signed-off-by: Francisco Jerez <currojerez at riseup.net> --- drivers/gpu/drm/nouveau/nouveau_hw.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c

This patch series adds TV-out modesetting support to the KMS implementation. I've tried to test it on all the hardware I've got at hand (that is nv11, nv17, nv34, nv35, nv40, nv4b) with every possible output combination; I believe it has reached a mergeable state, however it depends on some commits from drm-next that haven't got into Linus' tree yet, if you agree to merge this