Commit 6875eb3f authored by Anshuman Gupta's avatar Anshuman Gupta Committed by Ville Syrjälä

drm/i915: Fix wrongly populated plane possible_crtcs bit mask

As a disabled pipe in pipe_mask is not having a valid intel crtc,
driver wrongly populates the possible_crtcs mask while initializing
the plane for a CRTC. Fixing up the plane possible_crtcs mask.

changes since RFC:
- Simplify the possible_crtcs initialization. [Ville]
v2:
- Removed the unnecessary stack garbage possible_crtcs to
  drm_universal_plane_init. [Ville]
v3:
- Combine the intel_crtc assignment and declaration. [Ville]
v4:
- Fix possible_crtcs abused bits from
  intel_{primary,curosr,sprite}_plane_create(). [Ville]

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226163517.31234-1-anshuman.gupta@intel.com
parent d22d2d07
...@@ -16331,7 +16331,6 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) ...@@ -16331,7 +16331,6 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
struct intel_plane *plane; struct intel_plane *plane;
const struct drm_plane_funcs *plane_funcs; const struct drm_plane_funcs *plane_funcs;
unsigned int supported_rotations; unsigned int supported_rotations;
unsigned int possible_crtcs;
const u32 *formats; const u32 *formats;
int num_formats; int num_formats;
int ret, zpos; int ret, zpos;
...@@ -16412,18 +16411,16 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) ...@@ -16412,18 +16411,16 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
plane->get_hw_state = i9xx_plane_get_hw_state; plane->get_hw_state = i9xx_plane_get_hw_state;
plane->check_plane = i9xx_plane_check; plane->check_plane = i9xx_plane_check;
possible_crtcs = BIT(pipe);
if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv)) if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
ret = drm_universal_plane_init(&dev_priv->drm, &plane->base, ret = drm_universal_plane_init(&dev_priv->drm, &plane->base,
possible_crtcs, plane_funcs, 0, plane_funcs,
formats, num_formats, formats, num_formats,
i9xx_format_modifiers, i9xx_format_modifiers,
DRM_PLANE_TYPE_PRIMARY, DRM_PLANE_TYPE_PRIMARY,
"primary %c", pipe_name(pipe)); "primary %c", pipe_name(pipe));
else else
ret = drm_universal_plane_init(&dev_priv->drm, &plane->base, ret = drm_universal_plane_init(&dev_priv->drm, &plane->base,
possible_crtcs, plane_funcs, 0, plane_funcs,
formats, num_formats, formats, num_formats,
i9xx_format_modifiers, i9xx_format_modifiers,
DRM_PLANE_TYPE_PRIMARY, DRM_PLANE_TYPE_PRIMARY,
...@@ -16465,7 +16462,6 @@ static struct intel_plane * ...@@ -16465,7 +16462,6 @@ static struct intel_plane *
intel_cursor_plane_create(struct drm_i915_private *dev_priv, intel_cursor_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe) enum pipe pipe)
{ {
unsigned int possible_crtcs;
struct intel_plane *cursor; struct intel_plane *cursor;
int ret, zpos; int ret, zpos;
...@@ -16498,10 +16494,8 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, ...@@ -16498,10 +16494,8 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,
if (IS_I845G(dev_priv) || IS_I865G(dev_priv) || HAS_CUR_FBC(dev_priv)) if (IS_I845G(dev_priv) || IS_I865G(dev_priv) || HAS_CUR_FBC(dev_priv))
cursor->cursor.size = ~0; cursor->cursor.size = ~0;
possible_crtcs = BIT(pipe);
ret = drm_universal_plane_init(&dev_priv->drm, &cursor->base, ret = drm_universal_plane_init(&dev_priv->drm, &cursor->base,
possible_crtcs, &intel_cursor_plane_funcs, 0, &intel_cursor_plane_funcs,
intel_cursor_formats, intel_cursor_formats,
ARRAY_SIZE(intel_cursor_formats), ARRAY_SIZE(intel_cursor_formats),
cursor_format_modifiers, cursor_format_modifiers,
...@@ -16623,6 +16617,18 @@ static void intel_crtc_free(struct intel_crtc *crtc) ...@@ -16623,6 +16617,18 @@ static void intel_crtc_free(struct intel_crtc *crtc)
kfree(crtc); kfree(crtc);
} }
static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv)
{
struct intel_plane *plane;
for_each_intel_plane(&dev_priv->drm, plane) {
struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv,
plane->pipe);
plane->base.possible_crtcs = drm_crtc_mask(&crtc->base);
}
}
static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
{ {
struct intel_plane *primary, *cursor; struct intel_plane *primary, *cursor;
...@@ -17847,6 +17853,7 @@ int intel_modeset_init(struct drm_i915_private *i915) ...@@ -17847,6 +17853,7 @@ int intel_modeset_init(struct drm_i915_private *i915)
} }
} }
intel_plane_possible_crtcs_init(i915);
intel_shared_dpll_init(dev); intel_shared_dpll_init(dev);
intel_update_fdi_pll_freq(i915); intel_update_fdi_pll_freq(i915);
......
...@@ -3031,7 +3031,6 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, ...@@ -3031,7 +3031,6 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
struct intel_plane *plane; struct intel_plane *plane;
enum drm_plane_type plane_type; enum drm_plane_type plane_type;
unsigned int supported_rotations; unsigned int supported_rotations;
unsigned int possible_crtcs;
const u64 *modifiers; const u64 *modifiers;
const u32 *formats; const u32 *formats;
int num_formats; int num_formats;
...@@ -3086,10 +3085,8 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, ...@@ -3086,10 +3085,8 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
else else
plane_type = DRM_PLANE_TYPE_OVERLAY; plane_type = DRM_PLANE_TYPE_OVERLAY;
possible_crtcs = BIT(pipe);
ret = drm_universal_plane_init(&dev_priv->drm, &plane->base, ret = drm_universal_plane_init(&dev_priv->drm, &plane->base,
possible_crtcs, plane_funcs, 0, plane_funcs,
formats, num_formats, modifiers, formats, num_formats, modifiers,
plane_type, plane_type,
"plane %d%c", plane_id + 1, "plane %d%c", plane_id + 1,
...@@ -3140,7 +3137,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, ...@@ -3140,7 +3137,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
{ {
struct intel_plane *plane; struct intel_plane *plane;
const struct drm_plane_funcs *plane_funcs; const struct drm_plane_funcs *plane_funcs;
unsigned long possible_crtcs;
unsigned int supported_rotations; unsigned int supported_rotations;
const u64 *modifiers; const u64 *modifiers;
const u32 *formats; const u32 *formats;
...@@ -3225,10 +3221,8 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, ...@@ -3225,10 +3221,8 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
plane->id = PLANE_SPRITE0 + sprite; plane->id = PLANE_SPRITE0 + sprite;
plane->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, plane->id); plane->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, plane->id);
possible_crtcs = BIT(pipe);
ret = drm_universal_plane_init(&dev_priv->drm, &plane->base, ret = drm_universal_plane_init(&dev_priv->drm, &plane->base,
possible_crtcs, plane_funcs, 0, plane_funcs,
formats, num_formats, modifiers, formats, num_formats, modifiers,
DRM_PLANE_TYPE_OVERLAY, DRM_PLANE_TYPE_OVERLAY,
"sprite %c", sprite_name(pipe, sprite)); "sprite %c", sprite_name(pipe, sprite));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment