drm/i915: Move MOCS setup to intel_mocs.c
Hide the details of MOCS setup from i915_gem by moving both current calls into one in intel_mocs_init. Cc: Stuart Summers <stuart.summers@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Stuart Summers <stuart.summers@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190713010940.17711-21-lucas.demarchi@intel.com Link: https://patchwork.freedesktop.org/patch/msgid/20190730180407.5993-6-lucas.demarchi@intel.com
This commit is contained in:
parent
a7a7a0e6eb
commit
1b6c3c6d46
|
@ -426,14 +426,13 @@ void intel_mocs_init_engine(struct intel_engine_cs *engine)
|
|||
*
|
||||
* This function initializes the MOCS global registers.
|
||||
*/
|
||||
void intel_mocs_init_global(struct intel_gt *gt)
|
||||
static void intel_mocs_init_global(struct intel_gt *gt)
|
||||
{
|
||||
struct intel_uncore *uncore = gt->uncore;
|
||||
struct drm_i915_mocs_table table;
|
||||
unsigned int index;
|
||||
|
||||
if (!HAS_GLOBAL_MOCS_REGISTERS(gt->i915))
|
||||
return;
|
||||
GEM_BUG_ON(!HAS_GLOBAL_MOCS_REGISTERS(gt->i915));
|
||||
|
||||
if (!get_mocs_settings(gt, &table))
|
||||
return;
|
||||
|
@ -599,7 +598,7 @@ static int emit_mocs_l3cc_table(struct i915_request *rq,
|
|||
*
|
||||
* Return: Nothing.
|
||||
*/
|
||||
void intel_mocs_init_l3cc_table(struct intel_gt *gt)
|
||||
static void intel_mocs_init_l3cc_table(struct intel_gt *gt)
|
||||
{
|
||||
struct intel_uncore *uncore = gt->uncore;
|
||||
struct drm_i915_mocs_table table;
|
||||
|
@ -678,3 +677,11 @@ int intel_mocs_emit(struct i915_request *rq)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void intel_mocs_init(struct intel_gt *gt)
|
||||
{
|
||||
intel_mocs_init_l3cc_table(gt);
|
||||
|
||||
if (HAS_GLOBAL_MOCS_REGISTERS(gt->i915))
|
||||
intel_mocs_init_global(gt);
|
||||
}
|
||||
|
|
|
@ -53,8 +53,7 @@ struct i915_request;
|
|||
struct intel_engine_cs;
|
||||
struct intel_gt;
|
||||
|
||||
void intel_mocs_init_l3cc_table(struct intel_gt *gt);
|
||||
void intel_mocs_init_global(struct intel_gt *gt);
|
||||
void intel_mocs_init(struct intel_gt *gt);
|
||||
void intel_mocs_init_engine(struct intel_engine_cs *engine);
|
||||
|
||||
int intel_mocs_emit(struct i915_request *rq);
|
||||
|
|
|
@ -1247,8 +1247,7 @@ int i915_gem_init_hw(struct drm_i915_private *i915)
|
|||
goto out;
|
||||
}
|
||||
|
||||
intel_mocs_init_global(gt);
|
||||
intel_mocs_init_l3cc_table(gt);
|
||||
intel_mocs_init(gt);
|
||||
|
||||
intel_engines_set_scheduler_caps(i915);
|
||||
|
||||
|
|
Loading…
Reference in New Issue