These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / omapdrm / omap_fbdev.c

diff --git a/kernel/drivers/gpu/drm/omapdrm/omap_fbdev.c b/kernel/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 950cd33..24f92be 100644 (file)
--- a/kernel/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/kernel/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -17,10 +17,10 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "omap_drv.h"
+#include <drm/drm_crtc.h>
+#include <drm/drm_fb_helper.h>
 
-#include "drm_crtc.h"
-#include "drm_fb_helper.h"
+#include "omap_drv.h"
 
 MODULE_PARM_DESC(ywrap, "Enable ywrap scrolling (omap44xx and later, default 'y')");
 static bool ywrap_enabled = true;
@@ -86,11 +86,11 @@ static struct fb_ops omap_fb_ops = {
        /* Note: to properly handle manual update displays, we wrap the
         * basic fbdev ops which write to the framebuffer
         */
-       .fb_read = fb_sys_read,
-       .fb_write = fb_sys_write,
-       .fb_fillrect = sys_fillrect,
-       .fb_copyarea = sys_copyarea,
-       .fb_imageblit = sys_imageblit,
+       .fb_read = drm_fb_helper_sys_read,
+       .fb_write = drm_fb_helper_sys_write,
+       .fb_fillrect = drm_fb_helper_sys_fillrect,
+       .fb_copyarea = drm_fb_helper_sys_copyarea,
+       .fb_imageblit = drm_fb_helper_sys_imageblit,
 
        .fb_check_var = drm_fb_helper_check_var,
        .fb_set_par = drm_fb_helper_set_par,
@@ -112,11 +112,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
        dma_addr_t paddr;
        int ret;
 
-       /* only doing ARGB32 since this is what is needed to alpha-blend
-        * with video overlays:
-        */
        sizes->surface_bpp = 32;
-       sizes->surface_depth = 32;
+       sizes->surface_depth = 24;
 
        DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width,
                        sizes->surface_height, sizes->surface_bpp,
@@ -135,7 +132,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
        fbdev->ywrap_enabled = priv->has_dmm && ywrap_enabled;
        if (fbdev->ywrap_enabled) {
                /* need to align pitch to page size if using DMM scrolling */
-               mode_cmd.pitches[0] = ALIGN(mode_cmd.pitches[0], PAGE_SIZE);
+               mode_cmd.pitches[0] = PAGE_ALIGN(mode_cmd.pitches[0]);
        }
 
        /* allocate backing bo */
@@ -179,10 +176,10 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
 
        mutex_lock(&dev->struct_mutex);
 
-       fbi = framebuffer_alloc(0, dev->dev);
-       if (!fbi) {
+       fbi = drm_fb_helper_alloc_fbi(helper);
+       if (IS_ERR(fbi)) {
                dev_err(dev->dev, "failed to allocate fb info\n");
-               ret = -ENOMEM;
+               ret = PTR_ERR(fbi);
                goto fail_unlock;
        }
 
@@ -190,7 +187,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
 
        fbdev->fb = fb;
        helper->fb = fb;
-       helper->fbdev = fbi;
 
        fbi->par = helper;
        fbi->flags = FBINFO_DEFAULT;
@@ -198,12 +194,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
 
        strcpy(fbi->fix.id, MODULE_NAME);
 
-       ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
-       if (ret) {
-               ret = -ENOMEM;
-               goto fail_unlock;
-       }
-
        drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
        drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
 
@@ -236,8 +226,9 @@ fail_unlock:
 fail:
 
        if (ret) {
-               if (fbi)
-                       framebuffer_release(fbi);
+
+               drm_fb_helper_release_fbi(helper);
+
                if (fb) {
                        drm_framebuffer_unregister_private(fb);
                        drm_framebuffer_remove(fb);
@@ -312,17 +303,11 @@ void omap_fbdev_free(struct drm_device *dev)
        struct omap_drm_private *priv = dev->dev_private;
        struct drm_fb_helper *helper = priv->fbdev;
        struct omap_fbdev *fbdev;
-       struct fb_info *fbi;
 
        DBG();
 
-       fbi = helper->fbdev;
-
-       /* only cleanup framebuffer if it is present */
-       if (fbi) {
-               unregister_framebuffer(fbi);
-               framebuffer_release(fbi);
-       }
+       drm_fb_helper_unregister_fbi(helper);
+       drm_fb_helper_release_fbi(helper);
 
        drm_fb_helper_fini(helper);