From: Ruijing Dong <ruijing.dong@amd.com>
Date: Fri, 2 Dec 2022 20:58:24 +0000 (-0500)
Subject: gallium: add film_grain_target into av1 dec desc
X-Git-Tag: upstream/22.3.5~205
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ce0bd2e90978aa6c0df858d385701080afca200;p=platform%2Fupstream%2Fmesa.git

gallium: add film_grain_target into av1 dec desc

In vaapi, film_grain output will need to direct into
other output surface instead of the current render_target.

CC: 22.3
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20139>
(cherry picked from commit b70953f5baacb9066fc737ec56be678a2ebad425)
---

diff --git a/.pick_status.json b/.pick_status.json
index 1a7bcce..5fed0d2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5863,7 +5863,7 @@
         "description": "gallium: add film_grain_target into av1 dec desc",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index 26f0ad5..0b7ed1e 100644
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -932,7 +932,7 @@ struct pipe_av1_picture_desc
    struct pipe_picture_desc base;
 
    struct pipe_video_buffer *ref[16];
-
+   struct pipe_video_buffer *film_grain_target;
    struct {
       uint8_t profile;
       uint8_t order_hint_bits_minus_1;