Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'drm-fixes-2022-03-18' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Dave Airlie:
"A few minor changes to finish things off, one mgag200 regression, imx
fix and couple of panel changes.
imx:
- Don't test bus flags in atomic check
mgag200:
- Fix PLL setup on some models
panel:
- Fix bpp settings on Innolux G070Y2-L01
- Fix DRM_PANEL_EDP Kconfig dependencies"
* tag 'drm-fixes-2022-03-18' of git://anongit.freedesktop.org/drm/drm:
drm: Don't make DRM_PANEL_BRIDGE dependent on DRM_KMS_HELPERS
drm/panel: simple: Fix Innolux G070Y2-L01 BPP settings
drm/imx: parallel-display: Remove bus flags check in imx_pd_bridge_atomic_check()
drm/mgag200: Fix PLL setup for g200wb and g200ew
+6
-13
+1
-1
drivers/gpu/drm/bridge/Kconfig
+1
-1
drivers/gpu/drm/bridge/Kconfig
···
8
8
config DRM_PANEL_BRIDGE
9
9
def_bool y
10
10
depends on DRM_BRIDGE
11
-
depends on DRM_KMS_HELPER
12
11
select DRM_PANEL
13
12
help
14
13
DRM bridge wrapper of DRM panels
···
29
30
config DRM_CHIPONE_ICN6211
30
31
tristate "Chipone ICN6211 MIPI-DSI/RGB Converter bridge"
31
32
depends on OF
33
+
select DRM_KMS_HELPER
32
34
select DRM_MIPI_DSI
33
35
select DRM_PANEL_BRIDGE
34
36
help
-8
drivers/gpu/drm/imx/parallel-display.c
-8
drivers/gpu/drm/imx/parallel-display.c
···
217
217
if (!imx_pd_format_supported(bus_fmt))
218
218
return -EINVAL;
219
219
220
-
if (bus_flags &
221
-
~(DRM_BUS_FLAG_DE_LOW | DRM_BUS_FLAG_DE_HIGH |
222
-
DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE |
223
-
DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)) {
224
-
dev_warn(imxpd->dev, "invalid bus_flags (%x)\n", bus_flags);
225
-
return -EINVAL;
226
-
}
227
-
228
220
bridge_state->output_bus_cfg.flags = bus_flags;
229
221
bridge_state->input_bus_cfg.flags = bus_flags;
230
222
imx_crtc_state->bus_flags = bus_flags;
+3
-3
drivers/gpu/drm/mgag200/mgag200_pll.c
+3
-3
drivers/gpu/drm/mgag200/mgag200_pll.c
···
404
404
udelay(50);
405
405
406
406
/* program pixel pll register */
407
-
WREG_DAC(MGA1064_PIX_PLLC_N, xpixpllcn);
408
-
WREG_DAC(MGA1064_PIX_PLLC_M, xpixpllcm);
409
-
WREG_DAC(MGA1064_PIX_PLLC_P, xpixpllcp);
407
+
WREG_DAC(MGA1064_WB_PIX_PLLC_N, xpixpllcn);
408
+
WREG_DAC(MGA1064_WB_PIX_PLLC_M, xpixpllcm);
409
+
WREG_DAC(MGA1064_WB_PIX_PLLC_P, xpixpllcp);
410
410
411
411
udelay(50);
412
412
+1
drivers/gpu/drm/panel/Kconfig
+1
drivers/gpu/drm/panel/Kconfig