5 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
index 612cb18f34c..ec7d8b5ff19 100644
--- a/src/gallium/drivers/radeon/radeon_uvd.c
+++ b/src/gallium/drivers/radeon/radeon_uvd.c
@@ -1379,7 +1379,7 @@ static unsigned texture_offset(struct radeon_surf *surface, unsigned layer,
    switch (type) {
    default:
    case RUVD_SURFACE_TYPE_LEGACY:
-      return surface->u.legacy.level[0].offset +
+      return (uint64_t)surface->u.legacy.level[0].offset_256B * 256 +
              layer * (uint64_t)surface->u.legacy.level[0].slice_size_dw * 4;
       break;
    case RUVD_SURFACE_TYPE_GFX9:
diff --git a/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c b/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c
index e90fecd595f..b76d2dc6a4e 100644
--- a/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c
+++ b/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c
@@ -898,8 +898,8 @@ static void radeon_uvd_enc_encode_params_hevc(struct radeon_uvd_encoder *enc)
    RADEON_ENC_CS(enc->enc_pic.enc_params.allowed_max_bitstream_size);
 
    if (sscreen->info.chip_class < GFX9) {
-      RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, enc->luma->u.legacy.level[0].offset);
-      RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, enc->chroma->u.legacy.level[0].offset);
+      RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, (uint64_t)enc->luma->u.legacy.level[0].offset_256B * 256);
+      RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, (uint64_t)enc->chroma->u.legacy.level[0].offset_256B * 256);
    } else {
       RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, enc->luma->u.gfx9.surf_offset);
       RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, enc->chroma->u.gfx9.surf_offset);
diff --git a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
index ee7cf15e1e6..30b43536c4a 100644
--- a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
+++ b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
@@ -308,9 +308,9 @@ static void encode(struct rvce_encoder *enc)
    RVCE_CS(0x00000000);    // endOfSequence
    RVCE_CS(0x00000000);    // endOfStream
    RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
-             enc->luma->u.legacy.level[0].offset); // inputPictureLumaAddressHi/Lo
+             (uint64_t)enc->luma->u.legacy.level[0].offset_256B * 256); // inputPictureLumaAddressHi/Lo
    RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
-             enc->chroma->u.legacy.level[0].offset);              // inputPictureChromaAddressHi/Lo
+             (uint64_t)enc->chroma->u.legacy.level[0].offset_256B * 256);              // inputPictureChromaAddressHi/Lo
    RVCE_CS(align(enc->luma->u.legacy.level[0].nblk_y, 16));       // encInputFrameYPitch
    RVCE_CS(enc->luma->u.legacy.level[0].nblk_x * enc->luma->bpe); // encInputPicLumaPitch
    RVCE_CS(enc->chroma->u.legacy.level[0].nblk_x * enc->chroma->bpe); // encInputPicChromaPitch
diff --git a/src/gallium/drivers/radeon/radeon_vce_50.c b/src/gallium/drivers/radeon/radeon_vce_50.c
index 591207c6f96..e75ceec5950 100644
--- a/src/gallium/drivers/radeon/radeon_vce_50.c
+++ b/src/gallium/drivers/radeon/radeon_vce_50.c
@@ -118,9 +118,9 @@ static void encode(struct rvce_encoder *enc)
    RVCE_CS(0x00000000);                      // endOfSequence
    RVCE_CS(0x00000000);                      // endOfStream
    RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
-             enc->luma->u.legacy.level[0].offset); // inputPictureLumaAddressHi/Lo
+             (uint64_t)enc->luma->u.legacy.level[0].offset_256B * 256); // inputPictureLumaAddressHi/Lo
    RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
-             enc->chroma->u.legacy.level[0].offset);              // inputPictureChromaAddressHi/Lo
+             (uint64_t)enc->chroma->u.legacy.level[0].offset_256B * 256);              // inputPictureChromaAddressHi/Lo
    RVCE_CS(align(enc->luma->u.legacy.level[0].nblk_y, 16));       // encInputFrameYPitch
    RVCE_CS(enc->luma->u.legacy.level[0].nblk_x * enc->luma->bpe); // encInputPicLumaPitch
    RVCE_CS(enc->chroma->u.legacy.level[0].nblk_x * enc->chroma->bpe); // encInputPicChromaPitch
diff --git a/src/gallium/drivers/radeon/radeon_vce_52.c b/src/gallium/drivers/radeon/radeon_vce_52.c
index ea1ccec00b8..f70534d14be 100644
--- a/src/gallium/drivers/radeon/radeon_vce_52.c
+++ b/src/gallium/drivers/radeon/radeon_vce_52.c
@@ -263,9 +263,9 @@ static void encode(struct rvce_encoder *enc)
 
    if (sscreen->info.chip_class < GFX9) {
       RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
-                enc->luma->u.legacy.level[0].offset); // inputPictureLumaAddressHi/Lo
+                (uint64_t)enc->luma->u.legacy.level[0].offset_256B * 256); // inputPictureLumaAddressHi/Lo
       RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
-                enc->chroma->u.legacy.level[0].offset);        // inputPictureChromaAddressHi/Lo
+                (uint64_t)enc->chroma->u.legacy.level[0].offset_256B * 256);        // inputPictureChromaAddressHi/Lo
       RVCE_CS(align(enc->luma->u.legacy.level[0].nblk_y, 16)); // encInputFrameYPitch
       RVCE_CS(enc->luma->u.legacy.level[0].nblk_x * enc->luma->bpe);     // encInputPicLumaPitch
       RVCE_CS(enc->chroma->u.legacy.level[0].nblk_x * enc->chroma->bpe); // encInputPicChromaPitch