hevc_d: Pick the fixes from the latest upstreaming reviews

Does NOT include the clock and IRQ changes.

Signed-off-by: John Cox <jc@kynesim.co.uk>

Author: jc-kynesim

drivers/media/platform/raspberrypi/hevc_dec/hevc_d.c

@@ -11,9 +11,9 @@
  * Copyright (C) 2018 Bootlin
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/of.h>
 
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
@@ -208,15 +208,15 @@ static int hevc_d_probe(struct platform_device *pdev)
 
 	ret = hevc_d_hw_probe(dev);
 	if (ret) {
-		dev_err(&pdev->dev, "Failed to probe hardware - %d\n", ret);
+		dev_err_probe(&pdev->dev, ret, "Failed to probe hardware\n");
 		return ret;
 	}
 
 	mutex_init(&dev->dev_mutex);
 
 	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
 	if (ret) {
-		dev_err(&pdev->dev, "Failed to register V4L2 device\n");
+		dev_err_probe(&pdev->dev, ret, "Failed to register V4L2 device\n");
 		return ret;
 	}
 
@@ -318,7 +318,7 @@ static struct platform_driver hevc_d_driver = {
 	.remove		= hevc_d_remove,
 	.driver		= {
 		.name = HEVC_D_NAME,
-		.of_match_table	= of_match_ptr(hevc_d_dt_match),
+		.of_match_table	= hevc_d_dt_match,
 	},
 };
 module_platform_driver(hevc_d_driver);

drivers/media/platform/raspberrypi/hevc_dec/hevc_d.h

@@ -134,12 +134,17 @@ struct hevc_d_ctx {
 	struct hevc_d_hwbuf pu_bufs[HEVC_D_P2BUF_COUNT];
 	struct hevc_d_hwbuf coeff_bufs[HEVC_D_P2BUF_COUNT];
 
-	/* Spinlock protecting aux_free */
-	spinlock_t aux_lock;
+	/* Aux structures only used in setup so no locking needed */
 	struct hevc_d_q_aux *aux_free;
-
 	struct hevc_d_q_aux *aux_ents[HEVC_D_AUX_ENT_COUNT];
 
+	struct hevc_d_slot {
+		u32 refybase;
+		u32 refcbase;
+		u32 colbase;
+		u32 poc;
+	} slots[HEVC_D_AUX_ENT_COUNT];
+
 	unsigned int colmv_stride;
 	unsigned int colmv_picsize;
 };