Commit 1f913730 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2024-04-05' of... 

Merge tag 'drm-misc-next-2024-04-05' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

drm-misc-next for v6.10:

Core Changes:
- Fix DRM_DISPLAY_DP_HELPER dependencies.

Driver Changes:
- i2c and polling fixes to ast.
- Small fixes to panthor.
- Allow IRQ to share GPIO pins in bridge/adv7511.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2ad89d5a-4096-4cc5-badb-4ad61ff1df7d@linux.intel.com
parents fee54d08 d1ef8fc1

Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ properties: 
    enum:

      # Anberic RG353V-V2 5.0" 640x480 TFT LCD panel

      - anbernic,rg353v-panel-v2

      # GameForce Chi 3.5" 640x480 TFT LCD panel

      - gameforce,chi-panel

      # Powkiddy RGB10MAX3 5.0" 720x1280 TFT LCD panel

      - powkiddy,rgb10max3-panel

      # Powkiddy RGB30 3.0" 720x720 TFT LCD panel

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -531,6 +531,8 @@ patternProperties: 
    description: FX Technology Ltd.

  "^galaxycore,.*":

    description: GalaxyCore Inc.

  "^gameforce,.*":

    description: GameForce

  "^gardena,.*":

    description: GARDENA GmbH

  "^gateway,.*":

drivers/gpu/drm/ast/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -3,6 +3,14 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



ast-y := ast_drv.o ast_i2c.o ast_main.o ast_mm.o ast_mode.o ast_post.o ast_dp501.o ast_dp.o

ast-y := \

	ast_ddc.o \

	ast_dp501.o \

	ast_dp.o \

	ast_drv.o \

	ast_main.o \

	ast_mm.o \

	ast_mode.o \

	ast_post.o



obj-$(CONFIG_DRM_AST) := ast.o

drivers/gpu/drm/ast/ast_i2c.c→drivers/gpu/drm/ast/ast_ddc.c

+73 −47
Original line number Diff line number Diff line
@@ -24,17 +24,18 @@ 
#include <drm/drm_managed.h>

#include <drm/drm_print.h>



#include "ast_ddc.h"

#include "ast_drv.h"



static void ast_i2c_setsda(void *i2c_priv, int data)

static void ast_ddc_algo_bit_data_setsda(void *data, int state)

{

	struct ast_i2c_chan *i2c = i2c_priv;

	struct ast_device *ast = to_ast_device(i2c->dev);

	struct ast_ddc *ddc = data;

	struct ast_device *ast = ddc->ast;

	int i;

	u8 ujcrb7, jtemp;



	for (i = 0; i < 0x10000; i++) {

		ujcrb7 = ((data & 0x01) ? 0 : 1) << 2;

		ujcrb7 = ((state & 0x01) ? 0 : 1) << 2;

		ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0xf1, ujcrb7);

		jtemp = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x04);

		if (ujcrb7 == jtemp)
@@ -42,15 +43,15 @@ static void ast_i2c_setsda(void *i2c_priv, int data) 
	}

}



static void ast_i2c_setscl(void *i2c_priv, int clock)

static void ast_ddc_algo_bit_data_setscl(void *data, int state)

{

	struct ast_i2c_chan *i2c = i2c_priv;

	struct ast_device *ast = to_ast_device(i2c->dev);

	struct ast_ddc *ddc = data;

	struct ast_device *ast = ddc->ast;

	int i;

	u8 ujcrb7, jtemp;



	for (i = 0; i < 0x10000; i++) {

		ujcrb7 = ((clock & 0x01) ? 0 : 1);

		ujcrb7 = ((state & 0x01) ? 0 : 1);

		ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0xf4, ujcrb7);

		jtemp = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x01);

		if (ujcrb7 == jtemp)
@@ -58,10 +59,32 @@ static void ast_i2c_setscl(void *i2c_priv, int clock) 
	}

}



static int ast_i2c_getsda(void *i2c_priv)

static int ast_ddc_algo_bit_data_pre_xfer(struct i2c_adapter *adapter)

{

	struct ast_i2c_chan *i2c = i2c_priv;

	struct ast_device *ast = to_ast_device(i2c->dev);

	struct ast_ddc *ddc = i2c_get_adapdata(adapter);

	struct ast_device *ast = ddc->ast;



	/*

	 * Protect access to I/O registers from concurrent modesetting

	 * by acquiring the I/O-register lock.

	 */

	mutex_lock(&ast->modeset_lock);



	return 0;

}



static void ast_ddc_algo_bit_data_post_xfer(struct i2c_adapter *adapter)

{

	struct ast_ddc *ddc = i2c_get_adapdata(adapter);

	struct ast_device *ast = ddc->ast;



	mutex_unlock(&ast->modeset_lock);

}



static int ast_ddc_algo_bit_data_getsda(void *data)

{

	struct ast_ddc *ddc = data;

	struct ast_device *ast = ddc->ast;

	uint32_t val, val2, count, pass;



	count = 0;
@@ -80,10 +103,10 @@ static int ast_i2c_getsda(void *i2c_priv) 
	return val & 1 ? 1 : 0;

}



static int ast_i2c_getscl(void *i2c_priv)

static int ast_ddc_algo_bit_data_getscl(void *data)

{

	struct ast_i2c_chan *i2c = i2c_priv;

	struct ast_device *ast = to_ast_device(i2c->dev);

	struct ast_ddc *ddc = data;

	struct ast_device *ast = ddc->ast;

	uint32_t val, val2, count, pass;



	count = 0;
@@ -102,50 +125,53 @@ static int ast_i2c_getscl(void *i2c_priv) 
	return val & 1 ? 1 : 0;

}



static void ast_i2c_release(struct drm_device *dev, void *res)

static void ast_ddc_release(struct drm_device *dev, void *res)

{

	struct ast_i2c_chan *i2c = res;

	struct ast_ddc *ddc = res;



	i2c_del_adapter(&i2c->adapter);

	kfree(i2c);

	i2c_del_adapter(&ddc->adapter);

}



struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev)

struct ast_ddc *ast_ddc_create(struct ast_device *ast)

{

	struct ast_i2c_chan *i2c;

	struct drm_device *dev = &ast->base;

	struct ast_ddc *ddc;

	struct i2c_adapter *adapter;

	struct i2c_algo_bit_data *bit;

	int ret;



	i2c = kzalloc(sizeof(struct ast_i2c_chan), GFP_KERNEL);

	if (!i2c)

		return NULL;



	i2c->adapter.owner = THIS_MODULE;

	i2c->adapter.dev.parent = dev->dev;

	i2c->dev = dev;

	i2c_set_adapdata(&i2c->adapter, i2c);

	snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),

		 "AST i2c bit bus");

	i2c->adapter.algo_data = &i2c->bit;



	i2c->bit.udelay = 20;

	i2c->bit.timeout = 2;

	i2c->bit.data = i2c;

	i2c->bit.setsda = ast_i2c_setsda;

	i2c->bit.setscl = ast_i2c_setscl;

	i2c->bit.getsda = ast_i2c_getsda;

	i2c->bit.getscl = ast_i2c_getscl;

	ret = i2c_bit_add_bus(&i2c->adapter);

	ddc = drmm_kzalloc(dev, sizeof(*ddc), GFP_KERNEL);

	if (!ddc)

		return ERR_PTR(-ENOMEM);

	ddc->ast = ast;



	adapter = &ddc->adapter;

	adapter->owner = THIS_MODULE;

	adapter->dev.parent = dev->dev;

	i2c_set_adapdata(adapter, ddc);

	snprintf(adapter->name, sizeof(adapter->name), "AST DDC bus");



	bit = &ddc->bit;

	bit->udelay = 20;

	bit->timeout = 2;

	bit->data = ddc;

	bit->setsda = ast_ddc_algo_bit_data_setsda;

	bit->setscl = ast_ddc_algo_bit_data_setscl;

	bit->getsda = ast_ddc_algo_bit_data_getsda;

	bit->getscl = ast_ddc_algo_bit_data_getscl;

	bit->pre_xfer = ast_ddc_algo_bit_data_pre_xfer;

	bit->post_xfer = ast_ddc_algo_bit_data_post_xfer;



	adapter->algo_data = bit;

	ret = i2c_bit_add_bus(adapter);

	if (ret) {

		drm_err(dev, "Failed to register bit i2c\n");

		goto out_kfree;

		return ERR_PTR(ret);

	}



	ret = drmm_add_action_or_reset(dev, ast_i2c_release, i2c);

	ret = drmm_add_action_or_reset(dev, ast_ddc_release, ddc);

	if (ret)

		return NULL;

	return i2c;

		return ERR_PTR(ret);



out_kfree:

	kfree(i2c);

	return NULL;

	return ddc;

}

drivers/gpu/drm/ast/ast_ddc.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */



#ifndef __AST_DDC_H__

#define __AST_DDC_H__



#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>



struct ast_device;



struct ast_ddc {

	struct ast_device *ast;



	struct i2c_adapter adapter;

	struct i2c_algo_bit_data bit;

};



struct ast_ddc *ast_ddc_create(struct ast_device *ast);



#endif