diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0518-drm-amdgpu-add-count-field-for-the-SDMA-NOP-packet-v.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0518-drm-amdgpu-add-count-field-for-the-SDMA-NOP-packet-v.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0518-drm-amdgpu-add-count-field-for-the-SDMA-NOP-packet-v.patch b/common/recipes-kernel/linux/files/0518-drm-amdgpu-add-count-field-for-the-SDMA-NOP-packet-v.patch new file mode 100644 index 00000000..c56a5be4 --- /dev/null +++ b/common/recipes-kernel/linux/files/0518-drm-amdgpu-add-count-field-for-the-SDMA-NOP-packet-v.patch @@ -0,0 +1,63 @@ +From 4207a734c32cafd8ea603eb440d6a8e100e7d1d2 Mon Sep 17 00:00:00 2001 +From: Jammy Zhou <Jammy.Zhou@amd.com> +Date: Mon, 31 Aug 2015 14:01:05 +0800 +Subject: [PATCH 0518/1050] drm/amdgpu: add count field for the SDMA NOP packet + v2 + +This is added to support the burst NOP + +v2: squash the typo fix + +Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/cikd.h | 1 + + drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h | 5 +++++ + drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h | 5 +++++ + 3 files changed, 11 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/cikd.h b/drivers/gpu/drm/amd/amdgpu/cikd.h +index a3e3dfa..7f6d457 100644 +--- a/drivers/gpu/drm/amd/amdgpu/cikd.h ++++ b/drivers/gpu/drm/amd/amdgpu/cikd.h +@@ -487,6 +487,7 @@ + (((op) & 0xFF) << 0)) + /* sDMA opcodes */ + #define SDMA_OPCODE_NOP 0 ++# define SDMA_NOP_COUNT(x) (((x) & 0x3FFF) << 16) + #define SDMA_OPCODE_COPY 1 + # define SDMA_COPY_SUB_OPCODE_LINEAR 0 + # define SDMA_COPY_SUB_OPCODE_TILED 1 +diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h b/drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h +index c723602..ee6a041 100644 +--- a/drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h ++++ b/drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h +@@ -2163,5 +2163,10 @@ + #define SDMA_PKT_NOP_HEADER_sub_op_shift 8 + #define SDMA_PKT_NOP_HEADER_SUB_OP(x) (((x) & SDMA_PKT_NOP_HEADER_sub_op_mask) << SDMA_PKT_NOP_HEADER_sub_op_shift) + ++/*define for count field*/ ++#define SDMA_PKT_NOP_HEADER_count_offset 0 ++#define SDMA_PKT_NOP_HEADER_count_mask 0x00003FFF ++#define SDMA_PKT_NOP_HEADER_count_shift 16 ++#define SDMA_PKT_NOP_HEADER_COUNT(x) (((x) & SDMA_PKT_NOP_HEADER_count_mask) << SDMA_PKT_NOP_HEADER_count_shift) + + #endif /* __ICELAND_SDMA_PKT_OPEN_H_ */ +diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h b/drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h +index 099b7b5..e5ebd08 100644 +--- a/drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h ++++ b/drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h +@@ -2236,5 +2236,10 @@ + #define SDMA_PKT_NOP_HEADER_sub_op_shift 8 + #define SDMA_PKT_NOP_HEADER_SUB_OP(x) (((x) & SDMA_PKT_NOP_HEADER_sub_op_mask) << SDMA_PKT_NOP_HEADER_sub_op_shift) + ++/*define for count field*/ ++#define SDMA_PKT_NOP_HEADER_count_offset 0 ++#define SDMA_PKT_NOP_HEADER_count_mask 0x00003FFF ++#define SDMA_PKT_NOP_HEADER_count_shift 16 ++#define SDMA_PKT_NOP_HEADER_COUNT(x) (((x) & SDMA_PKT_NOP_HEADER_count_mask) << SDMA_PKT_NOP_HEADER_count_shift) + + #endif /* __TONGA_SDMA_PKT_OPEN_H_ */ +-- +1.9.1 + |