Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Nischal Varide <nischal.varide@intel.com>
To: intel-gfx@lists.freedesktop.org, nischal.varide@intel.com
Subject: [Intel-gfx] [PATCH 1/5] Critical-KclockWork-Fixes-intel_atomi.c-PossibleNull
Date: Wed, 19 Aug 2020 10:04:05 +0530	[thread overview]
Message-ID: <20200819043409.26010-1-nischal.varide@intel.com> (raw)

This Patch fixes the Klocwork errors and the Current fix is avoiding
Possible Null Pointer Dereference

Signed-off-by: Nischal Varide <nischal.varide@intel.com>
---
 drivers/gpu/drm/i915/display/intel_atomic.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 630f49b7aa01..cf51f1005ec1 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -132,6 +132,9 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
 		to_intel_digital_connector_state(old_state);
 	struct drm_crtc_state *crtc_state;
 
+	if (!(new_state && new_conn_state && old_state && old_conn_state))
+		return 0;
+
 	intel_hdcp_atomic_check(conn, old_state, new_state);
 	intel_psr_atomic_check(conn, old_state, new_state);
 
@@ -192,6 +195,8 @@ intel_connector_needs_modeset(struct intel_atomic_state *state,
 
 	old_conn_state = drm_atomic_get_old_connector_state(&state->base, connector);
 	new_conn_state = drm_atomic_get_new_connector_state(&state->base, connector);
+	if (!(old_conn_state && new_conn_state))
+		return 0;
 
 	return old_conn_state->crtc != new_conn_state->crtc ||
 	       (new_conn_state->crtc &&
@@ -418,7 +423,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
 	 */
 
 	/* fail if required scalers > available scalers */
-	if (num_scalers_need > intel_crtc->num_scalers){
+	if (num_scalers_need > intel_crtc->num_scalers) {
 		drm_dbg_kms(&dev_priv->drm,
 			    "Too many scaling requests %d > %d\n",
 			    num_scalers_need, intel_crtc->num_scalers);
-- 
2.26.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2020-08-19 11:30 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-19  4:34 Nischal Varide [this message]
2020-08-19  4:34 ` [Intel-gfx] [PATCH 2/5] Critical-KlockWork-Fixes-intel_display.c-NullDeref Nischal Varide
2020-08-20  3:24   ` kernel test robot
2020-08-25  9:25   ` Dan Carpenter
2020-08-19  4:34 ` [Intel-gfx] [PATCH 3/5] Critical-KlockWorks-Fix-intel_sdvo.c-Possible-Null Nischal Varide
2020-08-19  4:34 ` [Intel-gfx] [PATCH 4/5] Critical-KlockWork-Fix-intel_tv.c-Possible-Null Nischal Varide
2020-08-24  6:32   ` Anshuman Gupta
2020-08-25  9:31   ` Dan Carpenter
2020-08-19  4:34 ` [Intel-gfx] [PATCH 5/5] Critical-KlockWorks-Fix-intel_crt.c-Possible-Null Nischal Varide
2020-08-24  6:27   ` Anshuman Gupta
2020-08-19 11:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/5] Critical-KclockWork-Fixes-intel_atomi.c-PossibleNull Patchwork
2020-08-19 12:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-08-19 18:47 ` [Intel-gfx] [PATCH 1/5] Critical-KclockWork-Fixes-intel_atomi.c-PossibleNull kernel test robot
2020-08-19 18:47 ` [Intel-gfx] [PATCH] fix boolreturn.cocci warnings kernel test robot
2020-08-19 22:37 ` [Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/5] Critical-KclockWork-Fixes-intel_atomi.c-PossibleNull Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200819043409.26010-1-nischal.varide@intel.com \
    --to=nischal.varide@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox