diff options
| author |   Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-08-25 11:00:02 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-08-25 11:00:02 +0200 |
| commit | 2d9ad4cfaf4d32a64a4ed556e5bcab9121215026 (patch) | |
| tree | 3572e6cd05effa4e2943cee817defb2b9a72afd1 /drivers/gpu/drm/drm_plane.c | |
| parent | drm/modeset-lock: Take the modeset BKL for legacy drivers (diff) | |
| parent | Linux 5.9-rc2 (diff) | |
| download | linux-dev-2d9ad4cfaf4d32a64a4ed556e5bcab9121215026.tar.xz linux-dev-2d9ad4cfaf4d32a64a4ed556e5bcab9121215026.zip | |
Merge tag 'v5.9-rc2' into drm-misc-fixes
Backmerge requested by Tomi for a fix to omap inconsistent
locking state issue, and because we need at least v5.9-rc2 now.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/drm_plane.c')
| -rw-r--r-- | drivers/gpu/drm/drm_plane.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index fdbafc2b8199..affe1cfed009 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -216,6 +216,7 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, if (format_modifiers) { const uint64_t *temp_modifiers = format_modifiers; + while (*temp_modifiers++ != DRM_FORMAT_MOD_INVALID) format_modifier_count++; } |