Commit cced5148 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 551acdc3 ca5a5761
...@@ -8,7 +8,6 @@ config DRM_BRIDGE ...@@ -8,7 +8,6 @@ config DRM_BRIDGE
config DRM_PANEL_BRIDGE config DRM_PANEL_BRIDGE
def_bool y def_bool y
depends on DRM_BRIDGE depends on DRM_BRIDGE
depends on DRM_KMS_HELPER
select DRM_PANEL select DRM_PANEL
help help
DRM bridge wrapper of DRM panels DRM bridge wrapper of DRM panels
...@@ -30,6 +29,7 @@ config DRM_CDNS_DSI ...@@ -30,6 +29,7 @@ config DRM_CDNS_DSI
config DRM_CHIPONE_ICN6211 config DRM_CHIPONE_ICN6211
tristate "Chipone ICN6211 MIPI-DSI/RGB Converter bridge" tristate "Chipone ICN6211 MIPI-DSI/RGB Converter bridge"
depends on OF depends on OF
select DRM_KMS_HELPER
select DRM_MIPI_DSI select DRM_MIPI_DSI
select DRM_PANEL_BRIDGE select DRM_PANEL_BRIDGE
help help
......
...@@ -217,14 +217,6 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge, ...@@ -217,14 +217,6 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge,
if (!imx_pd_format_supported(bus_fmt)) if (!imx_pd_format_supported(bus_fmt))
return -EINVAL; return -EINVAL;
if (bus_flags &
~(DRM_BUS_FLAG_DE_LOW | DRM_BUS_FLAG_DE_HIGH |
DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE |
DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)) {
dev_warn(imxpd->dev, "invalid bus_flags (%x)\n", bus_flags);
return -EINVAL;
}
bridge_state->output_bus_cfg.flags = bus_flags; bridge_state->output_bus_cfg.flags = bus_flags;
bridge_state->input_bus_cfg.flags = bus_flags; bridge_state->input_bus_cfg.flags = bus_flags;
imx_crtc_state->bus_flags = bus_flags; imx_crtc_state->bus_flags = bus_flags;
......
...@@ -404,9 +404,9 @@ mgag200_pixpll_update_g200wb(struct mgag200_pll *pixpll, const struct mgag200_pl ...@@ -404,9 +404,9 @@ mgag200_pixpll_update_g200wb(struct mgag200_pll *pixpll, const struct mgag200_pl
udelay(50); udelay(50);
/* program pixel pll register */ /* program pixel pll register */
WREG_DAC(MGA1064_PIX_PLLC_N, xpixpllcn); WREG_DAC(MGA1064_WB_PIX_PLLC_N, xpixpllcn);
WREG_DAC(MGA1064_PIX_PLLC_M, xpixpllcm); WREG_DAC(MGA1064_WB_PIX_PLLC_M, xpixpllcm);
WREG_DAC(MGA1064_PIX_PLLC_P, xpixpllcp); WREG_DAC(MGA1064_WB_PIX_PLLC_P, xpixpllcp);
udelay(50); udelay(50);
......
...@@ -107,6 +107,7 @@ config DRM_PANEL_EDP ...@@ -107,6 +107,7 @@ config DRM_PANEL_EDP
select VIDEOMODE_HELPERS select VIDEOMODE_HELPERS
select DRM_DP_AUX_BUS select DRM_DP_AUX_BUS
select DRM_DP_HELPER select DRM_DP_HELPER
select DRM_KMS_HELPER
help help
DRM panel driver for dumb eDP panels that need at most a regulator and DRM panel driver for dumb eDP panels that need at most a regulator and
a GPIO to be powered up. Optionally a backlight can be attached so a GPIO to be powered up. Optionally a backlight can be attached so
......
...@@ -2017,7 +2017,7 @@ static const struct display_timing innolux_g070y2_l01_timing = { ...@@ -2017,7 +2017,7 @@ static const struct display_timing innolux_g070y2_l01_timing = {
static const struct panel_desc innolux_g070y2_l01 = { static const struct panel_desc innolux_g070y2_l01 = {
.timings = &innolux_g070y2_l01_timing, .timings = &innolux_g070y2_l01_timing,
.num_timings = 1, .num_timings = 1,
.bpc = 6, .bpc = 8,
.size = { .size = {
.width = 152, .width = 152,
.height = 91, .height = 91,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment