diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-08-16 09:11:17 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-08-16 09:11:17 +0300 |
commit | b2eb7d716426fe056596761cd371005d64e9caec (patch) | |
tree | 436d0566cf4bc900522c9dbf1e203234ef65b2f7 /drivers/gpu/drm/panfrost/panfrost_regs.h | |
parent | 2817efaeb608421d8f6fe7939826c35a852644e9 (diff) | |
parent | 2819cf0e7dbe45a2bccf2f6c60fe6a27b299cc3e (diff) |
Merge drm/drm-next into drm-intel-next
Catch up with drm core changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/panfrost/panfrost_regs.h')
-rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_regs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_regs.h b/drivers/gpu/drm/panfrost/panfrost_regs.h index dc9df5457f1c..1940ff86e49a 100644 --- a/drivers/gpu/drm/panfrost/panfrost_regs.h +++ b/drivers/gpu/drm/panfrost/panfrost_regs.h @@ -262,9 +262,6 @@ #define JS_COMMAND_SOFT_STOP_1 0x06 /* Execute SOFT_STOP if JOB_CHAIN_FLAG is 1 */ #define JS_COMMAND_HARD_STOP_1 0x07 /* Execute HARD_STOP if JOB_CHAIN_FLAG is 1 */ -#define JS_STATUS_EVENT_ACTIVE 0x08 - - /* MMU regs */ #define MMU_INT_RAWSTAT 0x2000 #define MMU_INT_CLEAR 0x2004 |