Skip to content

Commit 8fdb196

Browse files
committed
Merge tag 'drm-misc-fixes-2022-03-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
* drm/arm: Select DRM_GEM_CMEA_HELPER for HDLCD * drm/bridge: ti-sn65dsi86: Properly undo autosuspend * drm/vrr: Fix potential NULL-pointer deref Signed-off-by: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/YiCTGZ8IVCw0ilKK@linux-uq9g
2 parents c958524 + 6292972 commit 8fdb196

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

drivers/gpu/drm/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ config DRM_HDLCD
66
depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)
77
depends on COMMON_CLK
88
select DRM_KMS_HELPER
9+
select DRM_GEM_CMA_HELPER
910
help
1011
Choose this option if you have an ARM High Definition Colour LCD
1112
controller.

drivers/gpu/drm/bridge/ti-sn65dsi86.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,6 +1802,7 @@ static inline void ti_sn_gpio_unregister(void) {}
18021802

18031803
static void ti_sn65dsi86_runtime_disable(void *data)
18041804
{
1805+
pm_runtime_dont_use_autosuspend(data);
18051806
pm_runtime_disable(data);
18061807
}
18071808

@@ -1861,11 +1862,11 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,
18611862
"failed to get reference clock\n");
18621863

18631864
pm_runtime_enable(dev);
1865+
pm_runtime_set_autosuspend_delay(pdata->dev, 500);
1866+
pm_runtime_use_autosuspend(pdata->dev);
18641867
ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);
18651868
if (ret)
18661869
return ret;
1867-
pm_runtime_set_autosuspend_delay(pdata->dev, 500);
1868-
pm_runtime_use_autosuspend(pdata->dev);
18691870

18701871
ti_sn65dsi86_debugfs_init(pdata);
18711872

drivers/gpu/drm/drm_connector.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,6 +2330,9 @@ EXPORT_SYMBOL(drm_connector_atomic_hdr_metadata_equal);
23302330
void drm_connector_set_vrr_capable_property(
23312331
struct drm_connector *connector, bool capable)
23322332
{
2333+
if (!connector->vrr_capable_property)
2334+
return;
2335+
23332336
drm_object_property_set_value(&connector->base,
23342337
connector->vrr_capable_property,
23352338
capable);

0 commit comments

Comments
 (0)