1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index e73b2a73494a..f48240bb8c56 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -266,6 +266,9 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
         uint32_t offset;
         ssize_t err;
 
+        if (!dig || !dig->afmt)
+                return;
+
         /* Silent, r600_hdmi_enable will raise WARN for us */
         if (!dig->afmt->enabled)
                 return;
@@ -448,6 +451,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder, bool enable)
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         u32 hdmi = HDMI0_ERROR_ACK;
 
+        if (!dig || !dig->afmt)
+                return;
+
         /* Silent, r600_hdmi_enable will raise WARN for us */
         if (enable && dig->afmt->enabled)
                 return;