On Sun, Aug 30, 2015 at 10:12 PM, Marek Olšák <[email protected]> wrote:
> From: Marek Olšák <[email protected]>
>
> This is always false on amdgpu (set by calloc).
> ---
> src/gallium/drivers/radeon/radeon_winsys.h | 1 +
> src/gallium/winsys/radeon/drm/radeon_drm_cs.c | 4 +---
> src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 4 ++++
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/drivers/radeon/radeon_winsys.h
> b/src/gallium/drivers/radeon/radeon_winsys.h
> index a4a2ae1..00accd5 100644
> --- a/src/gallium/drivers/radeon/radeon_winsys.h
> +++ b/src/gallium/drivers/radeon/radeon_winsys.h
> @@ -223,6 +223,7 @@ struct radeon_info {
> boolean has_uvd;
> uint32_t vce_fw_version;
> boolean has_userptr;
> + bool gfx_ib_pad_with_type2;
>
> uint32_t r300_num_gb_pipes;
> uint32_t r300_num_z_pipes;
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
> b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
> index 341af55..2e30ee6 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
> @@ -471,9 +471,7 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs
> *rcs,
> * hawaii with old firmware needs type2 nop packet.
> * accel_working2 with value 3 indicates the new firmware.
Perhaps part of this comment should be moved too?
> */
> - if (cs->ws->info.chip_class <= SI ||
> - (cs->ws->info.family == CHIP_HAWAII &&
> - cs->ws->accel_working2 < 3)) {
> + if (cs->ws->info.gfx_ib_pad_with_type2) {
> while (rcs->cdw & 7)
> OUT_CS(&cs->base, 0x80000000); /* type2 nop packet */
> } else {
Gražvydas
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
