diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-06-04 09:47:41 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-04 09:47:41 +0400 |
| commit | 885ae1c55ae46ee1064bc7cb99dc45ddd8bd0328 (patch) | |
| tree | da636f922476a4eeb55066588d9857465f7718f3 /drivers/gpu/drm/drm_plane_helper.c | |
| parent | b33a51e457b7e01e3e25eaa7c99aec32e65c00de (diff) | |
| parent | 46340642d7c314e4d718ebcdbb00bd55ed7d9d9f (diff) | |
| download | linux-885ae1c55ae46ee1064bc7cb99dc45ddd8bd0328.tar.xz | |
Merge tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel into drm-next
Just flushing out my pile of random drm patches for the merge window,
nothing big. And it all hung around in drm-intel trees for a while (only
just rebased now).
* tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel:
imx-drm: imx-tve: remove unused variable
drm: Missed clflushopt in drm_clflush_virt_range
drm/plane: Fix a couple of checkpatch warnings
drm/plane: Fix sparse warnings
drm/exynos: Fix double locks at PM resume
drm/ast: Fix double lock at PM resume
drm/dp-helper: Deprecate old i2c-over-dp_aux heleprs
Diffstat (limited to 'drivers/gpu/drm/drm_plane_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_plane_helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c index 458d9bf09209..f3e0a23abf4e 100644 --- a/drivers/gpu/drm/drm_plane_helper.c +++ b/drivers/gpu/drm/drm_plane_helper.c @@ -26,6 +26,7 @@ #include <linux/list.h> #include <drm/drmP.h> #include <drm/drm_rect.h> +#include <drm/drm_plane_helper.h> #define SUBPIXEL_MASK 0xffff @@ -36,9 +37,9 @@ * creating the primary plane. However drivers that still call * drm_plane_init() will use this minimal format list as the default. */ -const static uint32_t safe_modeset_formats[] = { - DRM_FORMAT_XRGB8888, - DRM_FORMAT_ARGB8888, +static const uint32_t safe_modeset_formats[] = { + DRM_FORMAT_XRGB8888, + DRM_FORMAT_ARGB8888, }; /* |