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

Commit 4cdc8f12 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

A few fixes for 4.16:
- Fix a backlight S/R regression on amdgpu
- Fix prime teardown on radeon and amdgpu
- DP fix for amdgpu

* 'drm-fixes-4.16' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu/dce: Don't turn off DP sink when disconnected
  drm/amdgpu: save/restore backlight level in legacy dce code
  drm/radeon: fix prime teardown order
  drm/amdgpu: fix prime teardown order
parents 0c8efd61 7d617264

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

+12 −19
Original line number Diff line number Diff line
@@ -69,26 +69,19 @@ void amdgpu_connector_hotplug(struct drm_connector *connector) 
		/* don't do anything if sink is not display port, i.e.,

		 * passive dp->(dvi|hdmi) adaptor

		 */

		if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) {

			int saved_dpms = connector->dpms;

			/* Only turn off the display if it's physically disconnected */

			if (!amdgpu_display_hpd_sense(adev, amdgpu_connector->hpd.hpd)) {

				drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

			} else if (amdgpu_atombios_dp_needs_link_train(amdgpu_connector)) {

				/* Don't try to start link training before we

				 * have the dpcd */

		if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT &&

		    amdgpu_display_hpd_sense(adev, amdgpu_connector->hpd.hpd) &&

		    amdgpu_atombios_dp_needs_link_train(amdgpu_connector)) {

			/* Don't start link training before we have the DPCD */

			if (amdgpu_atombios_dp_get_dpcd(amdgpu_connector))

				return;



				/* set it to OFF so that drm_helper_connector_dpms()

				 * won't return immediately since the current state

				 * is ON at this point.

			/* Turn the connector off and back on immediately, which

			 * will trigger link training

			 */

				connector->dpms = DRM_MODE_DPMS_OFF;

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);

		}

			connector->dpms = saved_dpms;

		}

	}

}

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

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ void amdgpu_gem_object_free(struct drm_gem_object *gobj) 
	struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj);



	if (robj) {

		if (robj->gem_base.import_attach)

			drm_prime_gem_destroy(&robj->gem_base, robj->tbo.sg);

		amdgpu_mn_unregister(robj);

		amdgpu_bo_unref(&robj);

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ struct amdgpu_mode_info { 
	u16 firmware_flags;

	/* pointer to backlight encoder */

	struct amdgpu_encoder *bl_encoder;

	u8 bl_level; /* saved backlight level */

	struct amdgpu_audio	audio; /* audio stuff */

	int			num_crtc; /* number of crtcs */

	int			num_hpd; /* number of hpd pins */

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

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo) 


	amdgpu_bo_kunmap(bo);



	if (bo->gem_base.import_attach)

		drm_prime_gem_destroy(&bo->gem_base, bo->tbo.sg);

	drm_gem_object_release(&bo->gem_base);

	amdgpu_bo_unref(&bo->parent);

	if (!list_empty(&bo->shadow_list)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/backlight.h>

#include "bif/bif_4_1_d.h"



static u8

u8

amdgpu_atombios_encoder_get_backlight_level_from_reg(struct amdgpu_device *adev)

{

	u8 backlight_level;
@@ -48,7 +48,7 @@ amdgpu_atombios_encoder_get_backlight_level_from_reg(struct amdgpu_device *adev) 
	return backlight_level;

}



static void

void

amdgpu_atombios_encoder_set_backlight_level_to_reg(struct amdgpu_device *adev,

					    u8 backlight_level)

{