Hyperion Entertainment Message Boards

Code: Select all

diff -rupN a b > pas_pci_init_v5.patch

Code: Select all

diff -rupN a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
--- a/arch/powerpc/platforms/pasemi/pci.c       2023-09-04 08:16:52.967825331 +0200
+++ b/arch/powerpc/platforms/pasemi/pci.c       2023-09-04 08:15:13.793207943 +0200
@@ -25,6 +25,8 @@

 #define PA_PXP_CFA(bus, devfn, off) (((bus) << 20) | ((devfn) << 12) | (off))

+extern void nemo_init_IRQ(void);
+
 static inline int pa_pxp_offset_valid(u8 bus, u8 devfn, int offset)
 {
        /* Device 0 Function 0 is special: It's config space spans function 1 as
@@ -265,6 +267,11 @@ static int __init pas_add_bridge(struct
         */
        isa_bridge_find_early(hose);

+       /*
+        * ISA brigde is now active, add the i8259 cascade (if needed)
+        */
+       nemo_init_IRQ();
+
        return 0;
 }

diff -rupN a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
--- a/arch/powerpc/platforms/pasemi/setup.c     2023-09-04 08:16:52.967825331 +0200
+++ b/arch/powerpc/platforms/pasemi/setup.c     2023-09-04 08:15:13.798207873 +0200
@@ -214,10 +214,12 @@ static void sb600_8259_cascade(struct ir
        chip->irq_eoi(&desc->irq_data);
 }

-static void __init nemo_init_IRQ(struct mpic *mpic)
+void nemo_init_IRQ(void)
 {
        struct device_node *np;
        int gpio_virq;
+       struct mpic *mpic;
+
        /* Connect the SB600's legacy i8259 controller */
        np = of_find_node_by_path("/pxp@0,e0000000");
        i8259_init(np, 0);
@@ -228,6 +230,7 @@ static void __init nemo_init_IRQ(struct
        irq_set_chained_handler(gpio_virq, sb600_8259_cascade);
        mpic_unmask_irq(irq_get_irq_data(gpio_virq));

+       mpic = irq_get_chip_data(gpio_virq);
        irq_set_default_host(mpic->irqhost);
 }

@@ -298,8 +301,6 @@ static __init void pas_init_IRQ(void)
                mpic_unmask_irq(irq_get_irq_data(nmi_virq));
        }

-       nemo_init_IRQ(mpic);
-
        of_node_put(mpic_node);
        of_node_put(root);
 }

Code: Select all

drivers/media/pci/bt8xx/bttv-risc.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c
index 436baf6c8b08..241a696e374a 100644
--- a/drivers/media/pci/bt8xx/bttv-risc.c
+++ b/drivers/media/pci/bt8xx/bttv-risc.c
@@ -68,9 +68,7 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
   sg = sglist;
   for (line = 0; line < store_lines; line++) {
       if ((line >= (store_lines - VCR_HACK_LINES)) &&
-            (btv->opt_vcr_hack ||
-            (V4L2_FIELD_HAS_BOTH(btv->field) ||
-             btv->field == V4L2_FIELD_ALTERNATE)))
+            btv->opt_vcr_hack)
           continue;
       while (offset && offset >= sg_dma_len(sg)) {
           offset -= sg_dma_len(sg);