drm/bridge: dw-hdmi: fix AVI frame colorimetry
Subsystems (2)
Sasha Levin
maintainerPATCH 3/10 drm/bochs: downgrade pci_request_region failure from error to warning
In reply to Sasha LevinFrom: Gerd Hoffmann <[email protected]>
[ Upstream commit 8c34cd1a7f089dc03933289c5d4a4d1489549828 ]
Shutdown of firmware framebuffer has a bunch of problems. Because of this the framebuffer region might still be reserved even after drm_fb_helper_remove_conflicting_pci_framebuffers() returned.
Don't consider pci_request_region() failure for the framebuffer region as fatal error to workaround this issue.
--- drivers/gpu/drm/bochs/bochs_hw.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/bochs/bochs_hw.c +2 -4
@@ -97,10 +97,8 @@ int bochs_hw_init(struct drm_device *dev, uint32_t flags) size =min (size, mem); } -if (pci_request_region (pdev,0 ,"bochs-drm" ) !=0 ) { -DRM_ERROR ("Cannot request framebuffer\n" ); -return -EBUSY ; - } +if (pci_request_region (pdev,0 ,"bochs-drm" ) !=0 ) +DRM_WARN ("Cannot request framebuffer, boot fb still active?\n" ); bochs->fb_map =ioremap (addr, size);if (bochs->fb_map ==NULL ) {
Signature · 6 lines
2.20.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Sasha Levin
maintainerPATCH 1/10 drm/bridge: dw-hdmi: fix AVI frame colorimetry
From: Jernej Skrabec <[email protected]>
[ Upstream commit e8dca30f7118461d47e1c3510d0e31b277439151 ]
CTA-861-F explicitly states that for RGB colorspace colorimetry should be set to "none". Fix that.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 46 +++++++++++++---------- 1 file changed, 26 insertions(+), 20 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +26 -20
@@ -1348,28 +1348,34 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) frame.colorspace =HDMI_COLORSPACE_RGB ;/* Set up colorimetry */ -switch (hdmi->hdmi_data.enc_out_encoding) { -case V4L2_YCBCR_ENC_601 : -if (hdmi->hdmi_data.enc_in_encoding ==V4L2_YCBCR_ENC_XV601 ) - frame.colorimetry =HDMI_COLORIMETRY_EXTENDED ; -else +if (!hdmi_bus_fmt_is_rgb (hdmi->hdmi_data.enc_out_bus_format)) { +switch (hdmi->hdmi_data.enc_out_encoding) { +case V4L2_YCBCR_ENC_601 : +if (hdmi->hdmi_data.enc_in_encoding ==V4L2_YCBCR_ENC_XV601 ) + frame.colorimetry =HDMI_COLORIMETRY_EXTENDED ; +else + frame.colorimetry =HDMI_COLORIMETRY_ITU_601 ; + frame.extended_colorimetry = +HDMI_EXTENDED_COLORIMETRY_XV_YCC_601 ; +break ; +case V4L2_YCBCR_ENC_709 : +if (hdmi->hdmi_data.enc_in_encoding ==V4L2_YCBCR_ENC_XV709 ) + frame.colorimetry =HDMI_COLORIMETRY_EXTENDED ; +else + frame.colorimetry =HDMI_COLORIMETRY_ITU_709 ; + frame.extended_colorimetry = +HDMI_EXTENDED_COLORIMETRY_XV_YCC_709 ; +break ; +default :/* Carries no data */ frame.colorimetry =HDMI_COLORIMETRY_ITU_601 ; + frame.extended_colorimetry = +HDMI_EXTENDED_COLORIMETRY_XV_YCC_601 ; +break ; + } + }else { + frame.colorimetry =HDMI_COLORIMETRY_NONE ; frame.extended_colorimetry = -HDMI_EXTENDED_COLORIMETRY_XV_YCC_601 ; -break ; -case V4L2_YCBCR_ENC_709 : -if (hdmi->hdmi_data.enc_in_encoding ==V4L2_YCBCR_ENC_XV709 ) - frame.colorimetry =HDMI_COLORIMETRY_EXTENDED ; -else - frame.colorimetry =HDMI_COLORIMETRY_ITU_709 ; - frame.extended_colorimetry = -HDMI_EXTENDED_COLORIMETRY_XV_YCC_709 ; -break ; -default :/* Carries no data */ - frame.colorimetry =HDMI_COLORIMETRY_ITU_601 ; - frame.extended_colorimetry = -HDMI_EXTENDED_COLORIMETRY_XV_YCC_601 ; -break ; +HDMI_EXTENDED_COLORIMETRY_XV_YCC_601 ; } frame.scan_mode =HDMI_SCAN_MODE_NONE ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 5/10 staging: greybus: loopback_test: fix potential path truncation
From: Johan Hovold <[email protected]>
[ Upstream commit f16023834863932f95dfad13fac3fc47f77d2f29 ]
Newer GCC warns about a possible truncation of a generated sysfs path name as we're concatenating a directory path with a file name and placing the result in a buffer that is half the size of the maximum length of the directory path (which is user controlled).
loopback_test.c: In function 'open_poll_files':
loopback_test.c:651:31: warning: '%s' directive output may be truncated writing up to 511 bytes into a region of size 255 [-Wformat-truncation=]
651 | snprintf(buf, sizeof(buf), "%s%s", dev->sysfs_entry, "iteration_count");
| ^~
loopback_test.c:651:3: note: 'snprintf' output between 16 and 527 bytes into a destination of size 255
651 | snprintf(buf, sizeof(buf), "%s%s", dev->sysfs_entry, "iteration_count");
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Fix this by making sure the buffer is large enough the concatenated strings.
--- drivers/staging/greybus/tools/loopback_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/greybus/tools/loopback_test.c +1 -1
@@ -644,7 +644,7 @@ int find_loopback_devices(struct loopback_test *t)static int open_poll_files (struct loopback_test *t) {struct loopback_device *dev; -char buf[MAX_STR_LEN ]; +char buf[MAX_SYSFS_PATH +MAX_STR_LEN ];char dummy;int fds_idx =0 ;int i;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/10 staging: greybus: loopback_test: fix potential path truncations
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit ae62cf5eb2792d9a818c2d93728ed92119357017 ]
Newer GCC warns about possible truncations of two generated path names as we're concatenating the configurable sysfs and debugfs path prefixes with a filename and placing the results in buffers of the same size as the maximum length of the prefixes.
snprintf(d->name, MAX_STR_LEN, "gb_loopback%u", dev_id); snprintf(d->sysfs_entry, MAX_SYSFS_PATH, "%s%s/", t->sysfs_prefix, d->name); snprintf(d->debugfs_entry, MAX_SYSFS_PATH, "%sraw_latency_%s", t->debugfs_prefix, d->name);
Fix this by separating the maximum path length from the maximum prefix length and reducing the latter enough to fit the generated strings.
Note that we also need to reduce the device-name buffer size as GCC isn't smart enough to figure out that we ever only used MAX_STR_LEN bytes of it.
--- drivers/staging/greybus/tools/loopback_test.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/staging/greybus/tools/loopback_test.c +8 -7
@@ -20,6 +20,7 @@#include <signal.h> #define MAX_NUM_DEVICES 10 +#define MAX_SYSFS_PREFIX 0x80#define MAX_SYSFS_PATH 0x200#define CSV_MAX_LINE 0x1000#define SYSFS_MAX_INT 0x20
@@ -68,7 +69,7 @@ struct loopback_results { };struct loopback_device { -char name[MAX_SYSFS_PATH ]; +char name[MAX_STR_LEN ];char sysfs_entry[MAX_SYSFS_PATH ];char debugfs_entry[MAX_SYSFS_PATH ];struct loopback_results results;
@@ -94,8 +95,8 @@ struct loopback_test {int stop_all;int poll_count;char test_name[MAX_STR_LEN ]; -char sysfs_prefix[MAX_SYSFS_PATH ]; -char debugfs_prefix[MAX_SYSFS_PATH ]; +char sysfs_prefix[MAX_SYSFS_PREFIX ]; +char debugfs_prefix[MAX_SYSFS_PREFIX ];struct timespec poll_timeout;struct loopback_device devices[MAX_NUM_DEVICES ];struct loopback_results aggregate_results;
@@ -914,10 +915,10 @@ int main(int argc, char *argv[]) t.iteration_max =atoi (optarg);break ;case 'S' : -snprintf (t.sysfs_prefix,MAX_SYSFS_PATH ,"%s" , optarg); +snprintf (t.sysfs_prefix,MAX_SYSFS_PREFIX ,"%s" , optarg);break ;case 'D' : -snprintf (t.debugfs_prefix,MAX_SYSFS_PATH ,"%s" , optarg); +snprintf (t.debugfs_prefix,MAX_SYSFS_PREFIX ,"%s" , optarg);break ;case 'm' : t.mask =atol (optarg);
@@ -968,10 +969,10 @@ int main(int argc, char *argv[]) }if (!strcmp (t.sysfs_prefix,"" )) -snprintf (t.sysfs_prefix,MAX_SYSFS_PATH ,"%s" , sysfs_prefix); +snprintf (t.sysfs_prefix,MAX_SYSFS_PREFIX ,"%s" , sysfs_prefix);if (!strcmp (t.debugfs_prefix,"" )) -snprintf (t.debugfs_prefix,MAX_SYSFS_PATH ,"%s" , debugfs_prefix); +snprintf (t.debugfs_prefix,MAX_SYSFS_PREFIX ,"%s" , debugfs_prefix); ret =find_loopback_devices (&t);if (ret)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/10 tools/power turbostat: Fix gcc build warnings
In reply to Sasha LevinFrom: Len Brown <[email protected]>
[ Upstream commit d8d005ba6afa502ca37ced5782f672c4d2fc1515 ]
Warning: ‘__builtin_strncpy’ specified bound 20 equals destination size
[-Wstringop-truncation]
reduce param to strncpy, to guarantee that a null byte is always copied into destination buffer.
--- tools/power/x86/turbostat/turbostat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/power/x86/turbostat/turbostat.c +2 -2
@@ -4650,9 +4650,9 @@ int add_counter(unsigned int msr_num, char *path, char *name, } msrp->msr_num = msr_num; -strncpy (msrp->name, name,NAME_BYTES ); +strncpy (msrp->name, name,NAME_BYTES -1 );if (path) -strncpy (msrp->path, path,PATH_BYTES ); +strncpy (msrp->path, path,PATH_BYTES -1 ); msrp->width = width; msrp->type = type; msrp->format = format;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/10 ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 5461e0530c222129dfc941058be114b5cbc00837 ]
The return value checks in snd_pcm_plug_alloc() are covered with snd_BUG_ON() macro that may trigger a kernel WARNING depending on the kconfig. But since the error condition can be triggered by a weird user space parameter passed to OSS layer, we shouldn't give the kernel stack trace just for that. As it's a normal error condition, let's remove snd_BUG_ON() macro usage there.
--- sound/core/oss/pcm_plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/oss/pcm_plugin.c +2 -2
@@ -111,7 +111,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->next) {if (plugin->dst_frames) frames = plugin->dst_frames (plugin, frames); -if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 )) +if ((snd_pcm_sframes_t )frames <=0 )return -ENXIO ; plugin = plugin->next; err =snd_pcm_plugin_alloc (plugin, frames);
@@ -123,7 +123,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->prev) {if (plugin->src_frames) frames = plugin->src_frames (plugin, frames); -if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 )) +if ((snd_pcm_sframes_t )frames <=0 )return -ENXIO ; plugin = plugin->prev; err =snd_pcm_plugin_alloc (plugin, frames);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/10 ALSA: line6: Fix endless MIDI read loop
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit d683469b3c93d7e2afd39e6e1970f24700eb7a68 ]
The MIDI input event parser of the LINE6 driver may enter into an endless loop when the unexpected data sequence is given, as it tries to continue the secondary bytes without termination. Also, when the input data is too short, the parser returns a negative error, while the caller doesn't handle it properly. This would lead to the unexpected behavior as well.
This patch addresses those issues by checking the return value correctly and handling the one-byte event in the parser properly.
The bug was reported by syzkaller.
--- sound/usb/line6/driver.c | 2 +- sound/usb/line6/midibuf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/usb/line6/driver.c +1 -1
@@ -313,7 +313,7 @@ static void line6_data_received(struct urb *urb)line6_midibuf_read (mb, line6->buffer_message,LINE6_MIDI_MESSAGE_MAXLEN ); -if (done ==0 ) +if (done <=0 )break ; line6->message_length = done;
sound/usb/line6/midibuf.c +1 -1
@@ -163,7 +163,7 @@ int line6_midibuf_read(struct midi_buffer *this, unsigned char *data,int midi_length_prev =midibuf_message_length (this->command_prev); -if (midi_length_prev >0 ) { +if (midi_length_prev >1 ) { midi_length = midi_length_prev -1 ; repeat =1 ; }else
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/10 ALSA: pcm: oss: Avoid plugin buffer overflow
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit f2ecf903ef06eb1bbbfa969db9889643d487e73a ]
Each OSS PCM plugins allocate its internal buffer per pre-calculation of the max buffer size through the chain of plugins (calling src_frames and dst_frames callbacks). This works for most plugins, but the rate plugin might behave incorrectly. The calculation in the rate plugin involves with the fractional position, i.e. it may vary depending on the input position. Since the buffer size pre-calculation is always done with the offset zero, it may return a shorter size than it might be; this may result in the out-of-bound access as spotted by fuzzer.
This patch addresses those possible buffer overflow accesses by simply setting the upper limit per the given buffer size for each plugin before src_frames() and after dst_frames() calls.
--- sound/core/oss/pcm_plugin.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/core/oss/pcm_plugin.c +8 -0
@@ -209,6 +209,8 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_pif (stream ==SNDRV_PCM_STREAM_PLAYBACK ) { plugin =snd_pcm_plug_last (plug);while (plugin && drv_frames >0 ) { +if (drv_frames > plugin->buf_frames) + drv_frames = plugin->buf_frames; plugin_prev = plugin->prev;if (plugin->src_frames) drv_frames = plugin->src_frames (plugin, drv_frames);
@@ -220,6 +222,8 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_p plugin_next = plugin->next;if (plugin->dst_frames) drv_frames = plugin->dst_frames (plugin, drv_frames); +if (drv_frames > plugin->buf_frames) + drv_frames = plugin->buf_frames; plugin = plugin_next; } }else
@@ -248,11 +252,15 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pcif (frames <0 )return frames; } +if (frames > plugin->buf_frames) + frames = plugin->buf_frames; plugin = plugin_next; } }else if (stream ==SNDRV_PCM_STREAM_CAPTURE ) { plugin =snd_pcm_plug_last (plug);while (plugin) { +if (frames > plugin->buf_frames) + frames = plugin->buf_frames; plugin_prev = plugin->prev;if (plugin->src_frames) { frames = plugin->src_frames (plugin, frames);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/10 ALSA: hda/realtek: Fix pop noise on ALC225
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 3b36b13d5e69d6f51ff1c55d1b404a74646c9757 ]
Commit 317d9313925c ("ALSA: hda/realtek - Set default power save node to 0") makes the ALC225 have pop noise on S3 resume and cold boot.
So partially revert this commit for ALC225 to fix the regression.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -7265,6 +7265,8 @@ static int patch_alc269(struct hda_codec *codec) spec->gen.mixer_nid =0 ;break ;case 0x10ec0225 : + codec->power_save_node =1 ; +/* fall through */ case 0x10ec0295 : spec->codec_variant =ALC269_TYPE_ALC225 ; spec->gen.mixer_nid =0 ;/* no loopback on ALC225 ALC295 */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/10 initramfs: restore default compression behavior
In reply to Sasha LevinFrom: Eugeniy Paltsev <[email protected]>
[ Upstream commit 785d74ec3bbf26ac7f6e92e6e96a259aec0f107a ]
Even though INITRAMFS_SOURCE kconfig option isn't set in most of defconfigs it is used (set) extensively by various build systems. Commit f26661e12765 ("initramfs: make initramfs compression choice non-optional") has changed default compression mode. Previously we compress initramfs using available compression algorithm. Now we don't use any compression at all by default.
It significantly increases the image size in case of build system chooses embedded initramfs. Initially I faced with this issue while using buildroot.
As of today it's not possible to set preferred compression mode in target defconfig as this option depends on INITRAMFS_SOURCE being set. Modification of all build systems either doesn't look like good option.
Let's instead rewrite initramfs compression mode choices list the way that "INITRAMFS_COMPRESSION_NONE" will be the last option in the list. In that case it will be chosen only if all other options (which implements any compression) are not available.
--- usr/Kconfig | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
usr/Kconfig +11 -11
@@ -131,17 +131,6 @@ choice If in doubt, select 'None' -config INITRAMFS_COMPRESSION_NONE - bool "None" - help - Do not compress the built-in initramfs at all. This may sound wasteful - in space, but, you should be aware that the built-in initramfs will be - compressed at a later stage anyways along with the rest of the kernel, - on those architectures that support this. However, not compressing the - initramfs may lead to slightly higher memory consumption during a - short time at boot, while both the cpio image and the unpacked - filesystem image will be present in memory simultaneously - config INITRAMFS_COMPRESSION_GZIP bool "Gzip" depends on RD_GZIP
@@ -214,6 +203,17 @@ config INITRAMFS_COMPRESSION_LZ4 If you choose this, keep in mind that most distros don't provide lz4 by default which could cause a build failure. +config INITRAMFS_COMPRESSION_NONE + bool "None" + help + Do not compress the built-in initramfs at all. This may sound wasteful + in space, but, you should be aware that the built-in initramfs will be + compressed at a later stage anyways along with the rest of the kernel, + on those architectures that support this. However, not compressing the + initramfs may lead to slightly higher memory consumption during a + short time at boot, while both the cpio image and the unpacked + filesystem image will be present in memory simultaneously + endchoice config INITRAMFS_COMPRESSION
Signature · 1 line
2.20.1