Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3553a8ea authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Exit early from psr_status if PSR is not supported by the device 



Static analysis was complaining that a path existed where we could use
stat[] uninitialized. Fix this by simplifying the logic to exit early if
PSR isn't supported.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9d0d3fda

drivers/gpu/drm/i915/i915_debugfs.c

+15 −12
Original line number Diff line number Diff line
@@ -2234,6 +2234,11 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) 
	enum pipe pipe;

	bool enabled = false;



	if (!HAS_PSR(dev)) {

		seq_puts(m, "PSR not supported\n");

		return 0;

	}



	intel_runtime_pm_get(dev_priv);



	mutex_lock(&dev_priv->psr.lock);
@@ -2246,7 +2251,6 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) 
	seq_printf(m, "Re-enable work scheduled: %s\n",

		   yesno(work_busy(&dev_priv->psr.work.work)));



	if (HAS_PSR(dev)) {

	if (HAS_DDI(dev))

		enabled = I915_READ(EDP_PSR_CTL(dev)) & EDP_PSR_ENABLE;

	else {
@@ -2258,7 +2262,6 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) 
				enabled = true;

		}

	}

	}

	seq_printf(m, "HW Enabled & Active bit: %s", yesno(enabled));



	if (!HAS_DDI(dev))
@@ -2273,7 +2276,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) 
		   yesno((bool)dev_priv->psr.link_standby));



	/* CHV PSR has no kind of performance counter */

	if (HAS_PSR(dev) && HAS_DDI(dev)) {

	if (HAS_DDI(dev)) {

		psrperf = I915_READ(EDP_PSR_PERF_CNT(dev)) &

			EDP_PSR_PERF_CNT_MASK;