Merge tag 'drm-misc-next-fixes-2018-01-18' of... (559f17be) · Commits · 戴 / test

drivers/gpu/drm/Kconfig

+4 −4

Original line number	Diff line number	Diff line
		@@ -27,10 +27,6 @@ config DRM_MIPI_DSI
		bool
		depends on DRM

		# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
		config DRM_PANEL_ORIENTATION_QUIRKS
		tristate

		config DRM_DP_AUX_CHARDEV
		bool "DRM DP AUX Interface"
		depends on DRM
		@@ -372,6 +368,10 @@ config DRM_SAVAGE

		endif # DRM_LEGACY

		# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
		config DRM_PANEL_ORIENTATION_QUIRKS
		tristate

		config DRM_LIB_RANDOM
		bool
		default n

+9 −2

Original line number	Diff line number	Diff line
		@@ -215,10 +215,17 @@ static int panel_lvds_probe(struct platform_device *pdev)
		lvds->supply = devm_regulator_get_optional(lvds->dev, "power");
		if (IS_ERR(lvds->supply)) {
		ret = PTR_ERR(lvds->supply);
		dev_err(lvds->dev, "failed to request regulator: %d\n", ret);

		if (ret != -ENODEV) {
		if (ret != -EPROBE_DEFER)
		dev_err(lvds->dev, "failed to request regulator: %d\n",
		ret);
		return ret;
		}

		lvds->supply = NULL;
		}

		/* Get GPIOs and backlight controller. */
		lvds->enable_gpio = devm_gpiod_get_optional(lvds->dev, "enable",
		GPIOD_OUT_LOW);

+1 −1

Original line number	Diff line number	Diff line
		@@ -902,7 +902,7 @@ static int sun4i_tcon_bind(struct device dev, struct device master,
		has_lvds_alt = false;
		} else {
		dev_err(dev, "Couldn't get the LVDS PLL\n");
		return PTR_ERR(tcon->lvds_rst);
		return PTR_ERR(tcon->lvds_pll);
		}
		} else {
		has_lvds_alt = true;