Commit 45ab1e07 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm/for-3.14-rc1-20140123' of git://anongit.freedesktop.org/tegra/linux into drm-next 

drm/tegra: Changes for v3.14-rc1 (update)

These patches fix some issues caused by the DRM panel support from the
previous pull request and add two more panels (for the Toshiba AC100 as
well as the Seaboard and Ventana).

* tag 'drm/for-3.14-rc1-20140123' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: Obtain head number from DT
  drm/panel: update EDID BLOB in panel_simple_get_modes()
  gpu: host1x: Remove unnecessary include
  drm/tegra: Use proper data type
  drm/tegra: Clarify how panel modes override others
  drm/tegra: Fix possible CRTC mask for RGB outputs
  drm/i915: Use drm_encoder_crtc_ok()
  drm: Move drm_encoder_crtc_ok() to core
  drm: provide a helper for the encoder possible_crtcs mask
  drm/tegra: Don't check resource with devm_ioremap_resource()
  drm/panel: Add support for Chunghwa CLAA101WA01A panel
  drm/panel: Add support for Samsung LTN101NT05 panel
parents f4b4718b 13411ddd

Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ of the following host1x client modules: 
    See ../reset/reset.txt for details.

  - reset-names: Must include the following entries:

    - dc

  - nvidia,head: The number of the display controller head. This is used to

    setup the various types of output to receive video data from the given

    head.



  Each display controller node has a child node, named "rgb", that represents

  the RGB output associated with the controller. It can take the following

Documentation/devicetree/bindings/panel/chunghwa,claa101wa01a.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Chunghwa Picture Tubes Ltd. 10.1" WXGA TFT LCD panel



Required properties:

- compatible: should be "chunghwa,claa101wa01a"



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/panel/samsung,ltn101nt05.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Samsung Electronics 10.1" WSVGA TFT LCD panel



Required properties:

- compatible: should be "samsung,ltn101nt05"



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

drivers/gpu/drm/drm_crtc.c

+23 −0
Original line number Diff line number Diff line
@@ -674,6 +674,29 @@ void drm_crtc_cleanup(struct drm_crtc *crtc) 
}

EXPORT_SYMBOL(drm_crtc_cleanup);



/**

 * drm_crtc_index - find the index of a registered CRTC

 * @crtc: CRTC to find index for

 *

 * Given a registered CRTC, return the index of that CRTC within a DRM

 * device's list of CRTCs.

 */

unsigned int drm_crtc_index(struct drm_crtc *crtc)

{

	unsigned int index = 0;

	struct drm_crtc *tmp;



	list_for_each_entry(tmp, &crtc->dev->mode_config.crtc_list, head) {

		if (tmp == crtc)

			return index;



		index++;

	}



	BUG();

}

EXPORT_SYMBOL(drm_crtc_index);



/**

 * drm_mode_probed_add - add a mode to a connector's probed mode list

 * @connector: connector the new mode

drivers/gpu/drm/drm_crtc_helper.c

+0 −29
Original line number Diff line number Diff line
@@ -324,35 +324,6 @@ void drm_helper_disable_unused_functions(struct drm_device *dev) 
}

EXPORT_SYMBOL(drm_helper_disable_unused_functions);



/**

 * drm_encoder_crtc_ok - can a given crtc drive a given encoder?

 * @encoder: encoder to test

 * @crtc: crtc to test

 *

 * Return false if @encoder can't be driven by @crtc, true otherwise.

 */

static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,

				struct drm_crtc *crtc)

{

	struct drm_device *dev;

	struct drm_crtc *tmp;

	int crtc_mask = 1;



	WARN(!crtc, "checking null crtc?\n");



	dev = crtc->dev;



	list_for_each_entry(tmp, &dev->mode_config.crtc_list, head) {

		if (tmp == crtc)

			break;

		crtc_mask <<= 1;

	}



	if (encoder->possible_crtcs & crtc_mask)

		return true;

	return false;

}



/*

 * Check the CRTC we're going to map each output to vs. its current

 * CRTC.  If they don't match, we have to disable the output and the CRTC

CRA Git | Maintained and supported by SUSTech CRA and CCSE