Commit 12ab316c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.7-2020-04-01' of git://people.freedesktop.org/~agd5f/linux into drm-next 



amd-drm-next-5.7-2020-04-01:

amdgpu:
- HDCP fixes
- gfx10 fix
- Misc display fixes
- BACO fixes

amdkfd:
- Fix memory leak

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200401194619.4217-1-alexander.deucher@amd.com
parents 9c346968 3148a6a0

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

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ static int gfx_v10_0_mec_init(struct amdgpu_device *adev) 
		return r;

	}



	memset(hpd, 0, adev->gfx.mec.hpd_eop_obj->tbo.mem.size);

	memset(hpd, 0, mec_hpd_size);



	amdgpu_bo_kunmap(adev->gfx.mec.hpd_eop_obj);

	amdgpu_bo_unreserve(adev->gfx.mec.hpd_eop_obj);

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

+1 −1
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ static int gfx_v9_0_mec_init(struct amdgpu_device *adev) 
		return r;

	}



	memset(hpd, 0, adev->gfx.mec.hpd_eop_obj->tbo.mem.size);

	memset(hpd, 0, mec_hpd_size);



	amdgpu_bo_kunmap(adev->gfx.mec.hpd_eop_obj);

	amdgpu_bo_unreserve(adev->gfx.mec.hpd_eop_obj);

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+2 −2
Original line number Diff line number Diff line
@@ -1112,9 +1112,9 @@ kfd_gtt_out: 
	return 0;



kfd_gtt_no_free_chunk:

	pr_debug("Allocation failed with mem_obj = %p\n", mem_obj);

	pr_debug("Allocation failed with mem_obj = %p\n", *mem_obj);

	mutex_unlock(&kfd->gtt_sa_lock);

	kfree(mem_obj);

	kfree(*mem_obj);

	return -ENOMEM;

}

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

+10 −2
Original line number Diff line number Diff line
@@ -3639,6 +3639,9 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev, 
	case DRM_FORMAT_NV12:

		plane_info->format = SURFACE_PIXEL_FORMAT_VIDEO_420_YCrCb;

		break;

	case DRM_FORMAT_P010:

		plane_info->format = SURFACE_PIXEL_FORMAT_VIDEO_420_10bpc_YCrCb;

		break;

	default:

		DRM_ERROR(

			"Unsupported screen format %s\n",
@@ -5535,6 +5538,8 @@ static int get_plane_formats(const struct drm_plane *plane, 


		if (plane_cap && plane_cap->pixel_format_support.nv12)

			formats[num_formats++] = DRM_FORMAT_NV12;

		if (plane_cap && plane_cap->pixel_format_support.p010)

			formats[num_formats++] = DRM_FORMAT_P010;

		break;



	case DRM_PLANE_TYPE_OVERLAY:
@@ -5587,12 +5592,15 @@ static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, 
	}



	if (plane->type == DRM_PLANE_TYPE_PRIMARY &&

	    plane_cap && plane_cap->pixel_format_support.nv12) {

	    plane_cap &&

	    (plane_cap->pixel_format_support.nv12 ||

	     plane_cap->pixel_format_support.p010)) {

		/* This only affects YUV formats. */

		drm_plane_create_color_properties(

			plane,

			BIT(DRM_COLOR_YCBCR_BT601) |

			BIT(DRM_COLOR_YCBCR_BT709),

			BIT(DRM_COLOR_YCBCR_BT709) |

			BIT(DRM_COLOR_YCBCR_BT2020),

			BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |

			BIT(DRM_COLOR_YCBCR_FULL_RANGE),

			DRM_COLOR_YCBCR_BT709, DRM_COLOR_YCBCR_LIMITED_RANGE);

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

+10 −4
Original line number Diff line number Diff line
@@ -192,10 +192,13 @@ void hdcp_update_display(struct hdcp_workqueue *hdcp_work, 
					    &hdcp_work->srm_version);



			display->adjust.disable = 0;

			if (content_type == DRM_MODE_HDCP_CONTENT_TYPE0)

			if (content_type == DRM_MODE_HDCP_CONTENT_TYPE0) {

				hdcp_w->link.adjust.hdcp1.disable = 0;

				hdcp_w->link.adjust.hdcp2.force_type = MOD_HDCP_FORCE_TYPE_0;

			else if (content_type == DRM_MODE_HDCP_CONTENT_TYPE1)

			} else if (content_type == DRM_MODE_HDCP_CONTENT_TYPE1) {

				hdcp_w->link.adjust.hdcp1.disable = 1;

				hdcp_w->link.adjust.hdcp2.force_type = MOD_HDCP_FORCE_TYPE_1;

			}



			schedule_delayed_work(&hdcp_w->property_validate_dwork,

					      msecs_to_jiffies(DRM_HDCP_CHECK_PERIOD_MS));
@@ -263,7 +266,7 @@ static void event_callback(struct work_struct *work) 


	mutex_lock(&hdcp_work->mutex);



	cancel_delayed_work(&hdcp_work->watchdog_timer_dwork);

	cancel_delayed_work(&hdcp_work->callback_dwork);



	mod_hdcp_process_event(&hdcp_work->hdcp, MOD_HDCP_EVENT_CALLBACK,

			       &hdcp_work->output);
@@ -344,6 +347,8 @@ static void event_watchdog_timer(struct work_struct *work) 


	mutex_lock(&hdcp_work->mutex);



	cancel_delayed_work(&hdcp_work->watchdog_timer_dwork);



	mod_hdcp_process_event(&hdcp_work->hdcp,

			       MOD_HDCP_EVENT_WATCHDOG_TIMEOUT,

			       &hdcp_work->output);
@@ -414,7 +419,8 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) 
	link->dp.rev = aconnector->dc_link->dpcd_caps.dpcd_rev.raw;

	link->dp.mst_supported = config->mst_supported;

	display->adjust.disable = 1;

	link->adjust.auth_delay = 2;

	link->adjust.auth_delay = 3;

	link->adjust.hdcp1.disable = 0;



	hdcp_update_display(hdcp_work, link_index, aconnector, DRM_MODE_HDCP_CONTENT_TYPE0, false);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE