| Message ID | 20191024195122.22877-3-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] drm/i915: Add is_dgfx to device info | expand |
On 10/24/19 12:51 PM, Lucas De Marchi wrote: > On dgfx there's no LLC and eDRAM control table. Since now this > also means the device has global MOCS, just return early on the > initialization function. > > L3 settings still apply and still need to be tweaked. > > Bspec: 45101 > > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_mocs.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c > index 932833e5b712..9e19637e0225 100644 > --- a/drivers/gpu/drm/i915/gt/intel_mocs.c > +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c > @@ -462,6 +462,12 @@ static void intel_mocs_init_global(struct intel_gt *gt) > struct drm_i915_mocs_table table; > unsigned int index; > > + /* > + * LLC and eDRAM control values are not only applicable to dgfx the "only" in this sentence is confusing IMO. With it removed: Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Daniele > + */ > + if (IS_DGFX(gt->i915)) > + return; > + > GEM_BUG_ON(!HAS_GLOBAL_MOCS_REGISTERS(gt->i915)); > > if (!get_mocs_settings(gt->i915, &table)) >
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c index 932833e5b712..9e19637e0225 100644 --- a/drivers/gpu/drm/i915/gt/intel_mocs.c +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c @@ -462,6 +462,12 @@ static void intel_mocs_init_global(struct intel_gt *gt) struct drm_i915_mocs_table table; unsigned int index; + /* + * LLC and eDRAM control values are not only applicable to dgfx + */ + if (IS_DGFX(gt->i915)) + return; + GEM_BUG_ON(!HAS_GLOBAL_MOCS_REGISTERS(gt->i915)); if (!get_mocs_settings(gt->i915, &table))
On dgfx there's no LLC and eDRAM control table. Since now this also means the device has global MOCS, just return early on the initialization function. L3 settings still apply and still need to be tweaked. Bspec: 45101 Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/gt/intel_mocs.c | 6 ++++++ 1 file changed, 6 insertions(+)