dri-devel June 2015

dri-devel@lists.freedesktop.org

188 participants
1140 discussions

[PATCH 3.10 02/46] drm/i915: Fix declaration of intel_gmbus_{is_forced_bit/is_port_falid}
by Greg Kroah-Hartman 03 Jun '15

03 Jun '15

3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= <dl9pf(a)gmx.de> commit 8f375e10ee47b9d7b9b3aefcf67854c6e92708be upstream. Description: intel_gmbus_is_forced_bit is no extern as its body is right below. Likewise for intel_gmbus_is_port_valid. This fixes a compilation issue with clang. An initial version of this patch was developed by PaX Team <pageexec at freemail.hu>. This is respin of this patch. 20130509: v2: (re-)add inline upon request. Signed-off-by: Jan-Simon MÃ¶ller <dl9pf(a)gmx.de> CC: pageexec(a)freemail.hu CC: daniel.vetter(a)ffwll.ch CC: airlied(a)linux.ie CC: intel-gfx(a)lists.freedesktop.org CC: dri-devel(a)lists.freedesktop.org CC: linux-kernel(a)vger.kernel.org [danvet: Bikeshed commit message.] Signed-off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1804,7 +1804,7 @@ void i915_teardown_sysfs(struct drm_devi /* intel_i2c.c */ extern int intel_setup_gmbus(struct drm_device *dev); extern void intel_teardown_gmbus(struct drm_device *dev); -extern inline bool intel_gmbus_is_port_valid(unsigned port) +static inline bool intel_gmbus_is_port_valid(unsigned port) { return (port >= GMBUS_PORT_SSC && port <= GMBUS_PORT_DPD); } @@ -1813,7 +1813,7 @@ extern struct i2c_adapter *intel_gmbus_g struct drm_i915_private *dev_priv, unsigned port); extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit); -extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) +static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; }

1 0

[PATCH 00/11 v2] Miscellaneous stability patches
by Frediano Ziglio 03 Jun '15

03 Jun '15

This set of patches mainly contains fix for some memory issues using quite aggressively surfaces and other minor problems like images going black after a while. There are no code change from v1, changes: - fix path prefix - rebased on drm-next branch; - add "drm/qxl" prefix on subject; - add reviewed by. About which patches should be applied surely (attempting to put a priority) - "Move main reference counter to GEM object instead of TTM ones" this can causes memory corruption even not wanting to; - "Avoid double free on error" this can be cause leaks in kernel if user space wants, mitigated by the fact that usually DRM inodes are owned by root; - "Handle all errors in qxl_surface_evict" could cause corruption too, not really probable but taking into account that Xorg implementation use a lot signals is not so impossible; - "Handle correctly failures in qxl_alloc_relase_reserved", "Do not leak memory if qxl_release_list_add fails" just cause leaks on situation where memory is already REALLY low, can be omitted; - "Fix print statement not using uninitialized variable", "Remove format string errors" should just print garbage and debugging is disabled by default, not necessary. Frediano Ziglio (11): drm/qxl: Do not cause spice-server to clean our objects drm/qxl: Do not leak memory if qxl_release_list_add fails drm/qxl: Fix print statement not using uninitialized variable drm/qxl: Avoid double free on error drm/qxl: Handle all errors in qxl_surface_evict drm/qxl: Fix return for qxl_release_alloc drm/qxl: Handle correctly failures in qxl_alloc_relase_reserved drm/qxl: Remove format string errors drm/qxl: Move main reference counter to GEM object instead of TTM ones drm/qxl: Simplify cleaning qxl processing command drm/qxl: Propagate correctly errors from qxlhw_handle_to_bo drivers/gpu/drm/qxl/qxl_cmd.c | 11 +++++----- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.h | 2 +- drivers/gpu/drm/qxl/qxl_gem.c | 10 +++++++-- drivers/gpu/drm/qxl/qxl_ioctl.c | 46 +++++++++++++++------------------------ drivers/gpu/drm/qxl/qxl_object.c | 11 ++++------ drivers/gpu/drm/qxl/qxl_release.c | 13 +++++++---- 7 files changed, 46 insertions(+), 49 deletions(-) -- 2.1.0

1 11

[PULL resend] drm-amdkfd-next
by Oded Gabbay 03 Jun '15

03 Jun '15

Hi Dave, Resending pull request of amdkfd for 4.2 I fixed the three things you asked me: - rename get_dbgmgr_mutex to kfd_get_dbgmgr_mutex to namespace it - change void* to uint64_t inside ioctl arguments - use kmalloc instead of kzalloc because we use copy_from_user immediately after it Following is the original pull request text. drm-amdkfd-next-2015-06-03: - Add the H/W debugger support module, including new IOCTLs to: - register/unregister a process as a debugged process - Set address watch-point in the debugged process's GPU kernel - Do a wave control operation in the debugged process's waves See the commit messages for more details on the available operations. The debugged process can only perform debug operation on itself. It is blocked by the amdkfd+H/W from performing operations on other processes's waves or GPU kernels. The blocking is done by setting the VMID and PASID of the debugged process in the packets that are sent to the CP with the debug instructions. - Add support for static user-mode queues. These queues are regular queues, but because they belong to the debugged process, we need to make sure the CP doesn't preempt them during a debug operation. Therefore, we mark them as static for the CP ignore them during preemption. - Support killing all the waves when a process is terminated. This is needed in case a process is terminated but we can't UNMAP its queues (can occur due to several reasons). In that case, the CP could be stuck unless we kill all its waves. This function is *very* important as it provides the kernel a high level of control over the GPU. The reason we didn't upstream this function so far, is because it is implemented using the H/W debugger module functions, so we had to wait until we can upstream the H/W debugger module. - Replace declaration of bitmap from unsigned long to standard DECLARE_BITMAP Thanks, Oded The following changes since commit 3e8d222f2a95e9d30f13107bf4e48778f79e73b8: Merge tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel into drm-next (2015-06-02 18:10:50 +1000) are available in the git repository at: git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-06-03 for you to fetch changes up to c3447e815062bb48d70a5afa0567fd6f30bc7f1b: drm/amdkfd: Enforce kill all waves on process termination (2015-06-03 11:34:47 +0300) ---------------------------------------------------------------- Alexey Skidanov (1): drm/radeon: Add ATC VMID<-->PASID functions to kfd->kgd Ben Goz (1): drm/amdkfd: Enforce kill all waves on process termination Joe Perches (1): drm/amdkfd: Use DECLARE_BITMAP Yair Shachar (9): drm/radeon: Add H/W debugger kfd->kgd functions drm/amdkfd: add H/W debugger IOCTL set definitions drm/amdkfd: Add static user-mode queues support drm/amdkfd: Add skeleton H/W debugger module support drm/amdkfd: Add wave control operation to debugger drm/amdkfd: Add address watch operation to debugger drm/amdkfd: Implement (un)register debugger IOCTLs drm/amdkfd: Implement wave control debugger IOCTL drm/amdkfd: Implement address watch debugger IOCTL drivers/gpu/drm/amd/amdkfd/Makefile | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 308 +++++++ drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 886 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 193 +++++ drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 168 ++++ drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 294 +++++++ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 48 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 6 + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 46 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h | 290 +++++++ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 24 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 11 + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 18 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 21 + drivers/gpu/drm/radeon/cik_reg.h | 56 +- drivers/gpu/drm/radeon/cikd.h | 9 +- drivers/gpu/drm/radeon/radeon_kfd.c | 151 +++- include/uapi/linux/kfd_ioctl.h | 43 +- 20 files changed, 2551 insertions(+), 35 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h

1 0

[PATCH] drm/rockchip: only call drm_fb_helper_hotplug_event if fb_helper present
by Heiko Stübner 03 Jun '15

03 Jun '15

Add a check for the presence of fb_helper to rockchip_drm_output_poll_changed() to only call drm_fb_helper_hotplug_event if there is actually a fb_helper available. Without this check I see NULL pointer dereferences when the hdmi hotplug irq fires before the fb_helper got initialized. Signed-off-by: Heiko Stuebner <heiko(a)sntech.de> --- Fix to variant as seen on at least Exynos, Armada and Omap drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 77d5289..002645b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -162,7 +162,8 @@ static void rockchip_drm_output_poll_changed(struct drm_device *dev) struct rockchip_drm_private *private = dev->dev_private; struct drm_fb_helper *fb_helper = &private->fbdev_helper; - drm_fb_helper_hotplug_event(fb_helper); + if (fb_helper) + drm_fb_helper_hotplug_event(fb_helper); } static const struct drm_mode_config_funcs rockchip_drm_mode_config_funcs = { -- 2.1.4

2 1

[PATCH v2] drm/rockchip: Add BGR formats to VOP
by Tomasz Figa 03 Jun '15

03 Jun '15

VOP can support BGR formats in all windows thanks to red/blue swap option provided in WINx_CTRL0 registers. This patch enables support for ABGR8888, XBGR8888, BGR888 and BGR565 formats by using this feature. Signed-off-by: Tomasz Figa <tfiga(a)chromium.org> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) Changes since v1: (https://patchwork.kernel.org/patch/6369531/) - Fixed register addresses for win2/3 and hwc (reported by Mark Yao). diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 4557f33..6254e98 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -169,6 +169,7 @@ struct vop_win_phy { struct vop_reg enable; struct vop_reg format; + struct vop_reg rb_swap; struct vop_reg act_info; struct vop_reg dsp_info; struct vop_reg dsp_st; @@ -198,8 +199,12 @@ struct vop_data { static const uint32_t formats_01[] = { DRM_FORMAT_XRGB8888, DRM_FORMAT_ARGB8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_ABGR8888, DRM_FORMAT_RGB888, + DRM_FORMAT_BGR888, DRM_FORMAT_RGB565, + DRM_FORMAT_BGR565, DRM_FORMAT_NV12, DRM_FORMAT_NV16, DRM_FORMAT_NV24, @@ -208,8 +213,12 @@ static const uint32_t formats_01[] = { static const uint32_t formats_234[] = { DRM_FORMAT_XRGB8888, DRM_FORMAT_ARGB8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_ABGR8888, DRM_FORMAT_RGB888, + DRM_FORMAT_BGR888, DRM_FORMAT_RGB565, + DRM_FORMAT_BGR565, }; static const struct vop_win_phy win01_data = { @@ -217,6 +226,7 @@ static const struct vop_win_phy win01_data = { .nformats = ARRAY_SIZE(formats_01), .enable = VOP_REG(WIN0_CTRL0, 0x1, 0), .format = VOP_REG(WIN0_CTRL0, 0x7, 1), + .rb_swap = VOP_REG(WIN0_CTRL0, 0x1, 12), .act_info = VOP_REG(WIN0_ACT_INFO, 0x1fff1fff, 0), .dsp_info = VOP_REG(WIN0_DSP_INFO, 0x0fff0fff, 0), .dsp_st = VOP_REG(WIN0_DSP_ST, 0x1fff1fff, 0), @@ -233,6 +243,7 @@ static const struct vop_win_phy win23_data = { .nformats = ARRAY_SIZE(formats_234), .enable = VOP_REG(WIN2_CTRL0, 0x1, 0), .format = VOP_REG(WIN2_CTRL0, 0x7, 1), + .rb_swap = VOP_REG(WIN2_CTRL0, 0x1, 12), .dsp_info = VOP_REG(WIN2_DSP_INFO0, 0x0fff0fff, 0), .dsp_st = VOP_REG(WIN2_DSP_ST0, 0x1fff1fff, 0), .yrgb_mst = VOP_REG(WIN2_MST0, 0xffffffff, 0), @@ -246,6 +257,7 @@ static const struct vop_win_phy cursor_data = { .nformats = ARRAY_SIZE(formats_234), .enable = VOP_REG(HWC_CTRL0, 0x1, 0), .format = VOP_REG(HWC_CTRL0, 0x7, 1), + .rb_swap = VOP_REG(HWC_CTRL0, 0x1, 12), .dsp_st = VOP_REG(HWC_DSP_ST, 0x1fff1fff, 0), .yrgb_mst = VOP_REG(HWC_MST, 0xffffffff, 0), }; @@ -351,15 +363,32 @@ static inline void vop_mask_write_relaxed(struct vop *vop, uint32_t offset, } } +static bool has_rb_swapped(uint32_t format) +{ + switch (format) { + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_ABGR8888: + case DRM_FORMAT_BGR888: + case DRM_FORMAT_BGR565: + return true; + default: + return false; + } +} + static enum vop_data_format vop_convert_format(uint32_t format) { switch (format) { case DRM_FORMAT_XRGB8888: case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_ABGR8888: return VOP_FMT_ARGB8888; case DRM_FORMAT_RGB888: + case DRM_FORMAT_BGR888: return VOP_FMT_RGB888; case DRM_FORMAT_RGB565: + case DRM_FORMAT_BGR565: return VOP_FMT_RGB565; case DRM_FORMAT_NV12: return VOP_FMT_YUV420SP; @@ -377,6 +406,7 @@ static bool is_alpha_support(uint32_t format) { switch (format) { case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_ABGR8888: return true; default: return false; @@ -587,6 +617,7 @@ static int vop_update_plane_event(struct drm_plane *plane, enum vop_data_format format; uint32_t val; bool is_alpha; + bool rb_swap; bool visible; int ret; struct drm_rect dest = { @@ -620,6 +651,7 @@ static int vop_update_plane_event(struct drm_plane *plane, return 0; is_alpha = is_alpha_support(fb->pixel_format); + rb_swap = has_rb_swapped(fb->pixel_format); format = vop_convert_format(fb->pixel_format); if (format < 0) return format; @@ -688,6 +720,7 @@ static int vop_update_plane_event(struct drm_plane *plane, val = (dsp_sty - 1) << 16; val |= (dsp_stx - 1) & 0xffff; VOP_WIN_SET(vop, win, dsp_st, val); + VOP_WIN_SET(vop, win, rb_swap, rb_swap); if (is_alpha) { VOP_WIN_SET(vop, win, dst_alpha_ctl, -- 2.2.0.rc0.207.ga3a616c

2 2

[PATCH 05/98] exynos_drm.h: use __u64 from linux/types.h
by Mikko Rapeli 02 Jun '15

02 Jun '15

Fixes userspace compilation error: drm/exynos_drm.h:30:2: error: unknown type name ‘uint64_t’ Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/drm/exynos_drm.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/uapi/drm/exynos_drm.h b/include/uapi/drm/exynos_drm.h index 5575ed1..c4468f9 100644 --- a/include/uapi/drm/exynos_drm.h +++ b/include/uapi/drm/exynos_drm.h @@ -15,6 +15,7 @@ #ifndef _UAPI_EXYNOS_DRM_H_ #define _UAPI_EXYNOS_DRM_H_ +#include <linux/types.h> #include <drm/drm.h> /** @@ -27,7 +28,7 @@ * - this handle will be set by gem module of kernel side. */ struct drm_exynos_gem_create { - uint64_t size; + __u64 size; unsigned int flags; unsigned int handle; }; @@ -44,7 +45,7 @@ struct drm_exynos_gem_create { struct drm_exynos_gem_info { unsigned int handle; unsigned int flags; - uint64_t size; + __u64 size; }; /** @@ -58,7 +59,7 @@ struct drm_exynos_gem_info { struct drm_exynos_vidi_connection { unsigned int connection; unsigned int extensions; - uint64_t edid; + __u64 edid; }; /* memory type definitions. */ -- 2.1.4

4 9

[PATCH v2] drm/msm/hdmi: Use pinctrl in HDMI driver
by Stephane Viau 02 Jun '15

02 Jun '15

Some targets (eg: msm8994) use the pinctrl framework to configure interface pins. This change adds support for initialization and pinctrl active/sleep state control for the HDMI driver. Signed-off-by: Stephane Viau <sviau(a)codeaurora.org> --- v2: - Add devicetree binding documentation for pinctrl property [Ivan] - Use pinctrl framework's PINCTRL_STATE_DEFAULT/SLEEP states [Ivan] - Fix a couple of checkpatch warnings Documentation/devicetree/bindings/drm/msm/hdmi.txt | 6 +++++ drivers/gpu/drm/msm/hdmi/hdmi.c | 27 +++++++++++++++++++ drivers/gpu/drm/msm/hdmi/hdmi.h | 5 ++++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 31 ++++++++++++++++++++++ 4 files changed, 69 insertions(+) diff --git a/Documentation/devicetree/bindings/drm/msm/hdmi.txt b/Documentation/devicetree/bindings/drm/msm/hdmi.txt index a29a55f..01ff7c6 100644 --- a/Documentation/devicetree/bindings/drm/msm/hdmi.txt +++ b/Documentation/devicetree/bindings/drm/msm/hdmi.txt @@ -20,6 +20,9 @@ Required properties: Optional properties: - qcom,hdmi-tx-mux-en-gpio: hdmi mux enable pin - qcom,hdmi-tx-mux-sel-gpio: hdmi mux select pin +- pinctrl-names: the pin control state names; should contain "default" +- pinctrl-0: the default pinctrl state (active) +- pinctrl-n: the "sleep" pinctrl state (n == 1) and others Example: @@ -44,5 +47,8 @@ Example: qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>; core-vdda-supply = <&pm8921_hdmi_mvs>; hdmi-mux-supply = <&ext_3p3v>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&hpd_active &ddc_active &cec_active>; + pinctrl-1 = <&hpd_suspend &ddc_suspend &cec_suspend>; }; }; diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 8145362..1197086 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -354,6 +354,20 @@ static int get_gpio(struct device *dev, struct device_node *of_node, const char } return gpio; } + +static struct pinctrl_state *get_pinctrl_state(struct device *dev, + struct pinctrl *pinctrl, const char *name) +{ + struct pinctrl_state *state = pinctrl_lookup_state(pinctrl, name); + + if (IS_ERR_OR_NULL(state)) { + dev_err(dev, "failed to get pinctrl state \"%s\" (%ld)", + name, PTR_ERR(state)); + return NULL; + } + + return state; +} #endif static int hdmi_bind(struct device *dev, struct device *master, void *data) @@ -365,6 +379,7 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) #ifdef CONFIG_OF struct device_node *of_node = dev->of_node; const struct of_device_id *match; + struct pinctrl *pinctrl; match = of_match_node(dt_match, of_node); if (match && match->data) { @@ -383,6 +398,18 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) hdmi_cfg->mux_sel_gpio = get_gpio(dev, of_node, "qcom,hdmi-tx-mux-sel"); hdmi_cfg->mux_lpm_gpio = get_gpio(dev, of_node, "qcom,hdmi-tx-mux-lpm"); + /* not all targets have pinctrl, do not fail in case of error: */ + pinctrl = devm_pinctrl_get(dev); + if (IS_ERR_OR_NULL(pinctrl)) { + dev_warn(dev, "cannot get pinctrl: %s\n", of_node->name); + } else { + hdmi_cfg->active = get_pinctrl_state(dev, pinctrl, + PINCTRL_STATE_DEFAULT); + hdmi_cfg->sleep = get_pinctrl_state(dev, pinctrl, + PINCTRL_STATE_SLEEP); + hdmi_cfg->pinctrl = pinctrl; + DBG("pinctrl initialized."); + } #else static struct hdmi_platform_config config = {}; static const char *hpd_clk_names[] = { diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h index a155c4a..4742df2 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -22,6 +22,7 @@ #include <linux/clk.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> +#include <linux/pinctrl/consumer.h> #include <linux/hdmi.h> #include "msm_drv.h" @@ -95,6 +96,10 @@ struct hdmi_platform_config { /* gpio's: */ int ddc_clk_gpio, ddc_data_gpio, hpd_gpio, mux_en_gpio, mux_sel_gpio; int mux_lpm_gpio; + + /* pinctrl: */ + struct pinctrl *pinctrl; + struct pinctrl_state *active, *sleep; }; void hdmi_set_mode(struct hdmi *hdmi, bool power_on); diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c index 914bf95..cbffb8a 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c @@ -181,6 +181,23 @@ error1: return ret; } +static int pinctrl_config(struct hdmi *hdmi, bool on) +{ + struct drm_device *dev = hdmi->dev; + const struct hdmi_platform_config *config = hdmi->config; + struct pinctrl_state *state = on ? config->active : config->sleep; + int ret; + + ret = pinctrl_select_state(config->pinctrl, state); + if (ret) + dev_err(dev->dev, "failed to set pinctrl state to %s: %d\n", + on ? "active" : "sleep", ret); + + DBG("pinctrl %s", on ? "on" : "off"); + + return ret; +} + static int hpd_enable(struct hdmi_connector *hdmi_connector) { struct hdmi *hdmi = hdmi_connector->hdmi; @@ -199,6 +216,14 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) } } + if (config->pinctrl) { + ret = pinctrl_config(hdmi, true); + if (ret) { + dev_err(dev->dev, "failed pinctrl config: %d\n", ret); + goto fail; + } + } + ret = gpio_config(hdmi, true); if (ret) { dev_err(dev->dev, "failed to configure GPIOs: %d\n", ret); @@ -268,6 +293,12 @@ static void hdp_disable(struct hdmi_connector *hdmi_connector) if (ret) dev_warn(dev->dev, "failed to unconfigure GPIOs: %d\n", ret); + if (config->pinctrl) { + ret = pinctrl_config(hdmi, false); + if (ret) + dev_warn(dev->dev, "failed pinctrl config: %d\n", ret); + } + for (i = 0; i < config->hpd_reg_cnt; i++) { ret = regulator_disable(hdmi->hpd_regs[i]); if (ret) -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

3 4

Re: [PATCH 0/7] Color Manager Implementation
by Damien Lespiau 02 Jun '15

02 Jun '15

On Tue, Jun 02, 2015 at 01:22:42AM +0530, Kausal Malladi wrote: > From: Kausal Malladi <Kausal.Malladi(a)intel.com> > > This patch set adds color manager implementation in drm/i915 layer. Is anyone working on tests/test plan? Thanks, -- Damien

2 1

Re: [PATCH 4/7] drm: Add Gamma correction structure
by Jindal, Sonika 02 Jun '15

02 Jun '15

On 6/2/2015 1:22 AM, Kausal Malladi wrote: > From: Kausal Malladi <Kausal.Malladi(a)intel.com> > > This patch adds a new structure in DRM layer for Gamma color correction. > This structure will be used by all user space agents to configure > appropriate Gamma precision and Gamma level. > > struct drm_intel_gamma { > __u32 flags; > (The flag variable will indicate if the property to be set/get > is Gamma or DeGamma) > __u32 gamma_level; > (The gamma_level variable indicates if the Gamma correction is to be > applied on Pipe/plane) > __u32 gamma_precision; > (The Gamma precision indicates the Gamma mode to be applied) > > Supported precisions are - > #define I915_GAMMA_PRECISION_UNKNOWN 0 > #define I915_GAMMA_PRECISION_CURRENT 0xFFFFFFFF > #define I915_GAMMA_PRECISION_LEGACY (1 << 0) > #define I915_GAMMA_PRECISION_10BIT (1 << 1) > #define I915_GAMMA_PRECISION_12BIT (1 << 2) > #define I915_GAMMA_PRECISION_14BIT (1 << 3) > #define I915_GAMMA_PRECISION_16BIT (1 << 4) > > __u32 num_samples; > (The num_samples indicates the number of Gamma correction > coefficients) > __u32 reserved; > __u64 gamma_ptr; > (Points to the raw Gamma color correction values) > }; > > Signed-off-by: Shashank Sharma <shashank.sharma(a)intel.com> > Signed-off-by: Kausal Malladi <Kausal.Malladi(a)intel.com> > --- > include/uapi/drm/drm.h | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h > index 3801584..fe27e5c 100644 > --- a/include/uapi/drm/drm.h > +++ b/include/uapi/drm/drm.h > @@ -829,6 +829,17 @@ struct drm_event_vblank { > __u32 reserved; > }; > > +/* Color Management structure for Gamma */ > +struct drm_intel_gamma { I suppose, this can be used by other drivers as well? If yes, "intel" can be removed. > + __u32 obj_id; > + __u32 flags; > + __u32 gamma_level; > + __u32 gamma_precision; > + __u32 num_samples; > + __u32 reserved; > + __u64 gamma_ptr; > +}; > + > /* typedef area */ > #ifndef __KERNEL__ > typedef struct drm_clip_rect drm_clip_rect_t; >

2 1

Re: [PATCH 3/7] drm/i915: Add Set property interface for CRTC
by Jindal, Sonika 02 Jun '15

02 Jun '15

On 6/2/2015 1:22 AM, Kausal Malladi wrote: > From: Kausal Malladi <Kausal.Malladi(a)intel.com> > > This patch adds set property interface for Intel CRTC. This interface > will be used to set color correction DRM properties. > > Signed-off-by: Shashank Sharma <shashank.sharma(a)intel.com> > Signed-off-by: Kausal Malladi <Kausal.Malladi(a)intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index f817cea..21e67da 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -12978,11 +12978,19 @@ out: > return ret; > } > > +static int intel_crtc_set_property(struct drm_crtc *crtc, > + struct drm_property *property, uint64_t val) > +{ > + DRM_DEBUG_KMS("Unknown crtc property '%s'\n", property->name); > + return -EINVAL; > +} > + > static const struct drm_crtc_funcs intel_crtc_funcs = { > .gamma_set = intel_crtc_gamma_set, > .set_config = intel_crtc_set_config, > .destroy = intel_crtc_destroy, > .page_flip = intel_crtc_page_flip, > + .set_property = intel_crtc_set_property, I think it should be done similar to plane set property using atomic helpers. > .atomic_duplicate_state = intel_crtc_duplicate_state, > .atomic_destroy_state = intel_crtc_destroy_state, > }; >

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2015