Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72156676 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: consolidate r600_audio.c into r600_hdmi.c 



Most of that functionality is only used by r600_hdmi.c
and I'm planning to change that further.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d740a933

drivers/gpu/drm/radeon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ 
	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \

	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \

	r200.o radeon_legacy_tv.o r600_cs.o r600_blit_shaders.o \

	radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o dce3_1_afmt.o \

	radeon_pm.o atombios_dp.o r600_hdmi.o dce3_1_afmt.o \

	evergreen.o evergreen_cs.o evergreen_blit_shaders.o \

	evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \

	atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \

drivers/gpu/drm/radeon/r600_audio.c

deleted100644 → 0
+0 −184
Original line number Diff line number Diff line 
/*

 * Copyright 2008 Advanced Micro Devices, Inc.

 * Copyright 2008 Red Hat Inc.

 * Copyright 2009 Christian König.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Christian König

 */

#include <drm/drmP.h>

#include "radeon.h"

#include "radeon_reg.h"

#include "radeon_asic.h"

#include "atom.h"



/*

 * check if the chipset is supported

 */

static int r600_audio_chipset_supported(struct radeon_device *rdev)

{

	return ASIC_IS_DCE2(rdev) && !ASIC_IS_NODCE(rdev);

}



struct r600_audio_pin r600_audio_status(struct radeon_device *rdev)

{

	struct r600_audio_pin status;

	uint32_t value;



	value = RREG32(R600_AUDIO_RATE_BPS_CHANNEL);



	/* number of channels */

	status.channels = (value & 0x7) + 1;



	/* bits per sample */

	switch ((value & 0xF0) >> 4) {

	case 0x0:

		status.bits_per_sample = 8;

		break;

	case 0x1:

		status.bits_per_sample = 16;

		break;

	case 0x2:

		status.bits_per_sample = 20;

		break;

	case 0x3:

		status.bits_per_sample = 24;

		break;

	case 0x4:

		status.bits_per_sample = 32;

		break;

	default:

		dev_err(rdev->dev, "Unknown bits per sample 0x%x, using 16\n",

			(int)value);

		status.bits_per_sample = 16;

	}



	/* current sampling rate in HZ */

	if (value & 0x4000)

		status.rate = 44100;

	else

		status.rate = 48000;

	status.rate *= ((value >> 11) & 0x7) + 1;

	status.rate /= ((value >> 8) & 0x7) + 1;



	value = RREG32(R600_AUDIO_STATUS_BITS);



	/* iec 60958 status bits */

	status.status_bits = value & 0xff;



	/* iec 60958 category code */

	status.category_code = (value >> 8) & 0xff;



	return status;

}



/*

 * update all hdmi interfaces with current audio parameters

 */

void r600_audio_update_hdmi(struct work_struct *work)

{

	struct radeon_device *rdev = container_of(work, struct radeon_device,

						  audio_work);

	struct drm_device *dev = rdev->ddev;

	struct r600_audio_pin audio_status = r600_audio_status(rdev);

	struct drm_encoder *encoder;

	bool changed = false;



	if (rdev->audio.pin[0].channels != audio_status.channels ||

	    rdev->audio.pin[0].rate != audio_status.rate ||

	    rdev->audio.pin[0].bits_per_sample != audio_status.bits_per_sample ||

	    rdev->audio.pin[0].status_bits != audio_status.status_bits ||

	    rdev->audio.pin[0].category_code != audio_status.category_code) {

		rdev->audio.pin[0] = audio_status;

		changed = true;

	}



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		if (!radeon_encoder_is_digital(encoder))

			continue;

		if (changed || r600_hdmi_buffer_status_changed(encoder))

			r600_hdmi_update_audio_settings(encoder);

	}

}



/* enable the audio stream */

void r600_audio_enable(struct radeon_device *rdev,

		       struct r600_audio_pin *pin,

		       bool enable)

{

	u32 value = 0;



	if (!pin)

		return;



	if (ASIC_IS_DCE4(rdev)) {

		if (enable) {

			value |= 0x81000000; /* Required to enable audio */

			value |= 0x0e1000f0; /* fglrx sets that too */

		}

		WREG32(EVERGREEN_AUDIO_ENABLE, value);

	} else {

		WREG32_P(R600_AUDIO_ENABLE,

			 enable ? 0x81000000 : 0x0, ~0x81000000);

	}

}



/*

 * initialize the audio vars

 */

int r600_audio_init(struct radeon_device *rdev)

{

	if (!radeon_audio || !r600_audio_chipset_supported(rdev))

		return 0;



	rdev->audio.enabled = true;



	rdev->audio.num_pins = 1;

	rdev->audio.pin[0].channels = -1;

	rdev->audio.pin[0].rate = -1;

	rdev->audio.pin[0].bits_per_sample = -1;

	rdev->audio.pin[0].status_bits = 0;

	rdev->audio.pin[0].category_code = 0;

	rdev->audio.pin[0].id = 0;

	/* disable audio.  it will be set up later */

	r600_audio_enable(rdev, &rdev->audio.pin[0], false);



	return 0;

}



/*

 * release the audio timer

 * TODO: How to do this correctly on SMP systems?

 */

void r600_audio_fini(struct radeon_device *rdev)

{

	if (!rdev->audio.enabled)

		return;



	r600_audio_enable(rdev, &rdev->audio.pin[0], false);



	rdev->audio.enabled = false;

}



struct r600_audio_pin *r600_audio_get_pin(struct radeon_device *rdev)

{

	/* only one pin on 6xx-NI */

	return &rdev->audio.pin[0];

}

drivers/gpu/drm/radeon/r600_hdmi.c

+154 −0
Original line number Diff line number Diff line
@@ -71,6 +71,160 @@ static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = { 
};





/*

 * check if the chipset is supported

 */

static int r600_audio_chipset_supported(struct radeon_device *rdev)

{

	return ASIC_IS_DCE2(rdev) && !ASIC_IS_NODCE(rdev);

}



static struct r600_audio_pin r600_audio_status(struct radeon_device *rdev)

{

	struct r600_audio_pin status;

	uint32_t value;



	value = RREG32(R600_AUDIO_RATE_BPS_CHANNEL);



	/* number of channels */

	status.channels = (value & 0x7) + 1;



	/* bits per sample */

	switch ((value & 0xF0) >> 4) {

	case 0x0:

		status.bits_per_sample = 8;

		break;

	case 0x1:

		status.bits_per_sample = 16;

		break;

	case 0x2:

		status.bits_per_sample = 20;

		break;

	case 0x3:

		status.bits_per_sample = 24;

		break;

	case 0x4:

		status.bits_per_sample = 32;

		break;

	default:

		dev_err(rdev->dev, "Unknown bits per sample 0x%x, using 16\n",

			(int)value);

		status.bits_per_sample = 16;

	}



	/* current sampling rate in HZ */

	if (value & 0x4000)

		status.rate = 44100;

	else

		status.rate = 48000;

	status.rate *= ((value >> 11) & 0x7) + 1;

	status.rate /= ((value >> 8) & 0x7) + 1;



	value = RREG32(R600_AUDIO_STATUS_BITS);



	/* iec 60958 status bits */

	status.status_bits = value & 0xff;



	/* iec 60958 category code */

	status.category_code = (value >> 8) & 0xff;



	return status;

}



/*

 * update all hdmi interfaces with current audio parameters

 */

void r600_audio_update_hdmi(struct work_struct *work)

{

	struct radeon_device *rdev = container_of(work, struct radeon_device,

						  audio_work);

	struct drm_device *dev = rdev->ddev;

	struct r600_audio_pin audio_status = r600_audio_status(rdev);

	struct drm_encoder *encoder;

	bool changed = false;



	if (rdev->audio.pin[0].channels != audio_status.channels ||

	    rdev->audio.pin[0].rate != audio_status.rate ||

	    rdev->audio.pin[0].bits_per_sample != audio_status.bits_per_sample ||

	    rdev->audio.pin[0].status_bits != audio_status.status_bits ||

	    rdev->audio.pin[0].category_code != audio_status.category_code) {

		rdev->audio.pin[0] = audio_status;

		changed = true;

	}



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		if (!radeon_encoder_is_digital(encoder))

			continue;

		if (changed || r600_hdmi_buffer_status_changed(encoder))

			r600_hdmi_update_audio_settings(encoder);

	}

}



/* enable the audio stream */

void r600_audio_enable(struct radeon_device *rdev,

		       struct r600_audio_pin *pin,

		       bool enable)

{

	u32 value = 0;



	if (!pin)

		return;



	if (ASIC_IS_DCE4(rdev)) {

		if (enable) {

			value |= 0x81000000; /* Required to enable audio */

			value |= 0x0e1000f0; /* fglrx sets that too */

		}

		WREG32(EVERGREEN_AUDIO_ENABLE, value);

	} else {

		WREG32_P(R600_AUDIO_ENABLE,

			 enable ? 0x81000000 : 0x0, ~0x81000000);

	}

}



/*

 * initialize the audio vars

 */

int r600_audio_init(struct radeon_device *rdev)

{

	if (!radeon_audio || !r600_audio_chipset_supported(rdev))

		return 0;



	rdev->audio.enabled = true;



	rdev->audio.num_pins = 1;

	rdev->audio.pin[0].channels = -1;

	rdev->audio.pin[0].rate = -1;

	rdev->audio.pin[0].bits_per_sample = -1;

	rdev->audio.pin[0].status_bits = 0;

	rdev->audio.pin[0].category_code = 0;

	rdev->audio.pin[0].id = 0;

	/* disable audio.  it will be set up later */

	r600_audio_enable(rdev, &rdev->audio.pin[0], false);



	return 0;

}



/*

 * release the audio timer

 * TODO: How to do this correctly on SMP systems?

 */

void r600_audio_fini(struct radeon_device *rdev)

{

	if (!rdev->audio.enabled)

		return;



	r600_audio_enable(rdev, &rdev->audio.pin[0], false);



	rdev->audio.enabled = false;

}



struct r600_audio_pin *r600_audio_get_pin(struct radeon_device *rdev)

{

	/* only one pin on 6xx-NI */

	return &rdev->audio.pin[0];

}



/*

 * calculate CTS and N values if they are not found in the table

 */

drivers/gpu/drm/radeon/radeon_asic.h

+0 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ void r600_disable_interrupts(struct radeon_device *rdev); 
void r600_rlc_stop(struct radeon_device *rdev);

/* r600 audio */

int r600_audio_init(struct radeon_device *rdev);

struct r600_audio_pin r600_audio_status(struct radeon_device *rdev);

void r600_audio_fini(struct radeon_device *rdev);

void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock);

void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder, void *buffer,