All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Don't test plane stride with !INTEL_DISPLAY_ENABLED
@ 2019-11-07 20:37 ` Matt Roper
  0 siblings, 0 replies; 8+ messages in thread
From: Matt Roper @ 2019-11-07 20:37 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Lucas De Marchi

If INTEL_DISPLAY_ENABLED is false, then the modesetting resources were
never initialized.  Userspace may still call DRM_IOCTL_MODE_CREATE_DUMB
which will eventually lead i915_gem_dumb_create() to try to dereference
a non-existent pipe A primary plane while figuring out a proper pitch.

We could force dumb buffer creation to fail in cases where display isn't
enabled (since there isn't really a definition of a "suitable for
scanout" buffer in that case), but it's easier (and probably less
invasive to IGT tests) to just drop the attempt to align to plane max
stride in cases where the display isn't enabled.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 143a8952b736..f022a17328b0 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -229,7 +229,8 @@ i915_gem_dumb_create(struct drm_file *file,
 	args->pitch = ALIGN(args->width * cpp, 64);
 
 	/* align stride to page size so that we can remap */
-	if (args->pitch > intel_plane_fb_max_stride(to_i915(dev), format,
+	if (INTEL_DISPLAY_ENABLED(to_i915(dev)) &&
+	    args->pitch > intel_plane_fb_max_stride(to_i915(dev), format,
 						    DRM_FORMAT_MOD_LINEAR))
 		args->pitch = ALIGN(args->pitch, 4096);
 
-- 
2.21.0

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-11-09  8:01 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-07 20:37 [PATCH] drm/i915: Don't test plane stride with !INTEL_DISPLAY_ENABLED Matt Roper
2019-11-07 20:37 ` [Intel-gfx] " Matt Roper
2019-11-07 23:19 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-11-07 23:19   ` [Intel-gfx] " Patchwork
2019-11-08 13:50 ` [PATCH] " Ville Syrjälä
2019-11-08 13:50   ` [Intel-gfx] " Ville Syrjälä
2019-11-09  8:01 ` ✗ Fi.CI.IGT: failure for " Patchwork
2019-11-09  8:01   ` [Intel-gfx] " Patchwork

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.