Skip to content

Commit 805615d

Browse files
committed
drm/i915: Remove useless error return from intel_init_mocs_engine()
As the only error is for a programming error in constructing the static tables describing the register values, replace the error code propagation with an assert. Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent fc0c5a9 commit 805615d

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

drivers/gpu/drm/i915/intel_lrc.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1769,11 +1769,7 @@ static bool unexpected_starting_state(struct intel_engine_cs *engine)
17691769

17701770
static int gen8_init_common_ring(struct intel_engine_cs *engine)
17711771
{
1772-
int ret;
1773-
1774-
ret = intel_mocs_init_engine(engine);
1775-
if (ret)
1776-
return ret;
1772+
intel_mocs_init_engine(engine);
17771773

17781774
intel_engine_reset_breadcrumbs(engine);
17791775

drivers/gpu/drm/i915/intel_mocs.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,20 +232,17 @@ static i915_reg_t mocs_register(enum intel_engine_id engine_id, int index)
232232
*
233233
* This function simply emits a MI_LOAD_REGISTER_IMM command for the
234234
* given table starting at the given address.
235-
*
236-
* Return: 0 on success, otherwise the error status.
237235
*/
238-
int intel_mocs_init_engine(struct intel_engine_cs *engine)
236+
void intel_mocs_init_engine(struct intel_engine_cs *engine)
239237
{
240238
struct drm_i915_private *dev_priv = engine->i915;
241239
struct drm_i915_mocs_table table;
242240
unsigned int index;
243241

244242
if (!get_mocs_settings(dev_priv, &table))
245-
return 0;
243+
return;
246244

247-
if (WARN_ON(table.size > GEN9_NUM_MOCS_ENTRIES))
248-
return -ENODEV;
245+
GEM_BUG_ON(table.size > GEN9_NUM_MOCS_ENTRIES);
249246

250247
for (index = 0; index < table.size; index++)
251248
I915_WRITE(mocs_register(engine->id, index),
@@ -262,8 +259,6 @@ int intel_mocs_init_engine(struct intel_engine_cs *engine)
262259
for (; index < GEN9_NUM_MOCS_ENTRIES; index++)
263260
I915_WRITE(mocs_register(engine->id, index),
264261
table.table[0].control_value);
265-
266-
return 0;
267262
}
268263

269264
/**

drivers/gpu/drm/i915/intel_mocs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@
5454

5555
int intel_rcs_context_init_mocs(struct i915_request *rq);
5656
void intel_mocs_init_l3cc_table(struct drm_i915_private *dev_priv);
57-
int intel_mocs_init_engine(struct intel_engine_cs *engine);
57+
void intel_mocs_init_engine(struct intel_engine_cs *engine);
5858

5959
#endif

0 commit comments

Comments
 (0)