fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 08:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pvr: Rename rogue_fw.xml -> rogue_kmd_stream.xml.

Browse source 
The UMD does not care if firmware is used, and the current name isn't
very informative either.

Signed-off-by: Donald Robson <donald.robson@imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23872>
This commit is contained in:
Donald Robson 2023-05-12 09:35:12 +01:00 • committed by Marge Bot
parent 70f86b25a1
commit 3fc727b346
9 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/imagination/csbgen/meson.build
View file

@ -22,8 +22,8 @@
pvr_xml_files = [
'rogue_cdm.xml',
'rogue_cr.xml',
'rogue_fw.xml',
'rogue_ipf.xml',
'rogue_kmd_stream.xml',
'rogue_lls.xml',
'rogue_pbestate.xml',
'rogue_pds.xml',

2
src/imagination/csbgen/rogue_hwdefs.h
View file

@ -26,8 +26,8 @@
#include "rogue_cdm.h"
#include "rogue_cr.h"
#include "rogue_fw.h"
#include "rogue_ipf.h"
#include "rogue_kmd_stream.h"
#include "rogue_lls.h"
#include "rogue_pbestate.h"
#include "rogue_pds.h"

24
src/imagination/csbgen/rogue_fw.xml → src/imagination/csbgen/rogue_kmd_stream.xml
View file

@ -31,41 +31,41 @@ TODO: Once the kernel driver is merged upstream, check to see if this comment
needs updating.
-->
<csbgen name="ROGUE" prefix="FW">
<csbgen name="ROGUE" prefix="KMD_STREAM">
<struct name="STREAM_HDR" length="2">
<struct name="HDR" length="2">
<field name="length" start="0" end="31" type="uint"/>
</struct>
<define name="STREAM_EXTHDR_DATA_MASK" value="0xFFFFFFF"/>
<define name="EXTHDR_DATA_MASK" value="0xFFFFFFF"/>
<enum name="STREAM_EXTHDR_TYPE_COMPUTE">
<enum name="EXTHDR_TYPE_COMPUTE">
<value name="0" value="0"/>
</enum>
<enum name="STREAM_EXTHDR_TYPE_GEOM">
<enum name="EXTHDR_TYPE_GEOM">
<value name="0" value="0"/>
</enum>
<enum name="STREAM_EXTHDR_TYPE_FRAG">
<enum name="EXTHDR_TYPE_FRAG">
<value name="0" value="0"/>
</enum>
<struct name="STREAM_EXTHDR_COMPUTE0" length="1">
<field name="type" start="29" end="31" type="STREAM_EXTHDR_TYPE_COMPUTE" default="0"/>
<struct name="EXTHDR_COMPUTE0" length="1">
<field name="type" start="29" end="31" type="EXTHDR_TYPE_COMPUTE" default="0"/>
<field name="continuation" start="28" end="28" type="bool"/>
<field name="has_brn49927" start="0" end="0" type="bool"/>
</struct>
<struct name="STREAM_EXTHDR_FRAG0" length="1">
<field name="type" start="29" end="31" type="STREAM_EXTHDR_TYPE_FRAG" default="0"/>
<struct name="EXTHDR_FRAG0" length="1">
<field name="type" start="29" end="31" type="EXTHDR_TYPE_FRAG" default="0"/>
<field name="continuation" start="28" end="28" type="bool"/>
<field name="has_brn49927" start="1" end="1" type="bool"/>
<field name="has_brn47217" start="0" end="0" type="bool"/>
</struct>
<struct name="STREAM_EXTHDR_GEOM0" length="1">
<field name="type" start="29" end="31" type="STREAM_EXTHDR_TYPE_GEOM" default="0"/>
<struct name="EXTHDR_GEOM0" length="1">
<field name="type" start="29" end="31" type="EXTHDR_TYPE_GEOM" default="0"/>
<field name="continuation" start="28" end="28" type="bool"/>
<field name="has_brn49927" start="0" end="0" type="bool"/>
</struct>

12
src/imagination/vulkan/pvr_job_compute.c
View file

@ -52,7 +52,7 @@ pvr_submit_info_stream_init(struct pvr_compute_ctx *ctx,
uint32_t *stream_len_ptr = stream_ptr;
/* Leave space for stream header. */
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
pvr_csb_pack ((uint64_t *)stream_ptr,
CR_TPU_BORDER_COLOUR_TABLE_CDM,
@ -130,7 +130,7 @@ pvr_submit_info_stream_init(struct pvr_compute_ctx *ctx,
(uint8_t *)stream_ptr - (uint8_t *)submit_info->fw_stream;
assert(submit_info->fw_stream_len <= ARRAY_SIZE(submit_info->fw_stream));
pvr_csb_pack ((uint64_t *)stream_len_ptr, FW_STREAM_HDR, value) {
pvr_csb_pack ((uint64_t *)stream_len_ptr, KMD_STREAM_HDR, value) {
value.length = submit_info->fw_stream_len;
}
}
@ -144,15 +144,15 @@ static void pvr_submit_info_ext_stream_init(
uint32_t *stream_ptr = (uint32_t *)submit_info->fw_stream;
uint32_t main_stream_len =
pvr_csb_unpack((uint64_t *)stream_ptr, FW_STREAM_HDR).length;
pvr_csb_unpack((uint64_t *)stream_ptr, KMD_STREAM_HDR).length;
uint32_t *ext_stream_ptr =
(uint32_t *)((uint8_t *)stream_ptr + main_stream_len);
uint32_t *header0_ptr;
header0_ptr = ext_stream_ptr;
ext_stream_ptr += pvr_cmd_length(FW_STREAM_EXTHDR_COMPUTE0);
ext_stream_ptr += pvr_cmd_length(KMD_STREAM_EXTHDR_COMPUTE0);
pvr_csb_pack (header0_ptr, FW_STREAM_EXTHDR_COMPUTE0, header0) {
pvr_csb_pack (header0_ptr, KMD_STREAM_EXTHDR_COMPUTE0, header0) {
if (PVR_HAS_QUIRK(dev_info, 49927)) {
header0.has_brn49927 = true;
@ -163,7 +163,7 @@ static void pvr_submit_info_ext_stream_init(
}
}
if ((*header0_ptr & PVRX(FW_STREAM_EXTHDR_DATA_MASK)) != 0) {
if ((*header0_ptr & PVRX(KMD_STREAM_EXTHDR_DATA_MASK)) != 0) {
submit_info->fw_stream_len =
(uint8_t *)ext_stream_ptr - (uint8_t *)submit_info->fw_stream;
assert(submit_info->fw_stream_len <= ARRAY_SIZE(submit_info->fw_stream));

24
src/imagination/vulkan/pvr_job_render.c
View file

@ -945,7 +945,7 @@ static void pvr_geom_state_stream_init(struct pvr_render_ctx *ctx,
uint32_t *stream_len_ptr = stream_ptr;
/* Leave space for stream header. */
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
pvr_csb_pack ((uint64_t *)stream_ptr, CR_VDM_CTRL_STREAM_BASE, value) {
value.addr = job->ctrl_stream_addr;
@ -997,7 +997,7 @@ static void pvr_geom_state_stream_init(struct pvr_render_ctx *ctx,
state->fw_stream_len = (uint8_t *)stream_ptr - (uint8_t *)state->fw_stream;
assert(state->fw_stream_len <= ARRAY_SIZE(state->fw_stream));
pvr_csb_pack ((uint64_t *)stream_len_ptr, FW_STREAM_HDR, value) {
pvr_csb_pack ((uint64_t *)stream_len_ptr, KMD_STREAM_HDR, value) {
value.length = state->fw_stream_len;
}
}
@ -1010,15 +1010,15 @@ pvr_geom_state_stream_ext_init(struct pvr_render_ctx *ctx,
const struct pvr_device_info *dev_info = &ctx->device->pdevice->dev_info;
uint32_t main_stream_len =
pvr_csb_unpack((uint64_t *)state->fw_stream, FW_STREAM_HDR).length;
pvr_csb_unpack((uint64_t *)state->fw_stream, KMD_STREAM_HDR).length;
uint32_t *ext_stream_ptr =
(uint32_t *)((uint8_t *)state->fw_stream + main_stream_len);
uint32_t *header0_ptr;
header0_ptr = ext_stream_ptr;
ext_stream_ptr += pvr_cmd_length(FW_STREAM_EXTHDR_GEOM0);
ext_stream_ptr += pvr_cmd_length(KMD_STREAM_EXTHDR_GEOM0);
pvr_csb_pack (header0_ptr, FW_STREAM_EXTHDR_GEOM0, header0) {
pvr_csb_pack (header0_ptr, KMD_STREAM_EXTHDR_GEOM0, header0) {
if (PVR_HAS_QUIRK(dev_info, 49927)) {
header0.has_brn49927 = true;
@ -1032,7 +1032,7 @@ pvr_geom_state_stream_ext_init(struct pvr_render_ctx *ctx,
}
}
if ((*header0_ptr & PVRX(FW_STREAM_EXTHDR_DATA_MASK)) != 0) {
if ((*header0_ptr & PVRX(KMD_STREAM_EXTHDR_DATA_MASK)) != 0) {
state->fw_stream_len =
(uint8_t *)ext_stream_ptr - (uint8_t *)state->fw_stream;
assert(state->fw_stream_len <= ARRAY_SIZE(state->fw_stream));
@ -1082,7 +1082,7 @@ static void pvr_frag_state_stream_init(struct pvr_render_ctx *ctx,
uint32_t isp_ctl;
/* Leave space for stream header. */
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
/* FIXME: pass in the number of samples rather than isp_aa_mode? */
pvr_setup_tiles_in_flight(dev_info,
@ -1368,7 +1368,7 @@ static void pvr_frag_state_stream_init(struct pvr_render_ctx *ctx,
state->fw_stream_len = (uint8_t *)stream_ptr - (uint8_t *)state->fw_stream;
assert(state->fw_stream_len <= ARRAY_SIZE(state->fw_stream));
pvr_csb_pack ((uint64_t *)stream_len_ptr, FW_STREAM_HDR, value) {
pvr_csb_pack ((uint64_t *)stream_len_ptr, KMD_STREAM_HDR, value) {
value.length = state->fw_stream_len;
}
}
@ -1381,15 +1381,15 @@ pvr_frag_state_stream_ext_init(struct pvr_render_ctx *ctx,
const struct pvr_device_info *dev_info = &ctx->device->pdevice->dev_info;
uint32_t main_stream_len =
pvr_csb_unpack((uint64_t *)state->fw_stream, FW_STREAM_HDR).length;
pvr_csb_unpack((uint64_t *)state->fw_stream, KMD_STREAM_HDR).length;
uint32_t *ext_stream_ptr =
(uint32_t *)((uint8_t *)state->fw_stream + main_stream_len);
uint32_t *header0_ptr;
header0_ptr = ext_stream_ptr;
ext_stream_ptr += pvr_cmd_length(FW_STREAM_EXTHDR_FRAG0);
ext_stream_ptr += pvr_cmd_length(KMD_STREAM_EXTHDR_FRAG0);
pvr_csb_pack (header0_ptr, FW_STREAM_EXTHDR_FRAG0, header0) {
pvr_csb_pack (header0_ptr, KMD_STREAM_EXTHDR_FRAG0, header0) {
if (PVR_HAS_QUIRK(dev_info, 49927)) {
header0.has_brn49927 = true;
@ -1403,7 +1403,7 @@ pvr_frag_state_stream_ext_init(struct pvr_render_ctx *ctx,
}
}
if ((*header0_ptr & PVRX(FW_STREAM_EXTHDR_DATA_MASK)) != 0) {
if ((*header0_ptr & PVRX(KMD_STREAM_EXTHDR_DATA_MASK)) != 0) {
state->fw_stream_len =
(uint8_t *)ext_stream_ptr - (uint8_t *)state->fw_stream;
assert(state->fw_stream_len <= ARRAY_SIZE(state->fw_stream));

4
src/imagination/vulkan/pvr_job_transfer.c
View file

@ -5668,7 +5668,7 @@ pvr_submit_info_stream_init(struct pvr_transfer_ctx *ctx,
uint32_t *stream_len_ptr = stream_ptr;
/* Leave space for stream header. */
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
*(uint64_t *)stream_ptr = regs->pds_bgnd0_base;
stream_ptr += pvr_cmd_length(CR_PDS_BGRND0_BASE);
@ -5740,7 +5740,7 @@ pvr_submit_info_stream_init(struct pvr_transfer_ctx *ctx,
cmd->fw_stream_len = (uint8_t *)stream_ptr - (uint8_t *)cmd->fw_stream;
assert(cmd->fw_stream_len <= ARRAY_SIZE(cmd->fw_stream));
pvr_csb_pack ((uint64_t *)stream_len_ptr, FW_STREAM_HDR, value) {
pvr_csb_pack ((uint64_t *)stream_len_ptr, KMD_STREAM_HDR, value) {
value.length = cmd->fw_stream_len;
}
}

10
src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_compute.c
View file

@ -147,9 +147,9 @@ pvr_srv_compute_cmd_stream_load(struct rogue_fwif_cmd_compute *const cmd,
const uint32_t *stream_ptr = (const uint32_t *)stream;
struct rogue_fwif_cdm_regs *const regs = &cmd->regs;
uint32_t main_stream_len =
pvr_csb_unpack((uint64_t *)stream_ptr, FW_STREAM_HDR).length;
pvr_csb_unpack((uint64_t *)stream_ptr, KMD_STREAM_HDR).length;
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
regs->tpu_border_colour_table = *(const uint64_t *)stream_ptr;
stream_ptr += pvr_cmd_length(CR_TPU_BORDER_COLOUR_TABLE_CDM);
@ -193,10 +193,10 @@ static void pvr_srv_compute_cmd_ext_stream_load(
(const uint32_t *)((uint8_t *)stream + ext_stream_offset);
struct rogue_fwif_cdm_regs *const regs = &cmd->regs;
struct PVRX(FW_STREAM_EXTHDR_COMPUTE0) header0;
struct PVRX(KMD_STREAM_EXTHDR_COMPUTE0) header0;
header0 = pvr_csb_unpack(ext_stream_ptr, FW_STREAM_EXTHDR_COMPUTE0);
ext_stream_ptr += pvr_cmd_length(FW_STREAM_EXTHDR_COMPUTE0);
header0 = pvr_csb_unpack(ext_stream_ptr, KMD_STREAM_EXTHDR_COMPUTE0);
ext_stream_ptr += pvr_cmd_length(KMD_STREAM_EXTHDR_COMPUTE0);
assert(PVR_HAS_QUIRK(dev_info, 49927) == header0.has_brn49927);
if (header0.has_brn49927) {

20
src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_render.c
View file

@ -643,9 +643,9 @@ pvr_srv_geometry_cmd_stream_load(struct rogue_fwif_cmd_ta *const cmd,
const uint32_t *stream_ptr = (const uint32_t *)stream;
struct rogue_fwif_ta_regs *const regs = &cmd->regs;
uint32_t main_stream_len =
pvr_csb_unpack((const uint64_t *)stream_ptr, FW_STREAM_HDR).length;
pvr_csb_unpack((const uint64_t *)stream_ptr, KMD_STREAM_HDR).length;
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
regs->vdm_ctrl_stream_base = *(const uint64_t *)stream_ptr;
stream_ptr += pvr_cmd_length(CR_VDM_CTRL_STREAM_BASE);
@ -682,10 +682,10 @@ static void pvr_srv_geometry_cmd_ext_stream_load(
(const uint32_t *)((uint8_t *)stream + ext_stream_offset);
struct rogue_fwif_ta_regs *const regs = &cmd->regs;
struct PVRX(FW_STREAM_EXTHDR_GEOM0) header0;
struct PVRX(KMD_STREAM_EXTHDR_GEOM0) header0;
header0 = pvr_csb_unpack(ext_stream_ptr, FW_STREAM_EXTHDR_GEOM0);
ext_stream_ptr += pvr_cmd_length(FW_STREAM_EXTHDR_GEOM0);
header0 = pvr_csb_unpack(ext_stream_ptr, KMD_STREAM_EXTHDR_GEOM0);
ext_stream_ptr += pvr_cmd_length(KMD_STREAM_EXTHDR_GEOM0);
assert(PVR_HAS_QUIRK(dev_info, 49927) == header0.has_brn49927);
if (header0.has_brn49927) {
@ -745,9 +745,9 @@ pvr_srv_fragment_cmd_stream_load(struct rogue_fwif_cmd_3d *const cmd,
const uint32_t *stream_ptr = (const uint32_t *)stream;
struct rogue_fwif_3d_regs *const regs = &cmd->regs;
uint32_t main_stream_len =
pvr_csb_unpack((const uint64_t *)stream_ptr, FW_STREAM_HDR).length;
pvr_csb_unpack((const uint64_t *)stream_ptr, KMD_STREAM_HDR).length;
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
regs->isp_scissor_base = *(const uint64_t *)stream_ptr;
stream_ptr += pvr_cmd_length(CR_ISP_SCISSOR_BASE);
@ -865,10 +865,10 @@ static void pvr_srv_fragment_cmd_ext_stream_load(
(const uint32_t *)((uint8_t *)stream + ext_stream_offset);
struct rogue_fwif_3d_regs *const regs = &cmd->regs;
struct PVRX(FW_STREAM_EXTHDR_FRAG0) header0;
struct PVRX(KMD_STREAM_EXTHDR_FRAG0) header0;
header0 = pvr_csb_unpack(ext_stream_ptr, FW_STREAM_EXTHDR_FRAG0);
ext_stream_ptr += pvr_cmd_length(FW_STREAM_EXTHDR_FRAG0);
header0 = pvr_csb_unpack(ext_stream_ptr, KMD_STREAM_EXTHDR_FRAG0);
ext_stream_ptr += pvr_cmd_length(KMD_STREAM_EXTHDR_FRAG0);
assert(PVR_HAS_QUIRK(dev_info, 49927) == header0.has_brn49927);
if (header0.has_brn49927) {

4
src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_transfer.c
View file

@ -141,9 +141,9 @@ pvr_srv_transfer_cmd_stream_load(struct rogue_fwif_cmd_transfer *const cmd,
const uint32_t *stream_ptr = (const uint32_t *)stream;
struct rogue_fwif_transfer_regs *const regs = &cmd->regs;
uint32_t main_stream_len =
pvr_csb_unpack((uint64_t *)stream_ptr, FW_STREAM_HDR).length;
pvr_csb_unpack((uint64_t *)stream_ptr, KMD_STREAM_HDR).length;
stream_ptr += pvr_cmd_length(FW_STREAM_HDR);
stream_ptr += pvr_cmd_length(KMD_STREAM_HDR);
regs->pds_bgnd0_base = *(uint64_t *)stream_ptr;
stream_ptr += pvr_cmd_length(CR_PDS_BGRND0_BASE);