diff options
| author | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
| commit | 96583ddbec291929880edefa2141c06c63e16aa5 (patch) | |
| tree | 6ae6bd3aec381d7461a687e3314bdf949798c554 /drivers/gpu/drm/nouveau/nouveau_bios.h | |
| parent | drm/i915: Correct pipe fault reporting string (diff) | |
| parent | Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next (diff) | |
| download | kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.gz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.xz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 0067586eb015..18eb061ccafb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/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) ({ \ struct nouveau_drm *drm = nouveau_drm((d)); \ ROM16(x) ? &drm->vbios.data[ROM16(x)] : NULL; \ |