diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-14 19:24:52 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-14 19:24:52 -0500 |
| commit | 8e13c10a7ce4eac9e47b999c0952c9812b32545d (patch) | |
| tree | 2e864de6aad012e1d396ed4e21252f9dc35841dd /drivers | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
| parent | 1d977b06f880efced3d15056498fb9ac8ae39d07 (diff) | |
Merge tag 'omapdrm-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-fixes
omapdrm fix for 4.4
* tag 'omapdrm-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
drm/omap: fix fbdev pix format to support all platforms
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fbdev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index b8e4cdec28c3..24f92bea39c7 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c | |||
| @@ -112,11 +112,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, | |||
| 112 | dma_addr_t paddr; | 112 | dma_addr_t paddr; |
| 113 | int ret; | 113 | int ret; |
| 114 | 114 | ||
| 115 | /* only doing ARGB32 since this is what is needed to alpha-blend | ||
| 116 | * with video overlays: | ||
| 117 | */ | ||
| 118 | sizes->surface_bpp = 32; | 115 | sizes->surface_bpp = 32; |
| 119 | sizes->surface_depth = 32; | 116 | sizes->surface_depth = 24; |
| 120 | 117 | ||
| 121 | DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width, | 118 | DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width, |
| 122 | sizes->surface_height, sizes->surface_bpp, | 119 | sizes->surface_height, sizes->surface_bpp, |