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

Commit 69405d3d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-10-11' of git://anongit.freedesktop.org/drm-intel into drm-next 

Just flushing out my -misc queue. Slightly important are the prime
refcount/unload fixes from Chris.

There's also the reservation stuff from Chris still pending, and Sumits
hasn't landed that yet. Might get another pull for that, but pls don't
hold up the main pull for it ;-)

* tag 'topic/drm-misc-2016-10-11' of git://anongit.freedesktop.org/drm-intel:
  drm/crtc: constify drm_crtc_index parameter
  drm: use the right function name in documentation
  drm: Release resources with a safer function
  drm: Fix up kerneldoc for new drm_gem_dmabuf_export()
  drm/bridge: Drop drm_connector_unregister and call drm_connector_cleanup directly
  drm/fb-helper: fix sphinx markup for DRM_FB_HELPER_DEFAULT_OPS
  drm/bridge: Add RGB to VGA bridge support
  drm/prime: Take a ref on the drm_dev when exporting a dma_buf
  drm/prime: Pass the right module owner through to dma_buf_export()
  drm/bridge: Call drm_connector_cleanup directly
  drm: simple_kms_helper: Add prepare_fb and cleanup_fb hooks
  drm: Release resources with a safer function
parents 28da9ed6 a5bd451b

Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt

0 → 100644
+48 −0
Original line number Diff line number Diff line 
Dumb RGB to VGA DAC bridge

---------------------------



This binding is aimed for dumb RGB to VGA DAC based bridges that do not require

any configuration.



Required properties:



- compatible: Must be "dumb-vga-dac"



Required nodes:



This device has two video ports. Their connections are modelled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for RGB input

- Video port 1 for VGA output





Example

-------



bridge {

	compatible = "dumb-vga-dac";

	#address-cells = <1>;

	#size-cells = <0>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			vga_bridge_in: endpoint {

				remote-endpoint = <&tcon0_out_vga>;

			};

		};



		port@1 {

			reg = <1>;



			vga_bridge_out: endpoint {

				remote-endpoint = <&vga_con_in>;

			};

		};

	};

};

drivers/gpu/drm/armada/armada_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, 
	exp_info.flags = O_RDWR;

	exp_info.priv = obj;



	return dma_buf_export(&exp_info);

	return drm_gem_dmabuf_export(dev, &exp_info);

}



struct drm_gem_object *

drivers/gpu/drm/bridge/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ config DRM_ANALOGIX_ANX78XX 
	  the HDMI output of an application processor to MyDP

	  or DisplayPort.



config DRM_DUMB_VGA_DAC

	tristate "Dumb VGA DAC Bridge support"

	depends on OF

	select DRM_KMS_HELPER

	help

	  Support for RGB to VGA DAC based bridges



config DRM_DW_HDMI

	tristate

	select DRM_KMS_HELPER

drivers/gpu/drm/bridge/Makefile

+1 −0
Original line number Diff line number Diff line 
ccflags-y := -Iinclude/drm



obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o

obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o

obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o

obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o

obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o

drivers/gpu/drm/bridge/analogix-anx78xx.c

+1 −6
Original line number Diff line number Diff line
@@ -1001,16 +1001,11 @@ static enum drm_connector_status anx78xx_detect(struct drm_connector *connector, 
	return connector_status_connected;

}



static void anx78xx_connector_destroy(struct drm_connector *connector)

{

	drm_connector_cleanup(connector);

}



static const struct drm_connector_funcs anx78xx_connector_funcs = {

	.dpms = drm_atomic_helper_connector_dpms,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.detect = anx78xx_detect,

	.destroy = anx78xx_connector_destroy,

	.destroy = drm_connector_cleanup,

	.reset = drm_atomic_helper_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,