diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-11-27 09:23:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-11-27 09:36:33 +1000 |
| commit | 22f8c80566c4a29a0d8b5ebf24aa1fd1679b39e5 (patch) | |
| tree | d3d47389e5c9a798f346f9a410d0968372ec941d /drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | |
| parent | 31b05212360cbf3af3c2e1b7f42e176e0eebedb5 (diff) | |
| parent | fa388231fec99b60346319d56495ae531b666275 (diff) | |
Merge tag 'drm-misc-next-2020-11-18' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-next
drm-misc-next for 5.11:
UAPI Changes:
* media: Add MEDIA_BUS_FMT_RGB888_3X8_DELTA format
Cross-subsystem Changes:
* console: Remove unused functions; Store characters-per-font in font-
descriptor structure instead of hard-coding
* DT: Add vendor prefix for ShenZhen Asia Better Technology Ltd. (ABT)
Core Changes:
* Fix build warnings
* Update debug logging to new interfaces, plus fixes
* Add error messages for ioctls;
* Fix kernel docs
* doc: Fix kernel docs
* fbcon: Remove accelerated scrolling
* selftests: Fix build warnings
* ttm: Fix missing NULL check in new page pool; Fix build warnings
* video: Fix kernel docs
Driver Changes:
* armada: Fix build warnings
* atmel-hlcdc: Fix build warnings
* exynos: Fix build warnings
* gma500: Remove 2d framebuffer acceleration
* lima: Fix build warnings; Cleanups
* mediatek: Fix build warnings
* meson: Module removal fixes; Fix build warnings
* nouveau: Fix build warnings
* omap: Fix return values
* panel: Fix build warnings; Add support and DT bindings for OnePlus 6/T; Add
support and DT bindings for ABT Y030XX067A
* panel/s6e63m0: Add/improve SPi reading/writing; Support 3WIRE protocol; Set
connector display info; Add more comments
* panfrost: Move GPU reset into separate worker, avoid race conditions
* pl111: Fix build warnings
* qxl: Cleanup fbcon acceleration
* rockchip: Fix build warnings
* savage: Fix build warnings
* sti: Fix build warnings
* udl: Fix missing error code in udl_handle_damage()
* v3d: Fix build warnings
* vc4: Fix build warnings
* via: Fix build warnings
* virtio: Make dma-buf ops static
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201118123221.GA19755@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/panel/panel-samsung-s6e63m0.c')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c b/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c index 3eee67e2d86a..210e70da3a15 100644 --- a/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c +++ b/drivers/gpu/drm/panel/panel-samsung-s6e63m0.c @@ -16,6 +16,7 @@ #include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/regulator/consumer.h> +#include <linux/media-bus-format.h> #include <video/mipi_display.h> @@ -410,6 +411,7 @@ static int s6e63m0_get_modes(struct drm_panel *panel, struct drm_connector *connector) { struct drm_display_mode *mode; + static const u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24; mode = drm_mode_duplicate(connector->dev, &default_mode); if (!mode) { @@ -419,6 +421,13 @@ static int s6e63m0_get_modes(struct drm_panel *panel, return -ENOMEM; } + connector->display_info.width_mm = mode->width_mm; + connector->display_info.height_mm = mode->height_mm; + drm_display_info_set_bus_formats(&connector->display_info, + &bus_format, 1); + connector->display_info.bus_flags = DRM_BUS_FLAG_DE_LOW | + DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE; + drm_mode_set_name(mode); mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; |