Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 644f2639 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-v4.18' of git://github.com/bzolnier/linux 

Pull fbdev updates from Bartlomiej Zolnierkiewicz:
 "There is nothing really major here, few small fixes, some cleanups and
  dead drivers removal:

   - mark omapfb drivers as orphans in MAINTAINERS file (Tomi Valkeinen)

   - add missing module license tags to omap/omapfb driver (Arnd
     Bergmann)

   - add missing GPIOLIB dependendy to omap2/omapfb driver (Arnd
     Bergmann)

   - convert savagefb, aty128fb & radeonfb drivers to use msleep & co.
     (Jia-Ju Bai)

   - allow COMPILE_TEST build for viafb driver (media part was reviewed
     by media subsystem Maintainer)

   - remove unused MERAM support from sh_mobile_lcdcfb and shmob-drm
     drivers (drm parts were acked by shmob-drm driver Maintainer)

   - remove unused auo_k190xfb drivers

   - misc cleanups (Souptick Joarder, Wolfram Sang, Markus Elfring, Andy
     Shevchenko, Colin Ian King)"

* tag 'fbdev-v4.18' of git://github.com/bzolnier/linux: (26 commits)
  fb_omap2: add gpiolib dependency
  video/omap: add module license tags
  MAINTAINERS: make omapfb orphan
  video: fbdev: pxafb: match_string() conversion fixup
  video: fbdev: nvidia: fix spelling mistake: "scaleing" -> "scaling"
  video: fbdev: fix spelling mistake: "frambuffer" -> "framebuffer"
  video: fbdev: pxafb: Convert to use match_string() helper
  video: fbdev: via: allow COMPILE_TEST build
  video: fbdev: remove unused sh_mobile_meram driver
  drm: shmobile: remove unused MERAM support
  video: fbdev: sh_mobile_lcdcfb: remove unused MERAM support
  video: fbdev: remove unused auo_k190xfb drivers
  video: omap: Improve a size determination in omapfb_do_probe()
  video: sm501fb: Improve a size determination in sm501fb_probe()
  video: fbdev-MMP: Improve a size determination in path_init()
  video: fbdev-MMP: Delete an error message for a failed memory allocation in two functions
  video: auo_k190x: Delete an error message for a failed memory allocation in auok190x_common_probe()
  video: sh_mobile_lcdcfb: Delete an error message for a failed memory allocation in two functions
  video: sh_mobile_meram: Delete an error message for a failed memory allocation in sh_mobile_meram_probe()
  video: fbdev: sh_mobile_meram: Drop SUPERH platform dependency
  ...
parents 35773c93 85ebd164

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -10273,18 +10273,16 @@ F: arch/arm/boot/dts/*am5* 
F:	arch/arm/boot/dts/*dra7*



OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)

M:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	linux-omap@vger.kernel.org

L:	linux-fbdev@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/video/fbdev/omap2/

F:	Documentation/arm/OMAP/DSS



OMAP FRAMEBUFFER SUPPORT

M:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	linux-fbdev@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/video/fbdev/omap/



OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT

drivers/gpu/drm/shmobile/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config DRM_SHMOBILE 
	tristate "DRM Support for SH Mobile"

	depends on DRM && ARM

	depends on ARCH_SHMOBILE || COMPILE_TEST

	depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM

	select BACKLIGHT_CLASS_DEVICE

	select BACKLIGHT_LCD_SUPPORT

	select DRM_KMS_HELPER

drivers/gpu/drm/shmobile/shmob_drm_crtc.c

+0 −42
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_plane_helper.h>



#include <video/sh_mobile_meram.h>



#include "shmob_drm_backlight.h"

#include "shmob_drm_crtc.h"

#include "shmob_drm_drv.h"
@@ -47,20 +45,12 @@ static int shmob_drm_clk_on(struct shmob_drm_device *sdev) 
		if (ret < 0)

			return ret;

	}

#if 0

	if (sdev->meram_dev && sdev->meram_dev->pdev)

		pm_runtime_get_sync(&sdev->meram_dev->pdev->dev);

#endif



	return 0;

}



static void shmob_drm_clk_off(struct shmob_drm_device *sdev)

{

#if 0

	if (sdev->meram_dev && sdev->meram_dev->pdev)

		pm_runtime_put_sync(&sdev->meram_dev->pdev->dev);

#endif

	if (sdev->clock)

		clk_disable_unprepare(sdev->clock);

}
@@ -269,12 +259,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) 
	if (!scrtc->started)

		return;



	/* Disable the MERAM cache. */

	if (scrtc->cache) {

		sh_mobile_meram_cache_free(sdev->meram, scrtc->cache);

		scrtc->cache = NULL;

	}



	/* Stop the LCDC. */

	shmob_drm_crtc_start_stop(scrtc, false);
@@ -305,7 +289,6 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc, 
{

	struct drm_crtc *crtc = &scrtc->crtc;

	struct drm_framebuffer *fb = crtc->primary->fb;

	struct shmob_drm_device *sdev = crtc->dev->dev_private;

	struct drm_gem_cma_object *gem;

	unsigned int bpp;
@@ -321,11 +304,6 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc, 
			      + y / (bpp == 4 ? 2 : 1) * fb->pitches[1]

			      + x * (bpp == 16 ? 2 : 1);

	}



	if (scrtc->cache)

		sh_mobile_meram_cache_update(sdev->meram, scrtc->cache,

					     scrtc->dma[0], scrtc->dma[1],

					     &scrtc->dma[0], &scrtc->dma[1]);

}



static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)
@@ -372,9 +350,7 @@ static int shmob_drm_crtc_mode_set(struct drm_crtc *crtc, 
{

	struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);

	struct shmob_drm_device *sdev = crtc->dev->dev_private;

	const struct sh_mobile_meram_cfg *mdata = sdev->pdata->meram;

	const struct shmob_drm_format_info *format;

	void *cache;



	format = shmob_drm_format_info(crtc->primary->fb->format->format);

	if (format == NULL) {
@@ -386,24 +362,6 @@ static int shmob_drm_crtc_mode_set(struct drm_crtc *crtc, 
	scrtc->format = format;

	scrtc->line_size = crtc->primary->fb->pitches[0];



	if (sdev->meram) {

		/* Enable MERAM cache if configured. We need to de-init

		 * configured ICBs before we can re-initialize them.

		 */

		if (scrtc->cache) {

			sh_mobile_meram_cache_free(sdev->meram, scrtc->cache);

			scrtc->cache = NULL;

		}



		cache = sh_mobile_meram_cache_alloc(sdev->meram, mdata,

						    crtc->primary->fb->pitches[0],

						    adjusted_mode->vdisplay,

						    format->meram,

						    &scrtc->line_size);

		if (!IS_ERR(cache))

			scrtc->cache = cache;

	}



	shmob_drm_crtc_compute_base(scrtc, x, y);



	return 0;

drivers/gpu/drm/shmobile/shmob_drm_crtc.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct shmob_drm_crtc { 
	int dpms;



	const struct shmob_drm_format_info *format;

	void *cache;

	unsigned long dma[2];

	unsigned int line_size;

	bool started;

drivers/gpu/drm/shmobile/shmob_drm_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
struct clk;

struct device;

struct drm_device;

struct sh_mobile_meram_info;



struct shmob_drm_device {

	struct device *dev;
@@ -31,7 +30,6 @@ struct shmob_drm_device { 


	void __iomem *mmio;

	struct clk *clock;

	struct sh_mobile_meram_info *meram;

	u32 lddckr;

	u32 ldmt1r;