Merge tag 'drm-fsl-dcu-for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next (25dfd7cf) · Commits · 戴 / test

drivers/gpu/drm/fsl-dcu/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,5 @@ fsl-dcu-drm-y := fsl_dcu_drm_drv.o \
		fsl_dcu_drm_rgb.o \
		fsl_dcu_drm_plane.o \
		fsl_dcu_drm_crtc.o \
		fsl_dcu_drm_fbdev.o \
		fsl_tcon.o
		obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu-drm.o

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c

+18 −8

Original line number	Diff line number	Diff line
		@@ -32,6 +32,9 @@
		#include "fsl_dcu_drm_drv.h"
		#include "fsl_tcon.h"

		static int legacyfb_depth = 24;
		module_param(legacyfb_depth, int, 0444);

		static bool fsl_dcu_drm_is_volatile_reg(struct device *dev, unsigned int reg)
		{
		if (reg == DCU_INT_STATUS \|\| reg == DCU_UPDATE_MODE)
		@@ -85,7 +88,18 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
		goto done;
		dev->irq_enabled = true;

		fsl_dcu_fbdev_init(dev);
		if (legacyfb_depth != 16 && legacyfb_depth != 24 &&
		legacyfb_depth != 32) {
		dev_warn(dev->dev,
		"Invalid legacyfb_depth. Defaulting to 24bpp\n");
		legacyfb_depth = 24;
		}
		fsl_dev->fbdev = drm_fbdev_cma_init(dev, legacyfb_depth, 1, 1);
		if (IS_ERR(fsl_dev->fbdev)) {
		ret = PTR_ERR(fsl_dev->fbdev);
		fsl_dev->fbdev = NULL;
		goto done;
		}

		return 0;
		done:
		@@ -106,6 +120,7 @@ static int fsl_dcu_unload(struct drm_device *dev)
		{
		struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;

		drm_crtc_force_disable_all(dev);
		drm_kms_helper_poll_fini(dev);

		if (fsl_dev->fbdev)
		@@ -332,11 +347,6 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
		fsl_dev->soc = id->data;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (!res) {
		dev_err(dev, "could not get memory IO resource\n");
		return -ENODEV;
		}

		base = devm_ioremap_resource(dev, res);
		if (IS_ERR(base)) {
		ret = PTR_ERR(base);
		@@ -346,7 +356,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
		fsl_dev->irq = platform_get_irq(pdev, 0);
		if (fsl_dev->irq < 0) {
		dev_err(dev, "failed to get irq\n");
		return -ENXIO;
		return fsl_dev->irq;
		}

		fsl_dev->regmap = devm_regmap_init_mmio(dev, base,
		@@ -424,9 +434,9 @@ static int fsl_dcu_drm_remove(struct platform_device *pdev)
		{
		struct fsl_dcu_drm_device *fsl_dev = platform_get_drvdata(pdev);

		drm_put_dev(fsl_dev->drm);
		clk_disable_unprepare(fsl_dev->clk);
		clk_unregister(fsl_dev->pix_clk);
		drm_put_dev(fsl_dev->drm);

		return 0;
		}

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,6 @@ struct fsl_dcu_drm_device {
		struct drm_atomic_state *state;
		};

		void fsl_dcu_fbdev_init(struct drm_device *dev);
		int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev);

		#endif /* __FSL_DCU_DRM_DRV_H__ */

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c

deleted100644 → 0

+0 −23

Original line number	Diff line number	Diff line
		/*
		* Copyright 2015 Freescale Semiconductor, Inc.
		*
		* Freescale DCU drm device driver
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*/

		#include <drm/drmP.h>
		#include <drm/drm_fb_cma_helper.h>

		#include "fsl_dcu_drm_drv.h"

		/* initialize fbdev helper */
		void fsl_dcu_fbdev_init(struct drm_device *dev)
		{
		struct fsl_dcu_drm_device *fsl_dev = dev_get_drvdata(dev->dev);

		fsl_dev->fbdev = drm_fbdev_cma_init(dev, 24, 1, 1);
		}

Admin message