Skip to content

RP1 VEC: Use tv_mode from command line, align enum with drm_connector; tidy #5885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2024

Conversation

njhollinghurst
Copy link
Contributor

This attempts to fix #5864, targeting Linux 6.6

I narrowly kept the "tv_norm" module parameter in this draft; but it's somewhat redundant now that we can use video/tv_mode.

@6by9 6by9 changed the base branch from rpi-6.1.y to rpi-6.6.y January 23, 2024 19:00
@njhollinghurst
Copy link
Contributor Author

njhollinghurst commented Jan 24, 2024

@6by9 Shall I go ahead and remove the "tv_norm" parameter altogether? I am in two minds about it.

(I think the VEC driver will need at least one parameter, either for enabling 'vintage' modes and/or defining a custom mode, prior to evaluating the "video=" mode; but it need not be the existing "tv_norm" parameter.)

@njhollinghurst njhollinghurst marked this pull request as ready for review January 24, 2024 15:53
Use the standard enum drm_connector_tv_mode instead of a private
enum and switch from the legacy to the standard tv_mode property.

Remove the module parameter "tv_norm". Instead, get tv_mode from
the command line and make this the connector's default TV mode.

Don't restrict the choice of modes based on tv_mode, but interpret
nonstandard combinations as NTSC or PAL, depending on resolution.
Thus the default tv_mode=NTSC effectively means "Auto".

Tweak the advertised horizontal timings for 625/50 to match Rec.601

Signed-off-by: Nick Hollinghurst <[email protected]>
@njhollinghurst
Copy link
Contributor Author

Cherry-picked this back onto the rebased rpi-6.6.y. Will do a quick re-test and then merge.

@njhollinghurst njhollinghurst merged commit 30ac8b8 into rpi-6.6.y Feb 2, 2024
@njhollinghurst njhollinghurst deleted the tv_mode_from_cmdline branch February 2, 2024 13:52
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Feb 7, 2024
kernel: Improve I2C timing (again)
See: raspberrypi/linux#5916

kernel: drm/vc4: Drop planes that have 0 destination size
See: raspberrypi/linux#5929

kernel: drm: rp1: VEC and DPI drivers: Fix bug #5901
See: raspberrypi/linux#5925

kernel: drivers: media: cfe: Increase default size of embedded buffer
See: raspberrypi/linux#5923

kernel: RP1 VEC: Use tv_mode from command line, align enum with drm_connector; tidy
See: raspberrypi/linux#5885

kernel: ARM: dts: Standardise downstream Pi GPIO pin names
See: raspberrypi/linux#5902

kernel: ASoC: DACplusADCPro - fix 16bit sample support in clock consumer mode
See: raspberrypi/linux#5919

kernel: ASoC: adds support for Hifiberry AMP4Pro to the dacplus driver
See: raspberrypi/linux#5918

kernel: ASoC: DACplus - fix 16bit sample support in clock consumer mode
See: raspberrypi/linux#5917
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Feb 7, 2024
kernel: Improve I2C timing (again)
See: raspberrypi/linux#5916

kernel: drm/vc4: Drop planes that have 0 destination size
See: raspberrypi/linux#5929

kernel: drm: rp1: VEC and DPI drivers: Fix bug #5901
See: raspberrypi/linux#5925

kernel: drivers: media: cfe: Increase default size of embedded buffer
See: raspberrypi/linux#5923

kernel: RP1 VEC: Use tv_mode from command line, align enum with drm_connector; tidy
See: raspberrypi/linux#5885

kernel: ARM: dts: Standardise downstream Pi GPIO pin names
See: raspberrypi/linux#5902

kernel: ASoC: DACplusADCPro - fix 16bit sample support in clock consumer mode
See: raspberrypi/linux#5919

kernel: ASoC: adds support for Hifiberry AMP4Pro to the dacplus driver
See: raspberrypi/linux#5918

kernel: ASoC: DACplus - fix 16bit sample support in clock consumer mode
See: raspberrypi/linux#5917
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RP1 VEC: "tv_mode" property is not correctly inherited from command line "video"
2 participants