diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2014-02-11 10:48:46 +0800 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2014-09-30 12:21:03 +0100 |
| commit | d2e4eb3619fa61013f7704f55d0516fb380ac49b (patch) | |
| tree | 9ea0b15afb043d94ad67d84d8475c3601d3830c3 | |
| parent | 54465b8ac5d97560a27f04683448ab74b466a89a (diff) | |
mediafill/skl: Follow spec to configure FORCE_MEDIA_AWAKE in PIPELINE_SELECTION
The FORCE_MEDIA_AWAKE bit is added for the PIPELINE_SELECTION command and
some instructions requires that the media enginee is awake.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
| -rw-r--r-- | lib/gen8_media.h | 7 | ||||
| -rw-r--r-- | lib/media_fill_gen9.c | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/gen8_media.h b/lib/gen8_media.h index d1df8b9d..f654215a 100644 --- a/lib/gen8_media.h +++ b/lib/gen8_media.h @@ -374,4 +374,11 @@ struct gen8_surface_state #define GEN9_PIPELINE_SELECTION_MASK (3 << 8) +/* If enabled, it will force awake media enginee and the following instructions + * will require that the media enginee is awake. + */ +#define GEN9_FORCE_MEDIA_AWAKE_DISABLE (0 << 5) +#define GEN9_FORCE_MEDIA_AWAKE_ENABLE (1 << 5) +#define GEN9_FORCE_MEDIA_AWAKE_MASK (1 << 13) + #endif /* GEN8_MEDIA_H */ diff --git a/lib/media_fill_gen9.c b/lib/media_fill_gen9.c index df0407da..4ecf2683 100644 --- a/lib/media_fill_gen9.c +++ b/lib/media_fill_gen9.c @@ -363,7 +363,9 @@ gen9_media_fillfunc(struct intel_batchbuffer *batch, /* media pipeline */ batch->ptr = batch->buffer; OUT_BATCH(GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA | - GEN9_PIPELINE_SELECTION_MASK); + GEN9_FORCE_MEDIA_AWAKE_ENABLE | + GEN9_PIPELINE_SELECTION_MASK | + GEN9_FORCE_MEDIA_AWAKE_MASK); gen9_emit_state_base_address(batch); gen8_emit_vfe_state(batch); @@ -374,6 +376,11 @@ gen9_media_fillfunc(struct intel_batchbuffer *batch, gen8_emit_media_objects(batch, x, y, width, height); + OUT_BATCH(GEN8_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA | + GEN9_FORCE_MEDIA_AWAKE_DISABLE | + GEN9_PIPELINE_SELECTION_MASK | + GEN9_FORCE_MEDIA_AWAKE_MASK); + OUT_BATCH(MI_BATCH_BUFFER_END); batch_end = batch_align(batch, 8); |