Merge tag 'drm-intel-fixes-2014-09-24' of git://anongit.freedesktop.org/drm-intel into drm-fixes

a couple of small fixes for 3.17 still.

* tag 'drm-intel-fixes-2014-09-24' of git://anongit.freedesktop.org/drm-intel:
  drm/i915/hdmi: fix hdmi audio state readout
  drm/i915: Don't leak command parser tables on suspend/resume

drivers/gpu/drm/i915/i915_cmd_parser.c

@@ -709,12 +709,14 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *ring)
 	BUG_ON(!validate_cmds_sorted(ring, cmd_tables, cmd_table_count));
 	BUG_ON(!validate_regs_sorted(ring));
 
+	if (hash_empty(ring->cmd_hash)) {
 		ret = init_hash_table(ring, cmd_tables, cmd_table_count);
 		if (ret) {
 			DRM_ERROR("CMD: cmd_parser_init failed!\n");
 			fini_hash_table(ring);
 			return ret;
 		}
+	}
 
 	ring->needs_cmd_parser = true;
 

drivers/gpu/drm/i915/intel_hdmi.c

@@ -732,7 +732,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
 	if (tmp & HDMI_MODE_SELECT_HDMI)
 		pipe_config->has_hdmi_sink = true;
 
-	if (tmp & HDMI_MODE_SELECT_HDMI)
+	if (tmp & SDVO_AUDIO_ENABLE)
 		pipe_config->has_audio = true;
 
 	if (!HAS_PCH_SPLIT(dev) &&