Skip to content

Commit cced514

Browse files
committed
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
2 parents 551acdc + ca5a576 commit cced514

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

drivers/gpu/drm/bridge/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ config DRM_BRIDGE
88
config DRM_PANEL_BRIDGE
99
def_bool y
1010
depends on DRM_BRIDGE
11-
depends on DRM_KMS_HELPER
1211
select DRM_PANEL
1312
help
1413
DRM bridge wrapper of DRM panels
@@ -30,6 +29,7 @@ config DRM_CDNS_DSI
3029
config DRM_CHIPONE_ICN6211
3130
tristate "Chipone ICN6211 MIPI-DSI/RGB Converter bridge"
3231
depends on OF
32+
select DRM_KMS_HELPER
3333
select DRM_MIPI_DSI
3434
select DRM_PANEL_BRIDGE
3535
help

drivers/gpu/drm/imx/parallel-display.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,6 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge,
217217
if (!imx_pd_format_supported(bus_fmt))
218218
return -EINVAL;
219219

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-
228220
bridge_state->output_bus_cfg.flags = bus_flags;
229221
bridge_state->input_bus_cfg.flags = bus_flags;
230222
imx_crtc_state->bus_flags = bus_flags;

drivers/gpu/drm/mgag200/mgag200_pll.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,9 @@ mgag200_pixpll_update_g200wb(struct mgag200_pll *pixpll, const struct mgag200_pl
404404
udelay(50);
405405

406406
/* 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);
410410

411411
udelay(50);
412412

drivers/gpu/drm/panel/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ config DRM_PANEL_EDP
107107
select VIDEOMODE_HELPERS
108108
select DRM_DP_AUX_BUS
109109
select DRM_DP_HELPER
110+
select DRM_KMS_HELPER
110111
help
111112
DRM panel driver for dumb eDP panels that need at most a regulator and
112113
a GPIO to be powered up. Optionally a backlight can be attached so

drivers/gpu/drm/panel/panel-simple.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@ static const struct display_timing innolux_g070y2_l01_timing = {
20172017
static const struct panel_desc innolux_g070y2_l01 = {
20182018
.timings = &innolux_g070y2_l01_timing,
20192019
.num_timings = 1,
2020-
.bpc = 6,
2020+
.bpc = 8,
20212021
.size = {
20222022
.width = 152,
20232023
.height = 91,

0 commit comments

Comments
 (0)