hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/platform/exynos4-is/fimc-isp.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Samsung EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver
34 *
....@@ -5,10 +6,6 @@
56 *
67 * Authors: Sylwester Nawrocki <s.nawrocki@samsung.com>
78 * Younghwan Joo <yhwan.joo@samsung.com>
8
- *
9
- * This program is free software; you can redistribute it and/or modify
10
- * it under the terms of the GNU General Public License version 2 as
11
- * published by the Free Software Foundation.
129 */
1310 #define pr_fmt(fmt) "%s:%d " fmt, __func__, __LINE__
1411
....@@ -36,21 +33,18 @@
3633
3734 static const struct fimc_fmt fimc_isp_formats[FIMC_ISP_NUM_FORMATS] = {
3835 {
39
- .name = "RAW8 (GRBG)",
4036 .fourcc = V4L2_PIX_FMT_SGRBG8,
4137 .depth = { 8 },
4238 .color = FIMC_FMT_RAW8,
4339 .memplanes = 1,
4440 .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8,
4541 }, {
46
- .name = "RAW10 (GRBG)",
4742 .fourcc = V4L2_PIX_FMT_SGRBG10,
4843 .depth = { 10 },
4944 .color = FIMC_FMT_RAW10,
5045 .memplanes = 1,
5146 .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10,
5247 }, {
53
- .name = "RAW12 (GRBG)",
5448 .fourcc = V4L2_PIX_FMT_SGRBG12,
5549 .depth = { 12 },
5650 .color = FIMC_FMT_RAW12,
....@@ -310,11 +304,10 @@
310304 pr_debug("on: %d\n", on);
311305
312306 if (on) {
313
- ret = pm_runtime_get_sync(&is->pdev->dev);
314
- if (ret < 0) {
315
- pm_runtime_put(&is->pdev->dev);
307
+ ret = pm_runtime_resume_and_get(&is->pdev->dev);
308
+ if (ret < 0)
316309 return ret;
317
- }
310
+
318311 set_bit(IS_ST_PWR_ON, &is->state);
319312
320313 ret = fimc_is_start_firmware(is);