diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-06-08 19:11:27 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-06-08 19:11:27 +0200 |
| commit | 6e2b347d42e54282e4c6cfa08272db462b178f7f (patch) | |
| tree | 7686345b2e24c406a57feffcad558484f9552366 /drivers/gpu/drm/virtio/virtgpu_display.c | |
| parent | e54a4424925a27ed94dff046db3ce5caf4b1e748 (diff) | |
| parent | f2906aa863381afb0015a9eb7fefad885d4e5a56 (diff) | |
Merge v5.19-rc1 into drm-misc-fixes
Let's kick-off the start of the 5.19 fix cycle
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_display.c')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index 5b00310ac4cd..f73352e7b832 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -179,6 +179,8 @@ static int virtio_gpu_conn_get_modes(struct drm_connector *connector) DRM_DEBUG("add mode: %dx%d\n", width, height); mode = drm_cvt_mode(connector->dev, width, height, 60, false, false, false); + if (!mode) + return count; mode->type |= DRM_MODE_TYPE_PREFERRED; drm_mode_probed_add(connector, mode); count++; |