diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-02-20 15:21:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-02-21 05:44:40 +1000 |
| commit | 1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0 (patch) | |
| tree | 07cfbfb9b12a0d5a3f5c892115ac9a06104559af /drivers/gpu/drm/lima/lima_regs.h | |
| parent | 11a48a5a18c63fd7621bb050228cebf13566e4d8 (diff) | |
| parent | 06f749af622ca28c4e1f60c43fabd3917114f95a (diff) | |
| download | kernel_replicant_linux-1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0.tar.gz kernel_replicant_linux-1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0.tar.bz2 kernel_replicant_linux-1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0.zip | |
Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.7:
UAPI Changes:
- lima: Add support for heap buffers
Cross-subsystem Changes:
Core Changes:
- Implement mode_config mode_valid for memory constrained drivers
- Bus format negociation between bridges
- Consolidate fake vblank events for drivers without vblank interrupts
- drm/bufs: dma_alloc related cleanups
- drm/dp_mst: Various fixes
- drm/print: New drm_device based print helpers
- Thomas is a drm-misc maintainer now!
Driver Changes:
- DPMS cleanups for atomic drivers
- Removal of owner field in SPI tinydrm drivers
- Removal of explicit dependency on DT for tinydrm drivers
- Conversion to YAML schemas for DT bindings
- tidss: New driver
- virtio: various reworks and fixes
- Our usual dozen or so new panels or bridges
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200210093421.xu4sofldm6wm6xq6@gilmour.lan
Diffstat (limited to 'drivers/gpu/drm/lima/lima_regs.h')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/lima/lima_regs.h b/drivers/gpu/drm/lima/lima_regs.h index ace8ecefbe90..0124c90e0153 100644 --- a/drivers/gpu/drm/lima/lima_regs.h +++ b/drivers/gpu/drm/lima/lima_regs.h @@ -239,6 +239,7 @@ #define LIMA_MMU_STATUS_REPLAY_BUFFER_EMPTY BIT(4) #define LIMA_MMU_STATUS_PAGE_FAULT_IS_WRITE BIT(5) #define LIMA_MMU_STATUS_BUS_ID(x) ((x >> 6) & 0x1F) +#define LIMA_MMU_STATUS_STALL_NOT_ACTIVE BIT(31) #define LIMA_MMU_COMMAND 0x0008 #define LIMA_MMU_COMMAND_ENABLE_PAGING 0x00 #define LIMA_MMU_COMMAND_DISABLE_PAGING 0x01 |