Skip to content

Commit

Permalink
drm/amdkcl: adapt for drm_connector_helper_funcs->atomic_check() prot…
Browse files Browse the repository at this point in the history
…otype change

prototype change is in v5.2-rc2-529-g6f3b62781bbd
macro HDMI_DRM_INFOFRAME_SIZE is introduced in v5.1-rc5-1691-g2cdbfd66a829
thus there's no need to check atomic_check() availability.

Signed-off-by: Flora Cui <flora.cui@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Flora Cui <flora.cui@amd.com>
  • Loading branch information
Flora Cui committed Jan 22, 2020
1 parent abc9dd8 commit 024c622
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -5395,10 +5395,16 @@ is_hdr_metadata_different(const struct drm_connector_state *old_state,

static int
amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
#ifdef HAVE_DRM_CONNECTOR_HELPER_FUNCS_ATOMIC_CHECK_ARG_DRM_ATOMIC_STATE
struct drm_atomic_state *state)
{
struct drm_connector_state *new_con_state =
drm_atomic_get_new_connector_state(state, conn);
#else
struct drm_connector_state *new_con_state)
{
struct drm_atomic_state *state = new_con_state->state;
#endif
struct drm_connector_state *old_con_state =
drm_atomic_get_old_connector_state(state, conn);
struct drm_crtc *crtc = new_con_state->crtc;
Expand Down

0 comments on commit 024c622

Please sign in to comment.