Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53f9313f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Scattered selection of fixes:

   - radeon: load detect fixes from SuSE/AMD
   - intel: misc i830, sdvo regression, vesafb kickoff ums fix
   - exynos: maintainers entry update + fixes
   - udl: fix stride scanout issue

  it's slightly bigger than I'd probably like, but nothing looked
  dangerous enough to hold off on."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/udl: fix stride issues scanning out stride != width*bpp
  drm/radeon: add load detection support for ext DAC on R200 (v2)
  DRM/radeon: For single CRTC GPUs move handling of CRTC_CRT_ON to crtc_dpms().
  DRM/Radeon: Fix TV DAC Load Detection for single CRTC chips.
  DRM/Radeon: Clean up code in TV DAC load detection.
  drm/radeon: fix ATPX function documentation
  drivers/gpu/drm/radeon/evergreen_cs.c: Remove unnecessary semicolon
  DRM/Radeon: On DVI-I use Load Detection when EDID is bogus.
  DRM/Radeon: Fix primary DAC Load Detection for RV100 chips.
  DRM/Radeon: Fix Load Detection on legacy primary DAC.
  drm: exynos: removed warning due to missing typecast for mixer driver data
  drm/exynos: add support for ARCH_MULTIPLATFORM
  MAINTAINERS: Add git repository for Exynos DRM
  drm/exynos: fix display on issue
  drm/i915: Only kick out vesafb if we takeover the fbcon with KMS
  drm/i915: be less verbose about inability to provide vendor backlight
  drm/i915: clear the entire sdvo infoframe buffer
  drm/i915: VGA needs to be on pipe A on i830M
  drm/i915: fix overlay on i830M
parents 0f89a573 3916e1d7

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2507,6 +2507,7 @@ M: Joonyoung Shim <jy0922.shim@samsung.com> 
M:	Seung-Woo Kim <sw0312.kim@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

L:	dri-devel@lists.freedesktop.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git

S:	Supported

F:	drivers/gpu/drm/exynos

F:	include/drm/exynos*

drivers/gpu/drm/exynos/Kconfig

+1 −1
Original line number Diff line number Diff line 
config DRM_EXYNOS

	tristate "DRM Support for Samsung SoC EXYNOS Series"

	depends on DRM && PLAT_SAMSUNG

	depends on DRM && (PLAT_SAMSUNG || ARCH_MULTIPLATFORM)

	select DRM_KMS_HELPER

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

drivers/gpu/drm/exynos/exynos_drm_connector.c

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev, 
	exynos_connector->encoder_id = encoder->base.id;

	exynos_connector->manager = manager;

	exynos_connector->dpms = DRM_MODE_DPMS_OFF;

	connector->dpms = DRM_MODE_DPMS_OFF;

	connector->encoder = encoder;



	err = drm_mode_connector_attach_encoder(connector, encoder);

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+17 −16
Original line number Diff line number Diff line
@@ -43,12 +43,14 @@ 
 * @manager: specific encoder has its own manager to control a hardware

 *	appropriately and we can access a hardware drawing on this manager.

 * @dpms: store the encoder dpms value.

 * @updated: indicate whether overlay data updating is needed or not.

 */

struct exynos_drm_encoder {

	struct drm_crtc			*old_crtc;

	struct drm_encoder		drm_encoder;

	struct exynos_drm_manager	*manager;

	int				dpms;

	bool				updated;

};



static void exynos_drm_connector_power(struct drm_encoder *encoder, int mode)
@@ -85,7 +87,9 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) 
	switch (mode) {

	case DRM_MODE_DPMS_ON:

		if (manager_ops && manager_ops->apply)

			if (!exynos_encoder->updated)

				manager_ops->apply(manager->dev);



		exynos_drm_connector_power(encoder, mode);

		exynos_encoder->dpms = mode;

		break;
@@ -94,6 +98,7 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) 
	case DRM_MODE_DPMS_OFF:

		exynos_drm_connector_power(encoder, mode);

		exynos_encoder->dpms = mode;

		exynos_encoder->updated = false;

		break;

	default:

		DRM_ERROR("unspecified mode %d\n", mode);
@@ -205,13 +210,22 @@ static void exynos_drm_encoder_prepare(struct drm_encoder *encoder) 


static void exynos_drm_encoder_commit(struct drm_encoder *encoder)

{

	struct exynos_drm_manager *manager = exynos_drm_get_manager(encoder);

	struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);

	struct exynos_drm_manager *manager = exynos_encoder->manager;

	struct exynos_drm_manager_ops *manager_ops = manager->ops;



	DRM_DEBUG_KMS("%s\n", __FILE__);



	if (manager_ops && manager_ops->commit)

		manager_ops->commit(manager->dev);



	/*

	 * this will avoid one issue that overlay data is updated to

	 * real hardware two times.

	 * And this variable will be used to check if the data was

	 * already updated or not by exynos_drm_encoder_dpms function.

	 */

	exynos_encoder->updated = true;

}



static void exynos_drm_encoder_disable(struct drm_encoder *encoder)
@@ -400,19 +414,6 @@ void exynos_drm_encoder_crtc_dpms(struct drm_encoder *encoder, void *data) 
	if (manager_ops && manager_ops->dpms)

		manager_ops->dpms(manager->dev, mode);



	/*

	 * set current mode to new one so that data aren't updated into

	 * registers by drm_helper_connector_dpms two times.

	 *

	 * in case that drm_crtc_helper_set_mode() is called,

	 * overlay_ops->commit() and manager_ops->commit() callbacks

	 * can be called two times, first at drm_crtc_helper_set_mode()

	 * and second at drm_helper_connector_dpms().

	 * so with this setting, when drm_helper_connector_dpms() is called

	 * encoder->funcs->dpms() will be ignored.

	 */

	exynos_encoder->dpms = mode;



	/*

	 * if this condition is ok then it means that the crtc is already

	 * detached from encoder and last function for detaching is properly

drivers/gpu/drm/exynos/exynos_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ static int __devinit mixer_probe(struct platform_device *pdev) 
		const struct of_device_id *match;

		match = of_match_node(of_match_ptr(mixer_match_types),

							  pdev->dev.of_node);

		drv = match->data;

		drv = (struct mixer_drv_data *)match->data;

	} else {

		drv = (struct mixer_drv_data *)

			platform_get_device_id(pdev)->driver_data;