Commit 88412a4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2020-04-24' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Weekly regular fixes for drm, The usual rc3 uptick here, but nothing
  too crazy or notable.

  core:
   - mst: zero pbn when releasing vcpi slots

  amdgpu:
   - Fix resume issue on renoir
   - Thermal fix for older CI dGPUs
   - Fix some fallout from dropping drm load/unload callbacks

  i915:
   - Tigerlake Workaround - disabling media recompression (Matt)
   - Fix RPS interrupts for right GPU frequency (Chris)
   - HDCP fix prime check (Oliver)
   - Tigerlake Thunderbolt power well fix (Matt)
   - Tigerlake DP link training fixes (Jose)
   - Documentation sphinx build fix (Jani)
   - Fix enable_dpcd_backlight modparam (Lyude)

  analogix-dp:
   - binding fix

  meson:
   - remove unneeded error message

  bindings:
   - fix warnings
   - fix lvds binding

  scheduler:
   - thread racing fix

  tidss:
   - use after free fix"

* tag 'drm-fixes-2020-04-24' of git://anongit.freedesktop.org/drm/drm:
  drm/i915/dpcd_bl: Unbreak enable_dpcd_backlight modparam
  drm/i915: fix Sphinx build duplicate label warning
  drm/i915/display: Load DP_TP_CTL/STATUS offset before use it
  drm/i915/tgl: TBT AUX should use TC power well ops
  drm/i915: HDCP: fix Ri prime check done during link check
  drm/i915/gt: Update PMINTRMSK holding fw
  drm/i915/tgl: Add Wa_14010477008:tgl
  drm/tidss: fix crash related to accessing freed memory
  drm/dp_mst: Zero assigned PBN when releasing VCPI slots
  drm/amdgpu/display: give aux i2c buses more meaningful names
  drm/amdgpu/display: fix aux registration (v2)
  drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii)
  drm/amd/powerplay: fix resume failed as smu table initialize early exit
  drm/scheduler: fix drm_sched_get_cleanup_job
  drm/meson: Delete an error message in meson_dw_hdmi_bind()
  drm/bridge: anx6345: set correct BPC for display_info of connector
  dt-bindings: display: allow port and ports in panel-lvds
  dt-bindings: display: xpp055c272: Remove the reg property
  dt-bindings: display: ltk500hd1829: Remove the reg property
  drm/bridge: analogix_dp: Split bind() into probe() and real bind()
parents b4f63322 e32b2484

Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ examples: 
    dsi {

        #address-cells = <1>;

        #size-cells = <0>;

        reg = <0xff450000 0x1000>;



        panel@0 {

            compatible = "leadtek,ltk500hd1829";

Documentation/devicetree/bindings/display/panel/lvds.yaml

+9 −1
Original line number Diff line number Diff line
@@ -96,12 +96,20 @@ properties: 
      If set, reverse the bit order described in the data mappings below on all

      data lanes, transmitting bits for slots 6 to 0 instead of 0 to 6.



  port: true

  ports: true



required:

  - compatible

  - data-mapping

  - width-mm

  - height-mm

  - panel-timing



oneOf:

  - required:

      - port

  - required:

      - ports



...

Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ examples: 
    dsi {

        #address-cells = <1>;

        #size-cells = <0>;

        reg = <0xff450000 0x1000>;



        panel@0 {

            compatible = "xinpeng,xpp055c272";

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+12 −2
Original line number Diff line number Diff line
@@ -4664,6 +4664,7 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector) 
		i2c_del_adapter(&aconnector->i2c->base);

		kfree(aconnector->i2c);

	}

	kfree(aconnector->dm_dp_aux.aux.name);



	kfree(connector);

}
@@ -4723,10 +4724,19 @@ amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector) 
static int

amdgpu_dm_connector_late_register(struct drm_connector *connector)

{

#if defined(CONFIG_DEBUG_FS)

	struct amdgpu_dm_connector *amdgpu_dm_connector =

		to_amdgpu_dm_connector(connector);

	int r;



	if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||

	    (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {

		amdgpu_dm_connector->dm_dp_aux.aux.dev = connector->kdev;

		r = drm_dp_aux_register(&amdgpu_dm_connector->dm_dp_aux.aux);

		if (r)

			return r;

	}



#if defined(CONFIG_DEBUG_FS)

	connector_debugfs_init(amdgpu_dm_connector);

#endif
@@ -6092,7 +6102,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, 


	if (connector_type == DRM_MODE_CONNECTOR_DisplayPort

		|| connector_type == DRM_MODE_CONNECTOR_eDP)

		amdgpu_dm_initialize_dp_connector(dm, aconnector);

		amdgpu_dm_initialize_dp_connector(dm, aconnector, link->link_index);



out_free:

	if (res) {

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+9 −6
Original line number Diff line number Diff line
@@ -156,16 +156,16 @@ amdgpu_dm_mst_connector_late_register(struct drm_connector *connector) 
		to_amdgpu_dm_connector(connector);

	int r;



	amdgpu_dm_connector->dm_dp_aux.aux.dev = connector->kdev;

	r = drm_dp_aux_register(&amdgpu_dm_connector->dm_dp_aux.aux);

	if (r)

	r = drm_dp_mst_connector_late_register(connector,

					       amdgpu_dm_connector->port);

	if (r < 0)

		return r;



#if defined(CONFIG_DEBUG_FS)

	connector_debugfs_init(amdgpu_dm_connector);

#endif



	return r;

	return 0;

}



static void
@@ -472,9 +472,12 @@ static const struct drm_dp_mst_topology_cbs dm_mst_cbs = { 
};



void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,

				       struct amdgpu_dm_connector *aconnector)

				       struct amdgpu_dm_connector *aconnector,

				       int link_index)

{

	aconnector->dm_dp_aux.aux.name = "dmdc";

	aconnector->dm_dp_aux.aux.name =

		kasprintf(GFP_KERNEL, "AMDGPU DM aux hw bus %d",

			  link_index);

	aconnector->dm_dp_aux.aux.transfer = dm_dp_aux_transfer;

	aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE