All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>
Subject: [Intel-gfx] [PATCH 4/8] drm/i915/display: return earlier from intel_modeset_init() without display
Date: Fri,  6 Nov 2020 14:55:27 -0800	[thread overview]
Message-ID: <20201106225531.920641-4-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20201106225531.920641-1-lucas.demarchi@intel.com>

From: Jani Nikula <jani.nikula@intel.com>

!HAS_DISPLAY() implies !HAS_OVERLAY(), skipping overlay setup anyway, so
return earlier from intel_modeset_init() for clarity.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b6a9d41a043e..b3e6c43f0cb2 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -18364,11 +18364,11 @@ int intel_modeset_init(struct drm_i915_private *i915)
 {
 	int ret;
 
-	intel_overlay_setup(i915);
-
 	if (!HAS_DISPLAY(i915))
 		return 0;
 
+	intel_overlay_setup(i915);
+
 	ret = intel_fbdev_init(&i915->drm);
 	if (ret)
 		return ret;
-- 
2.29.0

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

  parent reply	other threads:[~2020-11-06 22:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-06 22:55 [Intel-gfx] [PATCH 1/8] drm/i915/display: add namespace to intel_prepare_reset Lucas De Marchi
2020-11-06 22:55 ` [Intel-gfx] [PATCH 2/8] drm/i915/display: add namespace to intel_finish_reset Lucas De Marchi
2020-11-09  9:00   ` Jani Nikula
2020-11-06 22:55 ` [Intel-gfx] [PATCH 3/8] drm/i915/display: Do not reset display when there is none Lucas De Marchi
2020-11-09  9:00   ` Jani Nikula
2020-11-06 22:55 ` Lucas De Marchi [this message]
2020-11-09 20:46   ` [Intel-gfx] [PATCH 4/8] drm/i915/display: return earlier from intel_modeset_init() without display Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 5/8] drm/i915/display: Do not set any power wells when there is no display Lucas De Marchi
2020-11-06 23:18   ` Lucas De Marchi
2020-11-06 22:55 ` [Intel-gfx] [PATCH 6/8] drm/i915: re-order if/else ladder for hpd_irq_setup Lucas De Marchi
2020-11-09 20:47   ` Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 7/8] drm/i915: move display-related to the end of intel_irq_init() Lucas De Marchi
2020-11-09 20:48   ` Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 8/8] drm/i915: Do not setup hpd without display Lucas De Marchi
2020-11-09 20:48   ` Souza, Jose
2020-11-06 23:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/8] drm/i915/display: add namespace to intel_prepare_reset Patchwork
2020-11-06 23:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-07  1:22 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-11-09  8:59 ` [Intel-gfx] [PATCH 1/8] " Jani Nikula

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=20201106225531.920641-4-lucas.demarchi@intel.com \
    --to=lucas.demarchi@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.