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

Commit b15c50be authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2015-12-14' of git://anongit.freedesktop.org/drm-intel into drm-next 

Last (very likely at least) drm-misc pull for 4.5. 3 big things:
- piles of docs for kms vtables.
- drm.debug dmesg output prettification from Ville (i915 parts are for 4.6
  I think)
- connector mode probing/validating/merging cleanup from Ville.

[airlied : fix drm_encoder_init conflict.]

* tag 'topic/drm-misc-2015-12-14' of git://anongit.freedesktop.org/drm-intel: (43 commits)
  drm: modes: Revert cc344980 "replace simple_strtoul by kstrtouint"
  drm: Expand the drm_helper_probe_single_connector_modes() docs
  drm: Allow override_edid to override the firmware EDID
  drm/sti: Drop bogus drm_mode_sort() call
  drm: Drop drm_helper_probe_single_connector_modes_nomerge()
  drm: Only merge mode type bits between new probed modes
  drm: Flatten drm_mode_connector_list_update() a bit
  drm: Rename MODE_UNVERIFIED to MODE_STALE
  drm: Don't overwrite UNVERFIED mode status to OK
  drm: Add plane->name and use it in debug prints
  drm: Add crtc->name and use it in debug messages
  drm: Use driver specified encoder name
  drm: Pass 'name' to drm_encoder_init()
  drm: Pass 'name' to drm_universal_plane_init()
  drm: Pass 'name' to drm_crtc_init_with_planes()
  drm: Documentation style guide
  drm: Document drm_encoder/crtc_helper_funcs
  drm: Move drm_display_mode an related docs into kerneldoc
  drm/atomic-helper: Mention the new system/resume helpers the docs
  drm: Document drm_connector_helper_funcs
  ...
parents 4526903a d6e6e14f

Documentation/DocBook/gpu.tmpl

+46 −491

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <drm/drm_dp_helper.h>

#include <drm/drm_fixed.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_plane_helper.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+7 −7
Original line number Diff line number Diff line
@@ -3729,7 +3729,7 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, 
	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:

		drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

				 DRM_MODE_ENCODER_DAC);

				 DRM_MODE_ENCODER_DAC, NULL);

		drm_encoder_helper_add(encoder, &dce_v10_0_dac_helper_funcs);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3740,15 +3740,15 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, 
		if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

			amdgpu_encoder->rmx_type = RMX_FULL;

			drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

					 DRM_MODE_ENCODER_LVDS);

					 DRM_MODE_ENCODER_LVDS, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder);

		} else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) {

			drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

					 DRM_MODE_ENCODER_DAC);

					 DRM_MODE_ENCODER_DAC, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);

		} else {

			drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);

		}

		drm_encoder_helper_add(encoder, &dce_v10_0_dig_helper_funcs);
@@ -3766,13 +3766,13 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, 
		amdgpu_encoder->is_ext_encoder = true;

		if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))

			drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

					 DRM_MODE_ENCODER_LVDS);

					 DRM_MODE_ENCODER_LVDS, NULL);

		else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))

			drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

					 DRM_MODE_ENCODER_DAC);

					 DRM_MODE_ENCODER_DAC, NULL);

		else

			drm_encoder_init(dev, encoder, &dce_v10_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

		drm_encoder_helper_add(encoder, &dce_v10_0_ext_helper_funcs);

		break;

	}

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+7 −7
Original line number Diff line number Diff line
@@ -3722,7 +3722,7 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, 
	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:

		drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

				 DRM_MODE_ENCODER_DAC);

				 DRM_MODE_ENCODER_DAC, NULL);

		drm_encoder_helper_add(encoder, &dce_v11_0_dac_helper_funcs);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3733,15 +3733,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, 
		if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

			amdgpu_encoder->rmx_type = RMX_FULL;

			drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

					 DRM_MODE_ENCODER_LVDS);

					 DRM_MODE_ENCODER_LVDS, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder);

		} else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) {

			drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

					 DRM_MODE_ENCODER_DAC);

					 DRM_MODE_ENCODER_DAC, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);

		} else {

			drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);

		}

		drm_encoder_helper_add(encoder, &dce_v11_0_dig_helper_funcs);
@@ -3759,13 +3759,13 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, 
		amdgpu_encoder->is_ext_encoder = true;

		if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))

			drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

					 DRM_MODE_ENCODER_LVDS);

					 DRM_MODE_ENCODER_LVDS, NULL);

		else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))

			drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

					 DRM_MODE_ENCODER_DAC);

					 DRM_MODE_ENCODER_DAC, NULL);

		else

			drm_encoder_init(dev, encoder, &dce_v11_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

		drm_encoder_helper_add(encoder, &dce_v11_0_ext_helper_funcs);

		break;

	}

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+7 −7
Original line number Diff line number Diff line
@@ -3659,7 +3659,7 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, 
	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:

		drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

				 DRM_MODE_ENCODER_DAC);

				 DRM_MODE_ENCODER_DAC, NULL);

		drm_encoder_helper_add(encoder, &dce_v8_0_dac_helper_funcs);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
@@ -3670,15 +3670,15 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, 
		if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

			amdgpu_encoder->rmx_type = RMX_FULL;

			drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

					 DRM_MODE_ENCODER_LVDS);

					 DRM_MODE_ENCODER_LVDS, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_lcd_info(amdgpu_encoder);

		} else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT)) {

			drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

					 DRM_MODE_ENCODER_DAC);

					 DRM_MODE_ENCODER_DAC, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);

		} else {

			drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

			amdgpu_encoder->enc_priv = amdgpu_atombios_encoder_get_dig_info(amdgpu_encoder);

		}

		drm_encoder_helper_add(encoder, &dce_v8_0_dig_helper_funcs);
@@ -3696,13 +3696,13 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, 
		amdgpu_encoder->is_ext_encoder = true;

		if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))

			drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

					 DRM_MODE_ENCODER_LVDS);

					 DRM_MODE_ENCODER_LVDS, NULL);

		else if (amdgpu_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT))

			drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

					 DRM_MODE_ENCODER_DAC);

					 DRM_MODE_ENCODER_DAC, NULL);

		else

			drm_encoder_init(dev, encoder, &dce_v8_0_encoder_funcs,

					 DRM_MODE_ENCODER_TMDS);

					 DRM_MODE_ENCODER_TMDS, NULL);

		drm_encoder_helper_add(encoder, &dce_v8_0_ext_helper_funcs);

		break;

	}