Merge drm/drm-next into drm-misc-next

[linux-2.6-block.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_crc.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
index e7ad528f5853bfc410718e804fbfbce4177f0f38..01fc5717b657fb73ecb5b5d41ca03d511ba358a3 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
@@ -112,10 +112,16 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name)
  */
 void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc)
 {
-       struct dm_crtc_state *crtc_state = to_dm_crtc_state(crtc->state);
-       struct dc_stream_state *stream_state = crtc_state->stream;
+       struct dm_crtc_state *crtc_state;
+       struct dc_stream_state *stream_state;
        uint32_t crcs[3];
 
+       if (crtc == NULL)
+               return;
+
+       crtc_state = to_dm_crtc_state(crtc->state);
+       stream_state = crtc_state->stream;
+
        /* Early return if CRC capture is not enabled. */
        if (!crtc_state->crc_enabled)
                return;