mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-15 22:41:38 +00:00
6f9dbb525a
commit d0ea397e22 upstream.
1. Always assign audio function pointers even if the display does
not support audio. We need to properly disable the audio stream
when when using a non-audio capable monitor. Fixes purple line
on some hdmi monitors.
2. Check if a pin is in use by another encoder before disabling
it.
v2: make sure we've fetched the edid before checking audio and
look up the encoder before calling audio_detect since
connector->encoder may not be assigned yet. Separate
pin and afmt. They are allocated at different times and
have no dependency on eachother.
v3: fix connector fetching in encoder functions
v4: fix missed dig->pin check in dce6_afmt_write_latency_fields
bugs:
https://bugzilla.kernel.org/show_bug.cgi?id=93701
https://bugzilla.redhat.com/show_bug.cgi?id=1236337
https://bugs.freedesktop.org/show_bug.cgi?id=91041
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
84 lines
3.5 KiB
C
84 lines
3.5 KiB
C
/*
|
|
* Copyright 2014 Advanced Micro Devices, Inc.
|
|
*
|
|
* 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: Slava Grigorev <slava.grigorev@amd.com>
|
|
*/
|
|
|
|
#ifndef __RADEON_AUDIO_H__
|
|
#define __RADEON_AUDIO_H__
|
|
|
|
#include <linux/types.h>
|
|
|
|
#define RREG32_ENDPOINT(block, reg) \
|
|
radeon_audio_endpoint_rreg(rdev, (block), (reg))
|
|
#define WREG32_ENDPOINT(block, reg, v) \
|
|
radeon_audio_endpoint_wreg(rdev, (block), (reg), (v))
|
|
|
|
struct radeon_audio_basic_funcs
|
|
{
|
|
u32 (*endpoint_rreg)(struct radeon_device *rdev, u32 offset, u32 reg);
|
|
void (*endpoint_wreg)(struct radeon_device *rdev,
|
|
u32 offset, u32 reg, u32 v);
|
|
void (*enable)(struct radeon_device *rdev,
|
|
struct r600_audio_pin *pin, u8 enable_mask);
|
|
};
|
|
|
|
struct radeon_audio_funcs
|
|
{
|
|
void (*select_pin)(struct drm_encoder *encoder);
|
|
struct r600_audio_pin* (*get_pin)(struct radeon_device *rdev);
|
|
void (*write_latency_fields)(struct drm_encoder *encoder,
|
|
struct drm_connector *connector, struct drm_display_mode *mode);
|
|
void (*write_sad_regs)(struct drm_encoder *encoder,
|
|
struct cea_sad *sads, int sad_count);
|
|
void (*write_speaker_allocation)(struct drm_encoder *encoder,
|
|
u8 *sadb, int sad_count);
|
|
void (*set_dto)(struct radeon_device *rdev,
|
|
struct radeon_crtc *crtc, unsigned int clock);
|
|
void (*update_acr)(struct drm_encoder *encoder, long offset,
|
|
const struct radeon_hdmi_acr *acr);
|
|
void (*set_vbi_packet)(struct drm_encoder *encoder, u32 offset);
|
|
void (*set_color_depth)(struct drm_encoder *encoder, u32 offset, int bpc);
|
|
void (*set_avi_packet)(struct radeon_device *rdev, u32 offset,
|
|
unsigned char *buffer, size_t size);
|
|
void (*set_audio_packet)(struct drm_encoder *encoder, u32 offset);
|
|
void (*set_mute)(struct drm_encoder *encoder, u32 offset, bool mute);
|
|
void (*mode_set)(struct drm_encoder *encoder,
|
|
struct drm_display_mode *mode);
|
|
void (*dpms)(struct drm_encoder *encoder, bool mode);
|
|
};
|
|
|
|
int radeon_audio_init(struct radeon_device *rdev);
|
|
void radeon_audio_detect(struct drm_connector *connector,
|
|
struct drm_encoder *encoder,
|
|
enum drm_connector_status status);
|
|
u32 radeon_audio_endpoint_rreg(struct radeon_device *rdev,
|
|
u32 offset, u32 reg);
|
|
void radeon_audio_endpoint_wreg(struct radeon_device *rdev,
|
|
u32 offset, u32 reg, u32 v);
|
|
struct r600_audio_pin *radeon_audio_get_pin(struct drm_encoder *encoder);
|
|
void radeon_audio_fini(struct radeon_device *rdev);
|
|
void radeon_audio_mode_set(struct drm_encoder *encoder,
|
|
struct drm_display_mode *mode);
|
|
void radeon_audio_dpms(struct drm_encoder *encoder, int mode);
|
|
|
|
#endif
|