OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aff76ab
)
drm/i915/display: return earlier from intel_modeset_init() without display
author
Jani Nikula
<jani.nikula@intel.com>
Fri, 6 Nov 2020 22:55:27 +0000
(14:55 -0800)
committer
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Thu, 3 Dec 2020 01:05:58 +0000
(17:05 -0800)
!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>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20201106225531.920641-4-lucas.demarchi@intel.com
(cherry picked from commit
71c8415d0daa78ef1295743d0e11ba0214d0a9b9
)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_display.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/display/intel_display.c
b/drivers/gpu/drm/i915/display/intel_display.c
index
99e6825
..
c0d920f
100644
(file)
--- a/
drivers/gpu/drm/i915/display/intel_display.c
+++ b/
drivers/gpu/drm/i915/display/intel_display.c
@@
-18039,11
+18039,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;