Commit 8fdb1967 authored by Dave Airlie's avatar Dave Airlie

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YiCTGZ8IVCw0ilKK@linux-uq9g
parents c9585249 62929726
...@@ -6,6 +6,7 @@ config DRM_HDLCD ...@@ -6,6 +6,7 @@ config DRM_HDLCD
depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST) depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)
depends on COMMON_CLK depends on COMMON_CLK
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_GEM_CMA_HELPER
help help
Choose this option if you have an ARM High Definition Colour LCD Choose this option if you have an ARM High Definition Colour LCD
controller. controller.
......
...@@ -1802,6 +1802,7 @@ static inline void ti_sn_gpio_unregister(void) {} ...@@ -1802,6 +1802,7 @@ static inline void ti_sn_gpio_unregister(void) {}
static void ti_sn65dsi86_runtime_disable(void *data) static void ti_sn65dsi86_runtime_disable(void *data)
{ {
pm_runtime_dont_use_autosuspend(data);
pm_runtime_disable(data); pm_runtime_disable(data);
} }
...@@ -1861,11 +1862,11 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, ...@@ -1861,11 +1862,11 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,
"failed to get reference clock\n"); "failed to get reference clock\n");
pm_runtime_enable(dev); pm_runtime_enable(dev);
pm_runtime_set_autosuspend_delay(pdata->dev, 500);
pm_runtime_use_autosuspend(pdata->dev);
ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev); ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);
if (ret) if (ret)
return ret; return ret;
pm_runtime_set_autosuspend_delay(pdata->dev, 500);
pm_runtime_use_autosuspend(pdata->dev);
ti_sn65dsi86_debugfs_init(pdata); ti_sn65dsi86_debugfs_init(pdata);
......
...@@ -2330,6 +2330,9 @@ EXPORT_SYMBOL(drm_connector_atomic_hdr_metadata_equal); ...@@ -2330,6 +2330,9 @@ EXPORT_SYMBOL(drm_connector_atomic_hdr_metadata_equal);
void drm_connector_set_vrr_capable_property( void drm_connector_set_vrr_capable_property(
struct drm_connector *connector, bool capable) struct drm_connector *connector, bool capable)
{ {
if (!connector->vrr_capable_property)
return;
drm_object_property_set_value(&connector->base, drm_object_property_set_value(&connector->base,
connector->vrr_capable_property, connector->vrr_capable_property,
capable); capable);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment