dri-devel February 2017

dri-devel@lists.freedesktop.org

200 participants
1445 discussions

[PATCH] drm/sti: hdmi: automatically check DVI/HDMI mode
by Vincent Abriou 03 Feb '17

03 Feb '17

Remove the hdmi_mode_property and use drm_detect_hdmi_monitor function to check whether the connected monitor is HDMI capable or DVI only. Signed-off-by: Vincent Abriou <vincent.abriou(a)st.com> --- drivers/gpu/drm/sti/sti_hdmi.c | 31 ++++++------------------------- drivers/gpu/drm/sti/sti_hdmi.h | 17 ++--------------- 2 files changed, 8 insertions(+), 40 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 6862d59..ce2dcba 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -158,7 +158,6 @@ struct sti_hdmi_connector { struct drm_encoder *encoder; struct sti_hdmi *hdmi; struct drm_property *colorspace_property; - struct drm_property *hdmi_mode_property; }; #define to_sti_hdmi_connector(x) \ @@ -265,7 +264,7 @@ static void hdmi_config(struct sti_hdmi *hdmi) /* Select encryption type and the framing mode */ conf |= HDMI_CFG_ESS_NOT_OESS; - if (hdmi->hdmi_mode == HDMI_MODE_HDMI) + if (hdmi->hdmi_monitor) conf |= HDMI_CFG_HDMI_NOT_DVI; /* Set Hsync polarity */ @@ -970,6 +969,11 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector) if (!edid) goto fail; + hdmi->hdmi_monitor = drm_detect_hdmi_monitor(edid); + DRM_DEBUG_KMS("%s : %dx%d cm\n", + (hdmi->hdmi_monitor ? "hdmi monitor" : "dvi monitor"), + edid->width_cm, edid->height_cm); + count = drm_add_edid_modes(connector, edid); drm_mode_connector_update_edid_property(connector, edid); drm_edid_to_eld(connector, edid); @@ -1053,19 +1057,6 @@ static void sti_hdmi_connector_init_property(struct drm_device *drm_dev, } hdmi_connector->colorspace_property = prop; drm_object_attach_property(&connector->base, prop, hdmi->colorspace); - - /* hdmi_mode property */ - hdmi->hdmi_mode = DEFAULT_HDMI_MODE; - prop = drm_property_create_enum(drm_dev, 0, "hdmi_mode", - hdmi_mode_names, - ARRAY_SIZE(hdmi_mode_names)); - if (!prop) { - DRM_ERROR("fails to create colorspace property\n"); - return; - } - hdmi_connector->hdmi_mode_property = prop; - drm_object_attach_property(&connector->base, prop, hdmi->hdmi_mode); - } static int @@ -1083,11 +1074,6 @@ sti_hdmi_connector_set_property(struct drm_connector *connector, return 0; } - if (property == hdmi_connector->hdmi_mode_property) { - hdmi->hdmi_mode = val; - return 0; - } - DRM_ERROR("failed to set hdmi connector property\n"); return -EINVAL; } @@ -1107,11 +1093,6 @@ sti_hdmi_connector_get_property(struct drm_connector *connector, return 0; } - if (property == hdmi_connector->hdmi_mode_property) { - *val = hdmi->hdmi_mode; - return 0; - } - DRM_ERROR("failed to get hdmi connector property\n"); return -EINVAL; } diff --git a/drivers/gpu/drm/sti/sti_hdmi.h b/drivers/gpu/drm/sti/sti_hdmi.h index 119bc35..4070123 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.h +++ b/drivers/gpu/drm/sti/sti_hdmi.h @@ -30,19 +30,6 @@ struct hdmi_audio_params { struct hdmi_audio_infoframe cea; }; -/* values for the framing mode property */ -enum sti_hdmi_modes { - HDMI_MODE_HDMI, - HDMI_MODE_DVI, -}; - -static const struct drm_prop_enum_list hdmi_mode_names[] = { - { HDMI_MODE_HDMI, "hdmi" }, - { HDMI_MODE_DVI, "dvi" }, -}; - -#define DEFAULT_HDMI_MODE HDMI_MODE_HDMI - static const struct drm_prop_enum_list colorspace_mode_names[] = { { HDMI_COLORSPACE_RGB, "rgb" }, { HDMI_COLORSPACE_YUV422, "yuv422" }, @@ -73,7 +60,7 @@ static const struct drm_prop_enum_list colorspace_mode_names[] = { * @reset: reset control of the hdmi phy * @ddc_adapt: i2c ddc adapter * @colorspace: current colorspace selected - * @hdmi_mode: select framing for HDMI or DVI + * @hdmi_monitor: true if HDMI monitor detected else DVI monitor assumed * @audio_pdev: ASoC hdmi-codec platform device * @audio: hdmi audio parameters. * @drm_connector: hdmi connector @@ -98,7 +85,7 @@ struct sti_hdmi { struct reset_control *reset; struct i2c_adapter *ddc_adapt; enum hdmi_colorspace colorspace; - enum sti_hdmi_modes hdmi_mode; + bool hdmi_monitor; struct platform_device *audio_pdev; struct hdmi_audio_params audio; struct drm_connector *drm_connector; -- 2.7.4

1 0

[PATCH] drm/sti: unbind all components while driver cleanup
by Vincent Abriou 03 Feb '17

03 Feb '17

Unbind all the components when the STI driver is unregistered. Signed-off-by: Vincent Abriou <vincent.abriou(a)st.com> --- drivers/gpu/drm/sti/sti_drv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index e433853..60a41cc 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -255,6 +255,7 @@ static void sti_cleanup(struct drm_device *ddev) drm_kms_helper_poll_fini(ddev); drm_vblank_cleanup(ddev); + component_unbind_all(ddev->dev, ddev); kfree(private); ddev->dev_private = NULL; } -- 2.7.4

1 0

[PATCH 0/3] drm/sti: gdp pixel clock and plane update fixes
by Vincent Abriou 03 Feb '17

03 Feb '17

This patch series fix issues met around gpd plane: - fix gdp clock selection and enabling - fix div by zero when GDP plane is being disabled - do not process gdp update requests with unmodified parameters Vincent Abriou (3): drm/sti: enable gdp pixel clock in atomic_update drm/sti: do not set gdp pixel clock rate if mode is not set drm/sti: do not post GDP command if no update drivers/gpu/drm/sti/sti_gdp.c | 85 ++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 38 deletions(-) -- 2.7.4

1 3

[PATCH 0/2] drm/sti cleanup: remove deprecated register and functionnalities
by Vincent Abriou 03 Feb '17

03 Feb '17

Remove stih416 chip deprecated register and functionnalities since stih416 chip is no more supported from Linux v4.9. Vincent Abriou (2): drm/sti: remove deprecated sink_term config drm/sti: remove deprecated legacy vtg slave drivers/gpu/drm/sti/sti_hdmi.c | 7 ----- drivers/gpu/drm/sti/sti_vtg.c | 58 ++++++++++-------------------------------- 2 files changed, 14 insertions(+), 51 deletions(-) -- 2.7.4

1 2

[PATCH 0/7] drm/exynos: add Ultra HD and interlace modes support to Exynos5433
by Andrzej Hajda 03 Feb '17

03 Feb '17

Hi Inki, This patchset adds support for UltraHD and intrelace modes on DECON and HDMI drivers of Exynos5433 chipset. To fully support it on TM2(e) platforms MHL patches are alse required which will be posted in separate patchset. Krzysztof, DTS patch do not depend on the previous patches, so there is no need to synchronize branches. Regards Andrzej Andrzej Hajda (7): drm/exynos/hdmi: add 297MHz pixel clock support drm/exynos/hdmi: fix VSI infoframe registers drm/exynos/hdmi: fix PLL for 27MHz settings drm/exynos/hdmi: add bridge support drm/exynos/decon5433: add support for interlace modes drm/exynos/decon5433: signal vblank only on odd fields arm64: dts: exynos: configure TV path clocks for Ultra HD modes arch/arm64/boot/dts/exynos/exynos5433.dtsi | 3 + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 52 ++++++++++++----- drivers/gpu/drm/exynos/exynos_hdmi.c | 80 +++++++++++++++++++++------ include/video/exynos5433_decon.h | 2 + 4 files changed, 107 insertions(+), 30 deletions(-) -- 2.7.4

5 26

[PATCH] drm/exynos: fimd: Do not use HW trigger for exynos3250
by Hoegeun Kwon 03 Feb '17

03 Feb '17

Commit a6f75aa161c5 ("drm/exynos: fimd: add HW trigger support") added hardware trigger support to the FIMD controller driver. I have tested but this broke the display in at least the exynos3250 Gear 2. So until the issue is fixed, avoid using HW trigger for the exynos3250 based boards and use SW trigger as it was before the mentioned commit. Signed-off-by: Hoegeun Kwon <hoegeun.kwon(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index e2e4051..b5e0fe1 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -125,10 +125,8 @@ struct fimd_driver_data { .timing_base = 0x20000, .lcdblk_offset = 0x210, .lcdblk_bypass_shift = 1, - .trg_type = I80_HW_TRG, .has_shadowcon = 1, .has_vidoutcon = 1, - .has_trigger_per_te = 1, }; static struct fimd_driver_data exynos4_fimd_driver_data = { -- 1.9.1

1 0

[PATCH 0/6] HDMI 2.0: Scrambling support in DRM layer
by Shashank Sharma 03 Feb '17

03 Feb '17

HDMI 2.0 spec defines a method to reduce the RF footprint while operating at higher pixel clocks, which is called Scrambling. Scrambling can be controlled over a new set of I2C registers which are accessible over existing DDC I2C lines, called SCDC register set. This patch series contains 6 patches: - First two patches add generic drm helper functions to read and write into SCDC registers. These patches are written by Thierry, in a patch series published here: https://patchwork.kernel.org/patch/9459051/ Minor changes were done to map the patches into this series. - Next two patches add functions for scrambling detection and scrambling control. - Next two patches use this infrastructure in DRM layer from I915 driver, to enable scrambling on a GLK deivce which sports a native HDMI 2.0 controller. Shashank Sharma (4): drm/edid: detect SCDC support in HF-VSDB drm: scrambling support in drm layer drm/i915: enable scrambling drm/i915: allow HDMI 2.0 clock rates Thierry Reding (2): drm: Add SCDC helpers drm/edid: check for HF-VSDB block Documentation/gpu/drm-kms-helpers.rst | 12 +++ drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_edid.c | 158 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_scdc_helper.c | 111 ++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_ddi.c | 5 ++ drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_hdmi.c | 44 ++++++++++ include/drm/drm_connector.h | 50 +++++++++++ include/drm/drm_edid.h | 6 +- include/drm/drm_scdc_helper.h | 132 ++++++++++++++++++++++++++++ include/linux/hdmi.h | 1 + 12 files changed, 524 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/drm_scdc_helper.c create mode 100644 include/drm/drm_scdc_helper.h -- 1.9.1

6 30

[radeon-alex:amd-staging-4.9 5/14] ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
by kbuild test robot 03 Feb '17

03 Feb '17

tree: git://people.freedesktop.org/~agd5f/linux.git amd-staging-4.9 head: 99eb22d3eab149aa18e770da839165e07467db25 commit: 7adb2bbcdf7259533c5afc95c4a788b59bb59306 [5/14] drm/amd/display: DMCU Compile and Load config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout 7adb2bbcdf7259533c5afc95c4a788b59bb59306 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[git pull] drm fixes for 4.10-rc7
by Dave Airlie 02 Feb '17

02 Feb '17

Hi Linus, Another fixes pull for v4.10, it's a bit big due to the backport of the VMA fixes for i915 that should fix the oops on shutdown problems that you've worked around. There are also two drm core connector registration fixes, a bunch of nouveau regression fixes and two AMD fixes. Dave. The following changes since commit 566cf877a1fcb6d6dc0126b076aad062054c2637: Linux 4.10-rc6 (2017-01-29 14:25:17 -0800) are available in the git repository at: git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.10-rc7 for you to fetch changes up to f63cf464fc379382a271f94ddef36e8c5a0628eb: Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2017-02-03 09:10:08 +1000) ---------------------------------------------------------------- intel vma fixes, amd and nouveau fixes. ---------------------------------------------------------------- Alastair Bridgewater (1): drm/nouveau/disp/gt215: Fix HDA ELD handling (thus, HDMI audio) on gt215 Alex Deucher (1): drm/amdgpu/si: fix crash on headless asics Ben Skeggs (4): drm/nouveau/fence/g84-: protect against concurrent access to semaphore buffers drm/nouveau: prevent userspace from deleting client object drm/nouveau/disp/mcp7x: disable dptmds workaround drm/nouveau/kms/nv50: request vblank events for commits that send completion events Chris Wilson (1): drm/i915: Track pinned vma in intel_plane_state Daniel Vetter (2): drm: prevent double-(un)registration for connectors drm: Don't race connector registration Dave Airlie (4): Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'drm-misc-fixes-2017-01-31' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes Merge tag 'topic/vma-fix-for-4.10-2017-02-02' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Ilia Mirkin (1): drm/nouveau/nv1a,nv1f/disp: fix memory clock rate retrieval Maarten Lankhorst (2): drm/atomic: Fix double free in drm_atomic_state_default_clear drm/atomic: Unconditionally call prepare_fb. Martin Peres (1): drm/nouveau/nouveau/led: prevent compiling the led-code if nouveau=y and leds=m Michel Dänzer (1): drm/radeon: Fix vram_size/visible values in DRM_RADEON_GEM_INFO ioctl drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +- drivers/gpu/drm/drm_atomic.c | 13 ++- drivers/gpu/drm/drm_atomic_helper.c | 9 -- drivers/gpu/drm/drm_connector.c | 23 +++- drivers/gpu/drm/drm_drv.c | 4 + drivers/gpu/drm/i915/i915_drv.h | 16 +-- drivers/gpu/drm/i915/intel_atomic_plane.c | 20 ++++ drivers/gpu/drm/i915/intel_display.c | 125 +++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 9 +- drivers/gpu/drm/i915/intel_fbc.c | 52 ++++----- drivers/gpu/drm/i915/intel_fbdev.c | 4 +- drivers/gpu/drm/i915/intel_sprite.c | 8 +- drivers/gpu/drm/nouveau/dispnv04/hw.c | 3 +- drivers/gpu/drm/nouveau/nouveau_fence.h | 1 + drivers/gpu/drm/nouveau/nouveau_led.h | 2 +- drivers/gpu/drm/nouveau/nouveau_usif.c | 3 +- drivers/gpu/drm/nouveau/nv50_display.c | 6 + drivers/gpu/drm/nouveau/nv84_fence.c | 6 + .../gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 2 - drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_gem.c | 4 +- include/drm/drmP.h | 1 + include/drm/drm_connector.h | 16 ++- 24 files changed, 171 insertions(+), 165 deletions(-)

1 0

[RFC] drm/msm/adreno: clean up gpu bindings
by Rob Clark 02 Feb '17

02 Feb '17

So, cleaning up the GPU bindings is something that has been on my TODO list for a while, but always $bigger_fires. Existing bindings are a bit ugly, but served a purpose when too many of the other drivers the GPU depends on where still working their way upstream. But now enough of that is in place for a few devices, that we should start trying to get the GPU nodes into the upstream dts files. This drops the "qcom,chipid" property and parses the GPU revision out of the compat string. It does mean you need to list both "qcom,adreno" and the more specific string, for example "qcom,adreno-530.2". I'm not sure if that is "weird" or anyone has better ideas (hence this RFC). It also drops "qcom,gpu-pwrlevels". Jordan tells me we can probably replace that w/ OPP bindings, which seems more sane. For now, the code just falls back to a super-slow safe clock until we get the OPP bindings sorted. In both cases, the code is still compatible with the old bindings, so dts files that exist on top of upstream will still work. But it is removed from the documentation, and for merging GPU nodes in upstream dts files, we should use the new bindings. (I'll ofc split out the .dtsi changes, but figured for an RFC it was easier to include them in this patch for discussion.) Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- .../devicetree/bindings/display/msm/gpu.txt | 24 +++---------- arch/arm64/boot/dts/qcom/msm8916.dtsi | 3 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 8 +---- drivers/gpu/drm/msm/adreno/adreno_device.c | 42 ++++++++++++++++++++-- drivers/gpu/drm/msm/msm_drv.c | 1 + 5 files changed, 47 insertions(+), 31 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/gpu.txt b/Documentation/devicetree/bindings/display/msm/gpu.txt index 67d0a58..760194d 100644 --- a/Documentation/devicetree/bindings/display/msm/gpu.txt +++ b/Documentation/devicetree/bindings/display/msm/gpu.txt @@ -1,7 +1,11 @@ Qualcomm adreno/snapdragon GPU Required properties: -- compatible: "qcom,adreno-3xx" +- compatible: "qcom,adreno-XYZ.W", "qcom,adreno" + for example: "qcom,adreno-306.0", "qcom,adreno" + Note that you need to list the less specific "qcom,adreno" (since this + is what the device is matched on), in addition to the more specific + with the chip-id. - reg: Physical base address and length of the controller's registers. - interrupts: The interrupt signal from the gpu. - clocks: device clocks @@ -10,14 +14,6 @@ Required properties: * "core_clk" * "iface_clk" * "mem_iface_clk" -- qcom,chipid: gpu chip-id. Note this may become optional for future - devices if we can reliably read the chipid from hw -- qcom,gpu-pwrlevels: list of operating points - - compatible: "qcom,gpu-pwrlevels" - - for each qcom,gpu-pwrlevel: - - qcom,gpu-freq: requested gpu clock speed - - NOTE: downstream android driver defines additional parameters to - configure memory bandwidth scaling per OPP. Example: @@ -38,15 +34,5 @@ Example: <&mmcc GFX3D_CLK>, <&mmcc GFX3D_AHB_CLK>, <&mmcc MMSS_IMEM_AHB_CLK>; - qcom,chipid = <0x03020100>; - qcom,gpu-pwrlevels { - compatible = "qcom,gpu-pwrlevels"; - qcom,gpu-pwrlevel@0 { - qcom,gpu-freq = <450000000>; - }; - qcom,gpu-pwrlevel@1 { - qcom,gpu-freq = <27000000>; - }; - }; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 681486c..6dcbda6 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -758,7 +758,7 @@ }; adreno-3xx@01c00000 { - compatible = "qcom,adreno-3xx"; + compatible = "qcom,adreno-306.0", "qcom,adreno"; #stream-id-cells = <16>; reg = <0x01c00000 0x20000>; reg-names = "kgsl_3d0_reg_memory"; @@ -779,7 +779,6 @@ <&gcc GCC_BIMC_GPU_CLK>, <&gcc GFX3D_CLK_SRC>; power-domains = <&gcc OXILI_GDSC>; - qcom,chipid = <0x03000600>; qcom,gpu-pwrlevels { compatible = "qcom,gpu-pwrlevels"; qcom,gpu-pwrlevel@0 { diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index c5226a7..941493f 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -873,7 +873,7 @@ }; adreno-3xx@b00000 { - compatible = "qcom,adreno-3xx"; + compatible = "qcom,adreno-530.2", "qcom,adreno"; #stream-id-cells = <16>; reg = <0xb00000 0x3f000>; @@ -899,12 +899,6 @@ power-domains = <&mmcc GPU_GDSC>; iommus = <&adreno_smmu 0>; - /* There are patchlevel 3 chips in the world (Snapdragon - * (820) but they are functionally similar to the 821 in - * the code so we can safely set the chipset as - * patchlevel 4. */ - qcom,chipid = <0x05030002>; - qcom,gpu-quirk-two-pass-use-wfi; qcom,gpu-quirk-fault-detect-mask; diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index e130b5e..71300d0 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -189,6 +189,40 @@ static const struct { { "qcom,gpu-quirk-fault-detect-mask", ADRENO_QUIRK_FAULT_DETECT_MASK }, }; +static int find_chipid(struct device_node *node, u32 *chipid) +{ + struct property *prop; + const char *compat; + int ret; + + /* first search the compat strings for qcom,adreno-XYZ.W: */ + prop = of_find_property(node, "compatible", NULL); + for (compat = of_prop_next_string(prop, NULL); compat; + compat = of_prop_next_string(prop, compat)) { + unsigned rev, patch; + + if (sscanf(compat, "qcom,adreno-%u.%u", &rev, &patch) != 2) + continue; + + *chipid = 0; + *chipid |= (rev / 100) << 24; /* core */ + rev %= 100; + *chipid |= (rev / 10) << 16; /* major */ + rev %= 10; + *chipid |= rev << 8; /* minor */ + *chipid |= patch; + + return 0; + } + + /* and if that fails, fall back to legacy "qcom,chipid" property: */ + ret = of_property_read_u32(node, "qcom,chipid", chipid); + if (ret) + return ret; + + return 0; +} + static int adreno_bind(struct device *dev, struct device *master, void *data) { static struct adreno_platform_config config = {}; @@ -196,7 +230,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) u32 val; int ret, i; - ret = of_property_read_u32(node, "qcom,chipid", &val); + ret = find_chipid(node, &val); if (ret) { dev_err(dev, "could not find chipid: %d\n", ret); return ret; @@ -224,8 +258,9 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) } if (!config.fast_rate) { - dev_err(dev, "could not find clk rates\n"); - return -ENXIO; + dev_warn(dev, "could not find clk rates\n"); + /* This is a safe low speed for all devices: */ + config.fast_rate = config.slow_rate = 27000000; } for (i = 0; i < ARRAY_SIZE(quirks); i++) @@ -263,6 +298,7 @@ static int adreno_remove(struct platform_device *pdev) } static const struct of_device_id dt_match[] = { + { .compatible = "qcom,adreno" }, { .compatible = "qcom,adreno-3xx" }, /* for backwards compat w/ downstream kgsl DT files: */ { .compatible = "qcom,kgsl-3d0" }, diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index e29bb66..6b85c41 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -985,6 +985,7 @@ static int add_display_components(struct device *dev, * as components. */ static const struct of_device_id msm_gpu_match[] = { + { .compatible = "qcom,adreno" }, { .compatible = "qcom,adreno-3xx" }, { .compatible = "qcom,kgsl-3d0" }, { }, -- 2.9.3

3 7

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2017