]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/gpu/drm/shmobile/shmob_drm_drv.c
Merge tag 'xfs-4.12-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
[karo-tx-linux.git] / drivers / gpu / drm / shmobile / shmob_drm_drv.c
index 33cec3d4238969579cf114f1775d4f94ad82d02b..800d1d2c435d0b7e4954728afc4d4bee9bae58cb 100644 (file)
@@ -23,7 +23,6 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 
-#include "shmob_drm_crtc.h"
 #include "shmob_drm_drv.h"
 #include "shmob_drm_kms.h"
 #include "shmob_drm_plane.h"
@@ -104,100 +103,6 @@ static int shmob_drm_setup_clocks(struct shmob_drm_device *sdev,
  * DRM operations
  */
 
-static void shmob_drm_unload(struct drm_device *dev)
-{
-       drm_kms_helper_poll_fini(dev);
-       drm_mode_config_cleanup(dev);
-       drm_vblank_cleanup(dev);
-       drm_irq_uninstall(dev);
-
-       dev->dev_private = NULL;
-}
-
-static int shmob_drm_load(struct drm_device *dev, unsigned long flags)
-{
-       struct shmob_drm_platform_data *pdata = dev->dev->platform_data;
-       struct platform_device *pdev = dev->platformdev;
-       struct shmob_drm_device *sdev;
-       struct resource *res;
-       unsigned int i;
-       int ret;
-
-       if (pdata == NULL) {
-               dev_err(dev->dev, "no platform data\n");
-               return -EINVAL;
-       }
-
-       sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL);
-       if (sdev == NULL) {
-               dev_err(dev->dev, "failed to allocate private data\n");
-               return -ENOMEM;
-       }
-
-       sdev->dev = &pdev->dev;
-       sdev->pdata = pdata;
-       spin_lock_init(&sdev->irq_lock);
-
-       sdev->ddev = dev;
-       dev->dev_private = sdev;
-
-       /* I/O resources and clocks */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
-               dev_err(&pdev->dev, "failed to get memory resource\n");
-               return -EINVAL;
-       }
-
-       sdev->mmio = devm_ioremap_nocache(&pdev->dev, res->start,
-                                         resource_size(res));
-       if (sdev->mmio == NULL) {
-               dev_err(&pdev->dev, "failed to remap memory resource\n");
-               return -ENOMEM;
-       }
-
-       ret = shmob_drm_setup_clocks(sdev, pdata->clk_source);
-       if (ret < 0)
-               return ret;
-
-       ret = shmob_drm_init_interface(sdev);
-       if (ret < 0)
-               return ret;
-
-       ret = shmob_drm_modeset_init(sdev);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to initialize mode setting\n");
-               return ret;
-       }
-
-       for (i = 0; i < 4; ++i) {
-               ret = shmob_drm_plane_create(sdev, i);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "failed to create plane %u\n", i);
-                       goto done;
-               }
-       }
-
-       ret = drm_vblank_init(dev, 1);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to initialize vblank\n");
-               goto done;
-       }
-
-       ret = drm_irq_install(dev, platform_get_irq(dev->platformdev, 0));
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to install IRQ handler\n");
-               goto done;
-       }
-
-       platform_set_drvdata(pdev, sdev);
-
-done:
-       if (ret)
-               shmob_drm_unload(dev);
-
-       return ret;
-}
-
 static irqreturn_t shmob_drm_irq(int irq, void *arg)
 {
        struct drm_device *dev = arg;
@@ -222,43 +127,12 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg)
        return IRQ_HANDLED;
 }
 
-static int shmob_drm_enable_vblank(struct drm_device *dev, unsigned int pipe)
-{
-       struct shmob_drm_device *sdev = dev->dev_private;
-
-       shmob_drm_crtc_enable_vblank(sdev, true);
-
-       return 0;
-}
-
-static void shmob_drm_disable_vblank(struct drm_device *dev, unsigned int pipe)
-{
-       struct shmob_drm_device *sdev = dev->dev_private;
-
-       shmob_drm_crtc_enable_vblank(sdev, false);
-}
-
-static const struct file_operations shmob_drm_fops = {
-       .owner          = THIS_MODULE,
-       .open           = drm_open,
-       .release        = drm_release,
-       .unlocked_ioctl = drm_ioctl,
-       .compat_ioctl   = drm_compat_ioctl,
-       .poll           = drm_poll,
-       .read           = drm_read,
-       .llseek         = no_llseek,
-       .mmap           = drm_gem_cma_mmap,
-};
+DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops);
 
 static struct drm_driver shmob_drm_driver = {
        .driver_features        = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET
                                | DRIVER_PRIME,
-       .load                   = shmob_drm_load,
-       .unload                 = shmob_drm_unload,
        .irq_handler            = shmob_drm_irq,
-       .get_vblank_counter     = drm_vblank_no_hw_counter,
-       .enable_vblank          = shmob_drm_enable_vblank,
-       .disable_vblank         = shmob_drm_disable_vblank,
        .gem_free_object_unlocked = drm_gem_cma_free_object,
        .gem_vm_ops             = &drm_gem_cma_vm_ops,
        .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
@@ -317,18 +191,116 @@ static const struct dev_pm_ops shmob_drm_pm_ops = {
  * Platform driver
  */
 
-static int shmob_drm_probe(struct platform_device *pdev)
+static int shmob_drm_remove(struct platform_device *pdev)
 {
-       return drm_platform_init(&shmob_drm_driver, pdev);
+       struct shmob_drm_device *sdev = platform_get_drvdata(pdev);
+       struct drm_device *ddev = sdev->ddev;
+
+       drm_dev_unregister(ddev);
+       drm_kms_helper_poll_fini(ddev);
+       drm_mode_config_cleanup(ddev);
+       drm_irq_uninstall(ddev);
+       drm_dev_unref(ddev);
+
+       return 0;
 }
 
-static int shmob_drm_remove(struct platform_device *pdev)
+static int shmob_drm_probe(struct platform_device *pdev)
 {
-       struct shmob_drm_device *sdev = platform_get_drvdata(pdev);
+       struct shmob_drm_platform_data *pdata = pdev->dev.platform_data;
+       struct shmob_drm_device *sdev;
+       struct drm_device *ddev;
+       struct resource *res;
+       unsigned int i;
+       int ret;
+
+       if (pdata == NULL) {
+               dev_err(&pdev->dev, "no platform data\n");
+               return -EINVAL;
+       }
+
+       /*
+        * Allocate and initialize the driver private data, I/O resources and
+        * clocks.
+        */
+       sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL);
+       if (sdev == NULL)
+               return -ENOMEM;
 
-       drm_put_dev(sdev->ddev);
+       sdev->dev = &pdev->dev;
+       sdev->pdata = pdata;
+       spin_lock_init(&sdev->irq_lock);
+
+       platform_set_drvdata(pdev, sdev);
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       sdev->mmio = devm_ioremap_resource(&pdev->dev, res);
+       if (sdev->mmio == NULL)
+               return -ENOMEM;
+
+       ret = shmob_drm_setup_clocks(sdev, pdata->clk_source);
+       if (ret < 0)
+               return ret;
+
+       ret = shmob_drm_init_interface(sdev);
+       if (ret < 0)
+               return ret;
+
+       /* Allocate and initialize the DRM device. */
+       ddev = drm_dev_alloc(&shmob_drm_driver, &pdev->dev);
+       if (IS_ERR(ddev))
+               return PTR_ERR(ddev);
+
+       sdev->ddev = ddev;
+       ddev->dev_private = sdev;
+
+       ret = shmob_drm_modeset_init(sdev);
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to initialize mode setting\n");
+               goto err_free_drm_dev;
+       }
+
+       for (i = 0; i < 4; ++i) {
+               ret = shmob_drm_plane_create(sdev, i);
+               if (ret < 0) {
+                       dev_err(&pdev->dev, "failed to create plane %u\n", i);
+                       goto err_modeset_cleanup;
+               }
+       }
+
+       ret = drm_vblank_init(ddev, 1);
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to initialize vblank\n");
+               goto err_modeset_cleanup;
+       }
+
+       ret = drm_irq_install(ddev, platform_get_irq(pdev, 0));
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to install IRQ handler\n");
+               goto err_vblank_cleanup;
+       }
+
+       /*
+        * Register the DRM device with the core and the connectors with
+        * sysfs.
+        */
+       ret = drm_dev_register(ddev, 0);
+       if (ret < 0)
+               goto err_irq_uninstall;
 
        return 0;
+
+err_irq_uninstall:
+       drm_irq_uninstall(ddev);
+err_vblank_cleanup:
+       drm_vblank_cleanup(ddev);
+err_modeset_cleanup:
+       drm_kms_helper_poll_fini(ddev);
+       drm_mode_config_cleanup(ddev);
+err_free_drm_dev:
+       drm_dev_unref(ddev);
+
+       return ret;
 }
 
 static struct platform_driver shmob_drm_platform_driver = {