Skip to content

Commit 644f263

Browse files
torvaldstorvalds
committed
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 ...
2 parents 35773c9 + 85ebd16 commit 644f263

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+87
-2986
lines changed

‎MAINTAINERS

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10273,18 +10273,16 @@ F: arch/arm/boot/dts/*am5*
1027310273
F: arch/arm/boot/dts/*dra7*
1027410274

1027510275
OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
10276-
M: Tomi Valkeinen <[email protected]>
1027710276
L: [email protected]
1027810277
L: [email protected]
10279-
S: Maintained
10278+
S: Orphan
1028010279
F: drivers/video/fbdev/omap2/
1028110280
F: Documentation/arm/OMAP/DSS
1028210281

1028310282
OMAP FRAMEBUFFER SUPPORT
10284-
M: Tomi Valkeinen <[email protected]>
1028510283
L: [email protected]
1028610284
L: [email protected]
10287-
S: Maintained
10285+
S: Orphan
1028810286
F: drivers/video/fbdev/omap/
1028910287

1029010288
OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT

‎drivers/gpu/drm/shmobile/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ config DRM_SHMOBILE
22
tristate "DRM Support for SH Mobile"
33
depends on DRM && ARM
44
depends on ARCH_SHMOBILE || COMPILE_TEST
5-
depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM
65
select BACKLIGHT_CLASS_DEVICE
76
select BACKLIGHT_LCD_SUPPORT
87
select DRM_KMS_HELPER

‎drivers/gpu/drm/shmobile/shmob_drm_crtc.c

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include <drm/drm_gem_cma_helper.h>
2222
#include <drm/drm_plane_helper.h>
2323

24-
#include <video/sh_mobile_meram.h>
25-
2624
#include "shmob_drm_backlight.h"
2725
#include "shmob_drm_crtc.h"
2826
#include "shmob_drm_drv.h"
@@ -47,20 +45,12 @@ static int shmob_drm_clk_on(struct shmob_drm_device *sdev)
4745
if (ret < 0)
4846
return ret;
4947
}
50-
#if 0
51-
if (sdev->meram_dev && sdev->meram_dev->pdev)
52-
pm_runtime_get_sync(&sdev->meram_dev->pdev->dev);
53-
#endif
5448

5549
return 0;
5650
}
5751

5852
static void shmob_drm_clk_off(struct shmob_drm_device *sdev)
5953
{
60-
#if 0
61-
if (sdev->meram_dev && sdev->meram_dev->pdev)
62-
pm_runtime_put_sync(&sdev->meram_dev->pdev->dev);
63-
#endif
6454
if (sdev->clock)
6555
clk_disable_unprepare(sdev->clock);
6656
}
@@ -269,12 +259,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
269259
if (!scrtc->started)
270260
return;
271261

272-
/* Disable the MERAM cache. */
273-
if (scrtc->cache) {
274-
sh_mobile_meram_cache_free(sdev->meram, scrtc->cache);
275-
scrtc->cache = NULL;
276-
}
277-
278262
/* Stop the LCDC. */
279263
shmob_drm_crtc_start_stop(scrtc, false);
280264

@@ -305,7 +289,6 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,
305289
{
306290
struct drm_crtc *crtc = &scrtc->crtc;
307291
struct drm_framebuffer *fb = crtc->primary->fb;
308-
struct shmob_drm_device *sdev = crtc->dev->dev_private;
309292
struct drm_gem_cma_object *gem;
310293
unsigned int bpp;
311294

@@ -321,11 +304,6 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,
321304
+ y / (bpp == 4 ? 2 : 1) * fb->pitches[1]
322305
+ x * (bpp == 16 ? 2 : 1);
323306
}
324-
325-
if (scrtc->cache)
326-
sh_mobile_meram_cache_update(sdev->meram, scrtc->cache,
327-
scrtc->dma[0], scrtc->dma[1],
328-
&scrtc->dma[0], &scrtc->dma[1]);
329307
}
330308

331309
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,
372350
{
373351
struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
374352
struct shmob_drm_device *sdev = crtc->dev->dev_private;
375-
const struct sh_mobile_meram_cfg *mdata = sdev->pdata->meram;
376353
const struct shmob_drm_format_info *format;
377-
void *cache;
378354

379355
format = shmob_drm_format_info(crtc->primary->fb->format->format);
380356
if (format == NULL) {
@@ -386,24 +362,6 @@ static int shmob_drm_crtc_mode_set(struct drm_crtc *crtc,
386362
scrtc->format = format;
387363
scrtc->line_size = crtc->primary->fb->pitches[0];
388364

389-
if (sdev->meram) {
390-
/* Enable MERAM cache if configured. We need to de-init
391-
* configured ICBs before we can re-initialize them.
392-
*/
393-
if (scrtc->cache) {
394-
sh_mobile_meram_cache_free(sdev->meram, scrtc->cache);
395-
scrtc->cache = NULL;
396-
}
397-
398-
cache = sh_mobile_meram_cache_alloc(sdev->meram, mdata,
399-
crtc->primary->fb->pitches[0],
400-
adjusted_mode->vdisplay,
401-
format->meram,
402-
&scrtc->line_size);
403-
if (!IS_ERR(cache))
404-
scrtc->cache = cache;
405-
}
406-
407365
shmob_drm_crtc_compute_base(scrtc, x, y);
408366

409367
return 0;

‎drivers/gpu/drm/shmobile/shmob_drm_crtc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ struct shmob_drm_crtc {
2828
int dpms;
2929

3030
const struct shmob_drm_format_info *format;
31-
void *cache;
3231
unsigned long dma[2];
3332
unsigned int line_size;
3433
bool started;

‎drivers/gpu/drm/shmobile/shmob_drm_drv.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@
2323
struct clk;
2424
struct device;
2525
struct drm_device;
26-
struct sh_mobile_meram_info;
2726

2827
struct shmob_drm_device {
2928
struct device *dev;
3029
const struct shmob_drm_platform_data *pdata;
3130

3231
void __iomem *mmio;
3332
struct clk *clock;
34-
struct sh_mobile_meram_info *meram;
3533
u32 lddckr;
3634
u32 ldmt1r;
3735

‎drivers/gpu/drm/shmobile/shmob_drm_kms.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
#include <drm/drm_gem_cma_helper.h>
1919
#include <drm/drm_gem_framebuffer_helper.h>
2020

21-
#include <video/sh_mobile_meram.h>
22-
2321
#include "shmob_drm_crtc.h"
2422
#include "shmob_drm_drv.h"
2523
#include "shmob_drm_kms.h"
@@ -35,55 +33,46 @@ static const struct shmob_drm_format_info shmob_drm_format_infos[] = {
3533
.bpp = 16,
3634
.yuv = false,
3735
.lddfr = LDDFR_PKF_RGB16,
38-
.meram = SH_MOBILE_MERAM_PF_RGB,
3936
}, {
4037
.fourcc = DRM_FORMAT_RGB888,
4138
.bpp = 24,
4239
.yuv = false,
4340
.lddfr = LDDFR_PKF_RGB24,
44-
.meram = SH_MOBILE_MERAM_PF_RGB,
4541
}, {
4642
.fourcc = DRM_FORMAT_ARGB8888,
4743
.bpp = 32,
4844
.yuv = false,
4945
.lddfr = LDDFR_PKF_ARGB32,
50-
.meram = SH_MOBILE_MERAM_PF_RGB,
5146
}, {
5247
.fourcc = DRM_FORMAT_NV12,
5348
.bpp = 12,
5449
.yuv = true,
5550
.lddfr = LDDFR_CC | LDDFR_YF_420,
56-
.meram = SH_MOBILE_MERAM_PF_NV,
5751
}, {
5852
.fourcc = DRM_FORMAT_NV21,
5953
.bpp = 12,
6054
.yuv = true,
6155
.lddfr = LDDFR_CC | LDDFR_YF_420,
62-
.meram = SH_MOBILE_MERAM_PF_NV,
6356
}, {
6457
.fourcc = DRM_FORMAT_NV16,
6558
.bpp = 16,
6659
.yuv = true,
6760
.lddfr = LDDFR_CC | LDDFR_YF_422,
68-
.meram = SH_MOBILE_MERAM_PF_NV,
6961
}, {
7062
.fourcc = DRM_FORMAT_NV61,
7163
.bpp = 16,
7264
.yuv = true,
7365
.lddfr = LDDFR_CC | LDDFR_YF_422,
74-
.meram = SH_MOBILE_MERAM_PF_NV,
7566
}, {
7667
.fourcc = DRM_FORMAT_NV24,
7768
.bpp = 24,
7869
.yuv = true,
7970
.lddfr = LDDFR_CC | LDDFR_YF_444,
80-
.meram = SH_MOBILE_MERAM_PF_NV24,
8171
}, {
8272
.fourcc = DRM_FORMAT_NV42,
8373
.bpp = 24,
8474
.yuv = true,
8575
.lddfr = LDDFR_CC | LDDFR_YF_444,
86-
.meram = SH_MOBILE_MERAM_PF_NV24,
8776
},
8877
};
8978

‎drivers/gpu/drm/shmobile/shmob_drm_kms.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ struct shmob_drm_format_info {
2424
unsigned int bpp;
2525
bool yuv;
2626
u32 lddfr;
27-
unsigned int meram;
2827
};
2928

3029
const struct shmob_drm_format_info *shmob_drm_format_info(u32 fourcc);

‎drivers/gpu/drm/shmobile/shmob_drm_plane.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#include <drm/drm_fb_cma_helper.h>
1818
#include <drm/drm_gem_cma_helper.h>
1919

20-
#include <video/sh_mobile_meram.h>
21-
2220
#include "shmob_drm_drv.h"
2321
#include "shmob_drm_kms.h"
2422
#include "shmob_drm_plane.h"

‎drivers/media/platform/via-camera.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@
2727
#include <linux/via-core.h>
2828
#include <linux/via-gpio.h>
2929
#include <linux/via_i2c.h>
30+
31+
#ifdef CONFIG_X86
3032
#include <asm/olpc.h>
33+
#else
34+
#define machine_is_olpc(x) 0
35+
#endif
3136

3237
#include "via-camera.h"
3338

‎drivers/video/fbdev/Kconfig

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ config FB_SIS_315
14371437

14381438
config FB_VIA
14391439
tristate "VIA UniChrome (Pro) and Chrome9 display support"
1440-
depends on FB && PCI && X86 && GPIOLIB && I2C
1440+
depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST)
14411441
select FB_CFB_FILLRECT
14421442
select FB_CFB_COPYAREA
14431443
select FB_CFB_IMAGEBLIT
@@ -1888,7 +1888,6 @@ config FB_W100
18881888
config FB_SH_MOBILE_LCDC
18891889
tristate "SuperH Mobile LCDC framebuffer support"
18901890
depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK
1891-
depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM
18921891
select FB_SYS_FILLRECT
18931892
select FB_SYS_COPYAREA
18941893
select FB_SYS_IMAGEBLIT
@@ -2253,39 +2252,6 @@ config FB_BROADSHEET
22532252
and could also have been called by other names when coupled with
22542253
a bridge adapter.
22552254

2256-
config FB_AUO_K190X
2257-
tristate "AUO-K190X EPD controller support"
2258-
depends on FB
2259-
select FB_SYS_FILLRECT
2260-
select FB_SYS_COPYAREA
2261-
select FB_SYS_IMAGEBLIT
2262-
select FB_SYS_FOPS
2263-
select FB_DEFERRED_IO
2264-
help
2265-
Provides support for epaper controllers from the K190X series
2266-
of AUO. These controllers can be used to drive epaper displays
2267-
from Sipix.
2268-
2269-
This option enables the common support, shared by the individual
2270-
controller drivers. You will also have to enable the driver
2271-
for the controller type used in your device.
2272-
2273-
config FB_AUO_K1900
2274-
tristate "AUO-K1900 EPD controller support"
2275-
depends on FB && FB_AUO_K190X
2276-
help
2277-
This driver implements support for the AUO K1900 epd-controller.
2278-
This controller can drive Sipix epaper displays but can only do
2279-
serial updates, reducing the number of possible frames per second.
2280-
2281-
config FB_AUO_K1901
2282-
tristate "AUO-K1901 EPD controller support"
2283-
depends on FB && FB_AUO_K190X
2284-
help
2285-
This driver implements support for the AUO K1901 epd-controller.
2286-
This controller can drive Sipix epaper displays and supports
2287-
concurrent updates, making higher frames per second possible.
2288-
22892255
config FB_JZ4740
22902256
tristate "JZ4740 LCD framebuffer support"
22912257
depends on FB && MACH_JZ4740
@@ -2346,18 +2312,6 @@ source "drivers/video/fbdev/omap/Kconfig"
23462312
source "drivers/video/fbdev/omap2/Kconfig"
23472313
source "drivers/video/fbdev/mmp/Kconfig"
23482314

2349-
config FB_SH_MOBILE_MERAM
2350-
tristate "SuperH Mobile MERAM read ahead support"
2351-
depends on (SUPERH || ARCH_SHMOBILE)
2352-
select GENERIC_ALLOCATOR
2353-
---help---
2354-
Enable MERAM support for the SuperH controller.
2355-
2356-
This will allow for caching of the framebuffer to provide more
2357-
reliable access under heavy main memory bus traffic situations.
2358-
Up to 4 memory channels can be configured, allowing 4 RGB or
2359-
2 YCbCr framebuffers to be configured.
2360-
23612315
config FB_SSD1307
23622316
tristate "Solomon SSD1307 framebuffer support"
23632317
depends on FB && I2C

‎drivers/video/fbdev/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o
100100
obj-$(CONFIG_FB_MAXINE) += maxinefb.o
101101
obj-$(CONFIG_FB_METRONOME) += metronomefb.o
102102
obj-$(CONFIG_FB_BROADSHEET) += broadsheetfb.o
103-
obj-$(CONFIG_FB_AUO_K190X) += auo_k190x.o
104-
obj-$(CONFIG_FB_AUO_K1900) += auo_k1900fb.o
105-
obj-$(CONFIG_FB_AUO_K1901) += auo_k1901fb.o
106103
obj-$(CONFIG_FB_S1D13XXX) += s1d13xxxfb.o
107104
obj-$(CONFIG_FB_SH7760) += sh7760fb.o
108105
obj-$(CONFIG_FB_IMX) += imxfb.o
@@ -116,7 +113,6 @@ obj-$(CONFIG_FB_SM501) += sm501fb.o
116113
obj-$(CONFIG_FB_UDL) += udlfb.o
117114
obj-$(CONFIG_FB_SMSCUFX) += smscufx.o
118115
obj-$(CONFIG_FB_XILINX) += xilinxfb.o
119-
obj-$(CONFIG_FB_SH_MOBILE_MERAM) += sh_mobile_meram.o
120116
obj-$(CONFIG_FB_SH_MOBILE_LCDC) += sh_mobile_lcdcfb.o
121117
obj-$(CONFIG_FB_OMAP) += omap/
122118
obj-y += omap2/

‎drivers/video/fbdev/aty/aty128fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2442,7 +2442,7 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
24422442
(void)aty_ld_pll(POWER_MANAGEMENT);
24432443
aty_st_le32(BUS_CNTL1, 0x00000010);
24442444
aty_st_le32(MEM_POWER_MISC, 0x0c830000);
2445-
mdelay(100);
2445+
msleep(100);
24462446

24472447
/* Switch PCI power management to D2 */
24482448
pci_set_power_state(pdev, PCI_D2);

‎drivers/video/fbdev/aty/radeon_pm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,17 +2678,17 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
26782678
* it, we'll restore the dynamic clocks state on wakeup
26792679
*/
26802680
radeon_pm_disable_dynamic_mode(rinfo);
2681-
mdelay(50);
2681+
msleep(50);
26822682
radeon_pm_save_regs(rinfo, 1);
26832683

26842684
if (rinfo->is_mobility && !(rinfo->pm_mode & radeon_pm_d2)) {
26852685
/* Switch off LVDS interface */
2686-
mdelay(1);
2686+
usleep_range(1000, 2000);
26872687
OUTREG(LVDS_GEN_CNTL, INREG(LVDS_GEN_CNTL) & ~(LVDS_BL_MOD_EN));
2688-
mdelay(1);
2688+
usleep_range(1000, 2000);
26892689
OUTREG(LVDS_GEN_CNTL, INREG(LVDS_GEN_CNTL) & ~(LVDS_EN | LVDS_ON));
26902690
OUTREG(LVDS_PLL_CNTL, (INREG(LVDS_PLL_CNTL) & ~30000) | 0x20000);
2691-
mdelay(20);
2691+
msleep(20);
26922692
OUTREG(LVDS_GEN_CNTL, INREG(LVDS_GEN_CNTL) & ~(LVDS_DIGON));
26932693
}
26942694
pci_disable_device(pdev);

‎drivers/video/fbdev/au1100fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ static int au1100fb_drv_probe(struct platform_device *dev)
464464
PAGE_ALIGN(fbdev->fb_len),
465465
&fbdev->fb_phys, GFP_KERNEL);
466466
if (!fbdev->fb_mem) {
467-
print_err("fail to allocate frambuffer (size: %dK))",
467+
print_err("fail to allocate framebuffer (size: %dK))",
468468
fbdev->fb_len / 1024);
469469
return -ENOMEM;
470470
}

‎drivers/video/fbdev/au1200fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1696,7 +1696,7 @@ static int au1200fb_drv_probe(struct platform_device *dev)
16961696
&fbdev->fb_phys, GFP_KERNEL,
16971697
DMA_ATTR_NON_CONSISTENT);
16981698
if (!fbdev->fb_mem) {
1699-
print_err("fail to allocate frambuffer (size: %dK))",
1699+
print_err("fail to allocate framebuffer (size: %dK))",
17001700
fbdev->fb_len / 1024);
17011701
ret = -ENOMEM;
17021702
goto failed;

0 commit comments

Comments
 (0)