iio: adc: xilinx: fix potential use-after-free on remove
Subsystems (11)
Sasha Levin
maintainerPATCH 1/14 iio: adc: xilinx: fix potential use-after-free on remove
From: Sven Van Asbroeck <[email protected]>
[ Upstream commit 62039b6aef63380ba7a37c113bbaeee8a55c5342 ]
When cancel_delayed_work() returns, the delayed work may still be running. This means that the core could potentially free the private structure (struct xadc) while the delayed work is still using it. This is a potential use-after-free.
Fix by calling cancel_delayed_work_sync(), which waits for any residual work to finish before returning.
--- drivers/iio/adc/xilinx-xadc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/xilinx-xadc-core.c +1 -1
@@ -1299,7 +1299,7 @@ static int xadc_remove(struct platform_device *pdev) }free_irq (irq, indio_dev);clk_disable_unprepare (xadc->clk); -cancel_delayed_work (&xadc->zynq_unmask_work); +cancel_delayed_work_sync (&xadc->zynq_unmask_work);kfree (xadc->data);kfree (indio_dev->channels);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/14 HID: input: add mapping for Expose/Overview key
From: Dmitry Torokhov <[email protected]>
[ Upstream commit 96dd86871e1fffbc39e4fa61c9c75ec54ee9af0f ]
According to HUTRR77 usage 0x29f from the consumer page is reserved for the Desktop application to present all running user’s application windows. Linux defines KEY_SCALE to request Compiz Scale (Expose) mode, so let's add the mapping.
--- drivers/hid/hid-input.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hid/hid-input.c +2 -0
@@ -913,6 +913,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fielcase 0x2cb :map_key_clear (KEY_KBDINPUTASSIST_ACCEPT );break ;case 0x2cc :map_key_clear (KEY_KBDINPUTASSIST_CANCEL );break ; +case 0x29f :map_key_clear (KEY_SCALE );break ; +default :map_key_clear (KEY_UNKNOWN ); }break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/14 HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys
In reply to Sasha LevinFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 7975a1d6a7afeb3eb61c971a153d24dd8fa032f3 ]
According to HUTRR73 usages 0x79, 0x7a and 0x7c from the consumer page correspond to Brightness Up/Down/Toggle keys, so let's add the mappings.
--- drivers/hid/hid-input.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/hid/hid-input.c +4 -0
@@ -783,6 +783,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fielcase 0x074 :map_key_clear (KEY_BRIGHTNESS_MAX );break ;case 0x075 :map_key_clear (KEY_BRIGHTNESS_AUTO );break ; +case 0x079 :map_key_clear (KEY_KBDILLUMUP );break ; +case 0x07a :map_key_clear (KEY_KBDILLUMDOWN );break ; +case 0x07c :map_key_clear (KEY_KBDILLUMTOGGLE );break ; +case 0x082 :map_key_clear (KEY_VIDEO_NEXT );break ;case 0x083 :map_key_clear (KEY_LAST );break ;case 0x084 :map_key_clear (KEY_ENTER );break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/14 libnvdimm/btt: Fix a kmemdup failure check
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 486fa92df4707b5df58d6508728bdb9321a59766 ]
In case kmemdup fails, the fix releases resources and returns to avoid the NULL pointer dereference.
--- drivers/nvdimm/btt_devs.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/nvdimm/btt_devs.c +13 -5
@@ -170,14 +170,15 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,return NULL ; nd_btt->id =ida_simple_get (&nd_region->btt_ida,0 ,0 ,GFP_KERNEL ); -if (nd_btt->id <0 ) { -kfree (nd_btt); -return NULL ; - } +if (nd_btt->id <0 ) + goto out_nd_btt; nd_btt->lbasize = lbasize; -if (uuid) +if (uuid) { uuid =kmemdup (uuid,16 ,GFP_KERNEL ); +if (!uuid) + goto out_put_id; + } nd_btt->uuid = uuid; dev = &nd_btt->dev;dev_set_name (dev,"btt%d.%d" , nd_region->id, nd_btt->id);
@@ -192,6 +193,13 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,return NULL ; }return dev; + +out_put_id: +ida_simple_remove (&nd_region->btt_ida, nd_btt->id); + +out_nd_btt: +kfree (nd_btt); +return NULL ; }struct device *nd_btt_create (struct nd_region *nd_region)
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Sasha Levin
maintainerPATCH 5/14 s390/dasd: Fix capacity calculation for large volumes
In reply to Sasha LevinFrom: Peter Oberparleiter <[email protected]>
[ Upstream commit 2cc9637ce825f3a9f51f8f78af7474e9e85bfa5f ]
The DASD driver incorrectly limits the maximum number of blocks of ECKD DASD volumes to 32 bit numbers. Volumes with a capacity greater than 2^32-1 blocks are incorrectly recognized as smaller volumes.
This results in the following volume capacity limits depending on the formatted block size:
BLKSIZE MAX_GB MAX_CYL
512 2047 5843492
1024 4095 8676701
2048 8191 13634816
4096 16383 23860929The same problem occurs when a volume with more than 17895697 cylinders is accessed in raw-track-access mode.
Fix this problem by adding an explicit type cast when calculating the maximum number of blocks.
--- drivers/s390/block/dasd_eckd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/s390/block/dasd_eckd.c +3 -3
@@ -2066,14 +2066,14 @@ static int dasd_eckd_end_analysis(struct dasd_block *block) blk_per_trk =recs_per_track (&private->rdc_data,0 , block->bp_block); raw: - block->blocks = (private->real_cyl * + block->blocks = ((unsigned long ) private->real_cyl * private->rdc_data.trk_per_cyl * blk_per_trk); dev_info(&device->cdev->dev, - "DASD with %d KB/block, %d KB total size, %d KB/track, " + "DASD with %u KB/block, %lu KB total size, %u KB/track, " "%s\n", (block->bp_block >> 10), - ((private->real_cyl * + (((unsigned long) private->real_cyl * private->rdc_data.trk_per_cyl * blk_per_trk * (block->bp_block >> 9)) >> 1), ((blk_per_trk * block->bp_block) >> 10),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/14 Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
In reply to Sasha LevinFrom: Anson Huang <[email protected]>
[ Upstream commit bf2a7ca39fd3ab47ef71c621a7ee69d1813b1f97 ]
SNVS IRQ is requested before necessary driver data initialized, if there is a pending IRQ during driver probe phase, kernel NULL pointer panic will occur in IRQ handler. To avoid such scenario, just initialize necessary driver data before enabling IRQ. This patch is inspired by NXP's internal kernel tree.
--- drivers/input/keyboard/snvs_pwrkey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/input/keyboard/snvs_pwrkey.c +3 -3
@@ -156,6 +156,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)return error; } + pdata->input = input; +platform_set_drvdata (pdev, pdata); + error =devm_request_irq (&pdev->dev, pdata->irq, imx_snvs_pwrkey_interrupt,0 , pdev->name, pdev);
@@ -172,9 +175,6 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)return error; } - pdata->input = input; -platform_set_drvdata (pdev, pdata); -device_init_wakeup (&pdev->dev, pdata->wakeup);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/14 s390/3270: fix lockdep false positive on view->lock
In reply to Sasha LevinFrom: Martin Schwidefsky <[email protected]>
[ Upstream commit 5712f3301a12c0c3de9cc423484496b0464f2faf ]
The spinlock in the raw3270_view structure is used by con3270, tty3270 and fs3270 in different ways. For con3270 the lock can be acquired in irq context, for tty3270 and fs3270 the highest context is bh.
Lockdep sees the view->lock as a single class and if the 3270 driver is used for the console the following message is generated:
WARNING: inconsistent lock state
5.1.0-rc3-05157-g5c168033979d #12 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
swapper/0/1 [HC0[0]:SC1[1]:HE1:SE0] takes:
(____ptrval____) (&(&view->lock)->rlock){?.-.}, at: tty3270_update+0x7c/0x330
Introduce a lockdep subclass for the view lock to distinguish bh from irq locks.
--- drivers/s390/char/con3270.c | 2 +- drivers/s390/char/fs3270.c | 3 ++- drivers/s390/char/raw3270.c | 3 ++- drivers/s390/char/raw3270.h | 4 +++- drivers/s390/char/tty3270.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-)
drivers/s390/char/con3270.c +1 -1
@@ -627,7 +627,7 @@ con3270_init(void) (void (*)(unsigned long )) con3270_read_tasklet, (unsigned long) condev->read); -raw3270_add_view (&condev->view, &con3270_fn,1 ); +raw3270_add_view (&condev->view, &con3270_fn,1 ,RAW3270_VIEW_LOCK_IRQ );INIT_LIST_HEAD (&condev->freemem);for (i =0 ; i <CON3270_STRING_PAGES ; i++) {
drivers/s390/char/fs3270.c +2 -1
@@ -463,7 +463,8 @@ fs3270_open(struct inode *inode, struct file *filp)init_waitqueue_head (&fp->wait); fp->fs_pid =get_pid (task_pid (current)); - rc =raw3270_add_view (&fp->view, &fs3270_fn, minor); + rc =raw3270_add_view (&fp->view, &fs3270_fn, minor, +RAW3270_VIEW_LOCK_BH );if (rc) {fs3270_free_view (&fp->view); goto out;
drivers/s390/char/raw3270.c +2 -1
@@ -956,7 +956,7 @@ raw3270_deactivate_view(struct raw3270_view *view)* Add view to device with minor "minor". */ int -raw3270_add_view (struct raw3270_view *view,struct raw3270_fn *fn,int minor) +raw3270_add_view (struct raw3270_view *view,struct raw3270_fn *fn,int minor,int subclass) {unsigned long flags;struct raw3270 *rp;
@@ -978,6 +978,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor) view->cols = rp->cols; view->ascebc = rp->ascebc;spin_lock_init (&view->lock); +lockdep_set_subclass (&view->lock, subclass);list_add (&view->list, &rp->view_list); rc =0 ;spin_unlock_irqrestore (get_ccwdev_lock (rp->cdev), flags);
drivers/s390/char/raw3270.h +3 -1
@@ -155,6 +155,8 @@ struct raw3270_fn {struct raw3270_view {struct list_head list;spinlock_t lock; +#define RAW3270_VIEW_LOCK_IRQ 0 +#define RAW3270_VIEW_LOCK_BH 1atomic_t ref_count;struct raw3270 *dev;struct raw3270_fn *fn;
@@ -163,7 +165,7 @@ struct raw3270_view {unsigned char *ascebc;/* ascii -> ebcdic table */ }; -int raw3270_add_view (struct raw3270_view *,struct raw3270_fn *,int ); +int raw3270_add_view (struct raw3270_view *,struct raw3270_fn *,int ,int );int raw3270_activate_view (struct raw3270_view *);void raw3270_del_view (struct raw3270_view *);void raw3270_deactivate_view (struct raw3270_view *);
drivers/s390/char/tty3270.c +2 -1
@@ -937,7 +937,8 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)return PTR_ERR (tp); rc =raw3270_add_view (&tp->view, &tty3270_fn, - tty->index +RAW3270_FIRSTMINOR ); + tty->index +RAW3270_FIRSTMINOR , +RAW3270_VIEW_LOCK_BH );if (rc) {tty3270_free_view (tp);return rc;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/14 KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing
In reply to Sasha LevinFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit 7a223e06b1a411cef6c4cd7a9b9a33c8d225b10e ]
In __apic_accept_irq() interface trig_mode is int and actually on some code paths it is set above u8:
kvm_apic_set_irq() extracts it from 'struct kvm_lapic_irq' where trig_mode is u16. This is done on purpose as e.g. kvm_set_msi_irq() sets it to (1 << 15) & e->msi.data
kvm_apic_local_deliver sets it to reg & (1 << 15).
Fix the immediate issue by making 'tm' into u16. We may also want to adjust __apic_accept_irq() interface and use proper sizes for vector, level, trig_mode but this is not urgent.
--- arch/x86/kvm/trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/trace.h +2 -2
@@ -434,13 +434,13 @@ TRACE_EVENT(kvm_apic_ipi, ); TRACE_EVENT(kvm_apic_accept_irq, - TP_PROTO(__u32 apicid, __u16 dm, __u8 tm, __u8 vec), + TP_PROTO(__u32 apicid, __u16 dm, __u16 tm, __u8 vec), TP_ARGS(apicid, dm, tm, vec), TP_STRUCT__entry( __field( __u32, apicid ) __field( __u16, dm ) - __field( __u8, tm ) + __field( __u16, tm ) __field( __u8, vec ) ),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/14 tools lib traceevent: Fix missing equality check for strcmp
In reply to Sasha LevinFrom: Rikard Falkeborn <[email protected]>
[ Upstream commit f32c2877bcb068a718bb70094cd59ccc29d4d082 ]
There was a missing comparison with 0 when checking if type is "s64" or "u64". Therefore, the body of the if-statement was entered if "type" was "u64" or not "s64", which made the first strcmp() redundant since if type is "u64", it's not "s64".
If type is "s64", the body of the if-statement is not entered but since the remainder of the function consists of if-statements which will not be entered if type is "s64", we will just return "val", which is correct, albeit at the cost of a few more calls to strcmp(), i.e., it will behave just as if the if-statement was entered.
If type is neither "s64" or "u64", the body of the if-statement will be entered incorrectly and "val" returned. This means that any type that is checked after "s64" and "u64" is handled the same way as "s64" and "u64", i.e., the limiting of "val" to fit in for example "s8" is never reached.
This was introduced in the kernel tree when the sources were copied from trace-cmd in commit f7d82350e597 ("tools/events: Add files to create libtraceevent.a"), and in the trace-cmd repo in 1cdbae6035cei ("Implement typecasting in parser") when the function was introduced, i.e., it has always behaved the wrong way.
Detected by cppcheck.
--- tools/lib/traceevent/event-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/traceevent/event-parse.c +1 -1
@@ -2201,7 +2201,7 @@ eval_type_str(unsigned long long val, const char *type, int pointer)return val &0xffffffff ;if (strcmp (type,"u64" ) ==0 || -strcmp (type,"s64" )) +strcmp (type,"s64" ) ==0 )return val;if (strcmp (type,"s8" ) ==0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/14 init: initialize jump labels before command line option parsing
In reply to Sasha LevinFrom: Dan Williams <[email protected]>
[ Upstream commit 6041186a32585fc7a1d0f6cfe2f138b05fdc3c82 ]
When a module option, or core kernel argument, toggles a static-key it requires jump labels to be initialized early. While x86, PowerPC, and ARM64 arrange for jump_label_init() to be called before parse_args(), ARM does not.
Kernel command line: rdinit=/sbin/init page_alloc.shuffle=1 panic=-1 console=ttyAMA0,115200 page_alloc.shuffle=1
------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at ./include/linux/jump_label.h:303 page_alloc_shuffle+0x12c/0x1ac static_key_enable(): static key 'page_alloc_shuffle_key+0x0/0x4' used before call to jump_label_init() Modules linked in: CPU: 0 PID: 0 Comm: swapper Not tainted 5.1.0-rc4-next-20190410-00003-g3367c36ce744 #1 Hardware name: ARM Integrator/CP (Device Tree) [<c0011c68>] (unwind_backtrace) from [<c000ec48>] (show_stack+0x10/0x18) [<c000ec48>] (show_stack) from [<c07e9710>] (dump_stack+0x18/0x24) [<c07e9710>] (dump_stack) from [<c001bb1c>] (__warn+0xe0/0x108) [<c001bb1c>] (__warn) from [<c001bb88>] (warn_slowpath_fmt+0x44/0x6c) [<c001bb88>] (warn_slowpath_fmt) from [<c0b0c4a8>] (page_alloc_shuffle+0x12c/0x1ac) [<c0b0c4a8>] (page_alloc_shuffle) from [<c0b0c550>] (shuffle_store+0x28/0x48) [<c0b0c550>] (shuffle_store) from [<c003e6a0>] (parse_args+0x1f4/0x350) [<c003e6a0>] (parse_args) from [<c0ac3c00>] (start_kernel+0x1c0/0x488)
Move the fallback call to jump_label_init() to occur before parse_args().
The redundant calls to jump_label_init() in other archs are left intact in case they have static key toggling use cases that are even earlier than option parsing.
--- init/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
init/main.c +2 -2
@@ -538,6 +538,8 @@ asmlinkage __visible void __init start_kernel(void)page_alloc_init ();pr_notice ("Kernel command line: %s\n" , boot_command_line); +/* parameters may set static keys */ +jump_label_init ();parse_early_param (); after_dashes = parse_args("Booting kernel", static_command_line, __start___param,
@@ -547,8 +549,6 @@ asmlinkage __visible void __init start_kernel(void)parse_args ("Setting init args" , after_dashes,NULL ,0 ,-1 ,-1 ,NULL , set_init_arg); -jump_label_init (); -/* * These use large bootmem allocations and must precede * kmem_cache_init()
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/14 ipvs: do not schedule icmp errors from tunnels
In reply to Sasha LevinFrom: Julian Anastasov <[email protected]>
[ Upstream commit 0261ea1bd1eb0da5c0792a9119b8655cf33c80a3 ]
We can receive ICMP errors from client or from
tunneling real server. While the former can be
scheduled to real server, the latter should
not be scheduled, they are decapsulated only when
existing connection is found.
--- net/netfilter/ipvs/ip_vs_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipvs/ip_vs_core.c +1 -1
@@ -1484,7 +1484,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (!cp) {int v; -if (!sysctl_schedule_icmp (ipvs)) +if (ipip || !sysctl_schedule_icmp (ipvs))return NF_ACCEPT ;if (!ip_vs_try_to_schedule (ipvs,AF_INET , skb, pd, &v, &cp, &ciph))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/14 s390: ctcm: fix ctcm_new_device error return code
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 27b141fc234a3670d21bd742c35d7205d03cbb3a ]
clang points out that the return code from this function is undefined for one of the error paths:
../drivers/s390/net/ctcm_main.c:1595:7: warning: variable 'result' is used uninitialized whenever 'if' condition is true
[-Wsometimes-uninitialized]
if (priv->channel[direction] == NULL) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/s390/net/ctcm_main.c:1638:9: note: uninitialized use occurs here
return result;
^~~~~~
../drivers/s390/net/ctcm_main.c:1595:3: note: remove the 'if' if its condition is always false
if (priv->channel[direction] == NULL) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/s390/net/ctcm_main.c:1539:12: note: initialize the variable 'result' to silence this warning
int result;
^Make it return -ENODEV here, as in the related failure cases. gcc has a known bug in underreporting some of these warnings when it has already eliminated the assignment of the return code based on some earlier optimization step.
--- drivers/s390/net/ctcm_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/net/ctcm_main.c +1 -0
@@ -1595,6 +1595,7 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)if (priv->channel[direction] ==NULL ) {if (direction ==CTCM_WRITE )channel_free (priv->channel[CTCM_READ ]); + result = -ENODEV ; goto out_dev; } priv->channel[direction]->netdev = dev;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/14 selftests/net: correct the return value for run_netsocktests
In reply to Sasha LevinFrom: Po-Hsu Lin <[email protected]>
[ Upstream commit 30c04d796b693e22405c38e9b78e9a364e4c77e6 ]
The run_netsocktests will be marked as passed regardless the actual test result from the ./socket:
selftests: net: run_netsocktests
========================================
--------------------
running socket test
--------------------
[FAIL]
ok 1..6 selftests: net: run_netsocktests [PASS]This is because the test script itself has been successfully executed. Fix this by exit 1 when the test failed.
--- tools/testing/selftests/net/run_netsocktests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/run_netsocktests +1 -1
@@ -6,7 +6,7 @@ echo "--------------------" ./socket if [ $? -ne 0 ]; then echo "[FAIL]" + exit 1 else echo "[PASS]" fi -
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/14 gpu: ipu-v3: dp: fix CSC handling
In reply to Sasha LevinFrom: Lucas Stach <[email protected]>
[ Upstream commit d4fad0a426c6e26f48c9a7cdd21a7fe9c198d645 ]
Initialize the flow input colorspaces to unknown and reset to that value when the channel gets disabled. This avoids the state getting mixed up with a previous mode.
Also keep the CSC settings for the background flow intact when disabling the foreground flow.
--- drivers/gpu/ipu-v3/ipu-dp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/ipu-v3/ipu-dp.c +9 -3
@@ -195,7 +195,8 @@ int ipu_dp_setup_channel(struct ipu_dp *dp,ipu_dp_csc_init (flow, flow->foreground.in_cs, flow->out_cs,DP_COM_CONF_CSC_DEF_BOTH ); }else { -if (flow->foreground.in_cs == flow->out_cs) +if (flow->foreground.in_cs ==IPUV3_COLORSPACE_UNKNOWN || + flow->foreground.in_cs == flow->out_cs)/* * foreground identical to output, apply color * conversion on background
@@ -261,6 +262,8 @@ void ipu_dp_disable_channel(struct ipu_dp *dp)struct ipu_dp_priv *priv = flow->priv;u32 reg, csc; + dp->in_cs =IPUV3_COLORSPACE_UNKNOWN ; +if (!dp->foreground)return ;
@@ -268,8 +271,9 @@ void ipu_dp_disable_channel(struct ipu_dp *dp) reg =readl (flow->base +DP_COM_CONF ); csc = reg &DP_COM_CONF_CSC_DEF_MASK ; -if (csc ==DP_COM_CONF_CSC_DEF_FG ) - reg &= ~DP_COM_CONF_CSC_DEF_MASK ; + reg &= ~DP_COM_CONF_CSC_DEF_MASK ; +if (csc ==DP_COM_CONF_CSC_DEF_BOTH || csc ==DP_COM_CONF_CSC_DEF_BG ) + reg |=DP_COM_CONF_CSC_DEF_BG ; reg &= ~DP_COM_CONF_FG_EN ;writel (reg, flow->base +DP_COM_CONF );
@@ -350,6 +354,8 @@ int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, unsigned long base)mutex_init (&priv->mutex);for (i =0 ; i <IPUV3_NUM_FLOWS ; i++) { + priv->flow[i].background.in_cs =IPUV3_COLORSPACE_UNKNOWN ; + priv->flow[i].foreground.in_cs =IPUV3_COLORSPACE_UNKNOWN ; priv->flow[i].foreground.foreground = true; priv->flow[i].base = priv->base + ipu_dp_flow_base[i]; priv->flow[i].priv = priv;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel