| Message ID | 786195f92466317f521404be744629b0a077c491.1744208554.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915: error capture cleanups and refactor | expand |
On Wed, 09 Apr 2025, Jani Nikula <jani.nikula@intel.com> wrote: > Avoid using PCH checks in core i915 code, in preparation for moving PCH > handling to display. Ville, care to provide your rb on this one too please, so I can merge the series after I get CI results? Thanks, Jani. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 62e4a293ed9b..aa2cad910902 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -1792,7 +1792,7 @@ static void gt_record_global_nonguc_regs(struct intel_gt_coredump *gt) > gt->gtier[i] = > intel_uncore_read(uncore, GEN8_GT_IER(i)); > gt->ngtier = 4; > - } else if (HAS_PCH_SPLIT(i915)) { > + } else if (GRAPHICS_VER(i915) >= 5) { > gt->gtier[0] = intel_uncore_read(uncore, GTIER); > gt->ngtier = 1; > } else {
On Wed, Apr 09, 2025 at 05:23:47PM +0300, Jani Nikula wrote: > Avoid using PCH checks in core i915 code, in preparation for moving PCH > handling to display. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 62e4a293ed9b..aa2cad910902 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -1792,7 +1792,7 @@ static void gt_record_global_nonguc_regs(struct intel_gt_coredump *gt) > gt->gtier[i] = > intel_uncore_read(uncore, GEN8_GT_IER(i)); > gt->ngtier = 4; > - } else if (HAS_PCH_SPLIT(i915)) { > + } else if (GRAPHICS_VER(i915) >= 5) { This would now cover VLV correctly as well, so you could drop the vlv special case at the top of the if ladder completely. Either way Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > gt->gtier[0] = intel_uncore_read(uncore, GTIER); > gt->ngtier = 1; > } else { > -- > 2.39.5
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 62e4a293ed9b..aa2cad910902 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -1792,7 +1792,7 @@ static void gt_record_global_nonguc_regs(struct intel_gt_coredump *gt) gt->gtier[i] = intel_uncore_read(uncore, GEN8_GT_IER(i)); gt->ngtier = 4; - } else if (HAS_PCH_SPLIT(i915)) { + } else if (GRAPHICS_VER(i915) >= 5) { gt->gtier[0] = intel_uncore_read(uncore, GTIER); gt->ngtier = 1; } else {
Avoid using PCH checks in core i915 code, in preparation for moving PCH handling to display. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)